[Xedeb-commits] jlbec commits r17 - trunk/debian/client
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Dec 8 17:04:33 CST 2005
Author: jlbec
Date: 2005-12-08 17:04:30 -0600 (Thu, 08 Dec 2005)
New Revision: 17
Modified:
trunk/debian/client/changelog
trunk/debian/client/oracle-xe-client.install
trunk/debian/client/postinst
trunk/debian/client/postrm
trunk/debian/client/rules
Log:
o Do the menu fixups for the client as well.
Modified: trunk/debian/client/changelog
===================================================================
--- trunk/debian/client/changelog 2005-12-08 21:31:38 UTC (rev 16)
+++ trunk/debian/client/changelog 2005-12-08 23:04:30 UTC (rev 17)
@@ -1,3 +1,9 @@
+oracle-xe-client (10.2.0.1-0.2) unstable; urgency=low
+
+ * Fix up the menus
+
+ -- Joel Becker <joel.becker at oracle.com> Thu, 08 Dec 2005 18:31:35 -0800
+
oracle-xe-client (10.2.0.1-0.1) unstable; urgency=low
* Initial package, first beta.
Modified: trunk/debian/client/oracle-xe-client.install
===================================================================
--- trunk/debian/client/oracle-xe-client.install 2005-12-08 21:31:38 UTC (rev 16)
+++ trunk/debian/client/oracle-xe-client.install 2005-12-08 23:04:30 UTC (rev 17)
@@ -14,7 +14,8 @@
debian/tmp/usr/share/applications/oraclexe-client-runsql.desktop
debian/tmp/usr/share/gnome/vfolders/oraclexe-client-10g.directory
debian/tmp/usr/share/gnome/vfolders/oraclexe-client-gethelp.directory
-debian/tmp/usr/share/desktop-menu-files/oraclexe-client-gethelp.directory
-debian/tmp/usr/share/desktop-menu-files/oraclexe-client-10g.directory
+debian/tmp/usr/share/desktop-directories/oraclexe-client-gethelp.directory
+debian/tmp/usr/share/desktop-directories/oraclexe-client-10g.directory
+debian/tmp/etc/xdg/menus/oraclexe-client.menu
debian/tmp/usr/lib/oracle/xe/app/oracle/doc
debian/tmp/usr/share/lintian/overrides
Modified: trunk/debian/client/postinst
===================================================================
--- trunk/debian/client/postinst 2005-12-08 21:31:38 UTC (rev 16)
+++ trunk/debian/client/postinst 2005-12-08 23:04:30 UTC (rev 17)
@@ -32,75 +32,35 @@
# Start Menu icons
-if test -d /var/lib/menu/kde/Applications/oraclexe-client
-then
- echo ""
-else
- mkdir -p /var/lib/menu/kde/Applications/oraclexe-client/gethelp
-fi
+mergefile()
+{
+ MENUFILE="$1"
-if [ -f /var/lib/menu/kde/Applications/oraclexe-client/.directory ]
-then
- rm -fr /var/lib/menu/kde/Applications/oraclexe-client/.directory
- ln -s /usr/share/desktop-menu-files/oraclexe-client-10g.directory /var/lib/menu/kde/Applications/oraclexe-client/.directory
-else
- ln -s /usr/share/desktop-menu-files/oraclexe-client-10g.directory /var/lib/menu/kde/Applications/oraclexe-client/.directory
-fi
+ if [ -z "$MENUFILE" ]
+ then
+ return
+ fi
-if [ -f /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop
- ln -s /usr/share/applications/oraclexe-client-runsql.desktop /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop
-else
- ln -s /usr/share/applications/oraclexe-client-runsql.desktop /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop
-fi
+ TFILE="$(mktemp)" || TFILE="/tmp/xeapplications.tmp"
+ (sed -n '1,/<\/Menu>/p' "$MENUFILE" ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' "$MENUFILE" ) > "$TFILE"
+ cp -f "$TFILE" "$MENUFILE"
+ rm -f "$TFILE"
+}
-if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory ]
+if [ -f /etc/xdg/menus/gnome-applications.menu ]
then
- rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory
- ln -s /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory
-else
- ln -s /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory
+ mergefile /etc/xdg/menus/gnome-applications.menu
fi
-
-if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop ]
+if [ -f /etc/xdg/menus/kde-applications.menu ]
then
- rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop
- ln -s /usr/share/applications/oraclexe-client-registerforonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop
-else
- ln -s /usr/share/applications/oraclexe-client-registerforonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop
+ mergefile /etc/xdg/menus/kde-applications.menu
fi
-
-if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop
- ln -s /usr/share/applications/oraclexe-client-readdocumentation.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop
-else
- ln -s /usr/share/applications/oraclexe-client-readdocumentation.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop
- ln -s /usr/share/applications/oraclexe-client-gotoonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop
-else
- ln -s /usr/share/applications/oraclexe-client-gotoonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop
-fi
-
if [ -f /etc/xdg/menus/applications.menu ]
then
- cp -r /usr/share/desktop-menu-files/oraclexe-client-10g.directory /usr/share/desktop-directories/oraclexe-client-10g.directory
- cp -r /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /usr/share/desktop-directories/oraclexe-client-gethelp.directory
- cp -r /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client.menu /etc/xdg/menus
- (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
-elif [ -f /etc/X11/desktop-menus/applications.menu ]
-then
- (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
+ mergefile /etc/xdg/menus/applications.menu
fi
-rm -fr /tmp/applications.menu.tmp
+
rm -fr /usr/lib/oracle/screenrc
rm -fr /usr/lib/oracle/gtkrc
rm -fr /usr/lib/oracle/emacs
Modified: trunk/debian/client/postrm
===================================================================
--- trunk/debian/client/postrm 2005-12-08 21:31:38 UTC (rev 16)
+++ trunk/debian/client/postrm 2005-12-08 23:04:30 UTC (rev 17)
@@ -9,18 +9,31 @@
rm -fr /var/lib/menu/kde/Applications/oraclexe-client
rm -fr /usr/share/gnome/vfolders/oraclexe-client-10g.directory
rm -fr /usr/share/gnome/vfolders/oraclexe-client-gethelp.directory
-if [ -f /etc/xdg/menus/applications.menu ]
-then
- rm -fr /usr/share/desktop-directories/oraclexe-client-10g.directory
- rm -fr /usr/share/desktop-directories/oraclexe-client-gethelp.directory
- rm -r /etc/xdg/menus/oraclexe-client.menu
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
-elif [ -f /etc/X11/desktop-menus/applications.menu ]
+mergefile()
+{
+ MENUFILE="$1"
+ if [ -z "$MENUFILE" ]
+ then
+ return
+ fi
+
+ TFILE="$(mktemp)" || TFILE="/tmp/xeapplications.tmp"
+ sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' "$MENUFILE" > "$TFILE"
+ cp -f "$TFILE" "$MENUFILE"
+ rm -f "$TFILE"
+}
+
+if [ -f /etc/xdg/menus/gnome-applications.menu ]
then
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
+ mergefile /etc/xdg/menus/gnome-applications.menu
fi
+if [ -f /etc/xdg/menus/kde-applications.menu ]
+then
+ mergefile /etc/xdg/menus/kde-applications.menu
+fi
+if [ -f /etc/xdg/menus/applications.menu ]
+then
+ mergefile /etc/xdg/menus/applications.menu
+fi
-rm -fr /tmp/applications.menu
Modified: trunk/debian/client/rules
===================================================================
--- trunk/debian/client/rules 2005-12-08 21:31:38 UTC (rev 16)
+++ trunk/debian/client/rules 2005-12-08 23:04:30 UTC (rev 17)
@@ -43,6 +43,13 @@
$(MAKE) destroot=`pwd`/debian/tmp install
+ # Install the menu files properly
+ mkdir -p -m 0755 debian/tmp/usr/share/desktop-directories
+ mv debian/tmp/usr/share/desktop-menu-files/oraclexe-client-10g.directory debian/tmp/usr/share/desktop-directories
+ mv debian/tmp/usr/share/desktop-menu-files/oraclexe-client-gethelp.directory debian/tmp/usr/share/desktop-directories
+ mkdir -p -m 0755 debian/tmp/etc/xdg/menus
+ mv debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client.menu debian/tmp/etc/xdg/menus
+
mkdir -p -m 0755 debian/tmp/usr/share/lintian/overrides
cp debian/oracle-xe-client.lintian debian/tmp/usr/share/lintian/overrides/oracle-xe-client
More information about the Xedeb-commits
mailing list