[Xedeb-commits] jlbec commits r16 - in trunk: debian/server
override/server/config/scripts
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Dec 8 15:31:42 CST 2005
Author: jlbec
Date: 2005-12-08 15:31:38 -0600 (Thu, 08 Dec 2005)
New Revision: 16
Modified:
trunk/debian/server/changelog
trunk/debian/server/oracle-xe.install
trunk/debian/server/postinst
trunk/debian/server/postrm
trunk/debian/server/preinst
trunk/debian/server/rules
trunk/override/server/config/scripts/oracle-xe
Log:
o Fix perm issue in oracle-xe init override
o Modify the menu munging for debian-based distros
o Install the menu objects in the right place.
Modified: trunk/debian/server/changelog
===================================================================
--- trunk/debian/server/changelog 2005-12-01 22:22:44 UTC (rev 15)
+++ trunk/debian/server/changelog 2005-12-08 21:31:38 UTC (rev 16)
@@ -1,6 +1,12 @@
+oracle-xe (10.2.0.1-0.4) unstable; urgency=low
+
+ * Fix up the menu files to install properly.
+
+ -- Joel Becker <joel.becker at oracle.com> Thu, 08 Dec 2005 09:47:35 -0800
+
oracle-xe (10.2.0.1-0.3) unstable; urgency=low
- * Updated sources, still need to merge 0.2 stuff.
+ * Updated sources.
-- Joel Becker <joel.becker at oracle.com> Wed, 29 Nov 2005 20:47:35 -0800
Modified: trunk/debian/server/oracle-xe.install
===================================================================
--- trunk/debian/server/oracle-xe.install 2005-12-01 22:22:44 UTC (rev 15)
+++ trunk/debian/server/oracle-xe.install 2005-12-08 21:31:38 UTC (rev 16)
@@ -35,7 +35,8 @@
debian/tmp/usr/share/applications/oraclexe-restore.desktop
debian/tmp/usr/share/gnome/vfolders/oraclexe-10g.directory
debian/tmp/usr/share/gnome/vfolders/oraclexe-gethelp.directory
-debian/tmp/usr/share/desktop-menu-files/oraclexe-gethelp.directory
-debian/tmp/usr/share/desktop-menu-files/oraclexe-10g.directory
+debian/tmp/usr/share/desktop-directories/oraclexe-gethelp.directory
+debian/tmp/usr/share/desktop-directories/oraclexe-10g.directory
+debian/tmp/etc/xdg/menus/oraclexe.menu
debian/tmp/usr/lib/oracle/xe/app/oracle/doc
debian/tmp/usr/share/lintian/overrides
Modified: trunk/debian/server/postinst
===================================================================
--- trunk/debian/server/postinst 2005-12-01 22:22:44 UTC (rev 15)
+++ trunk/debian/server/postinst 2005-12-08 21:31:38 UTC (rev 16)
@@ -9,7 +9,7 @@
else
/usr/sbin/groupadd dba
fi
-id oracle > /dev/null
+id oracle > /dev/null 2>&1
status=$?
if test $status -eq 0
then
@@ -90,129 +90,32 @@
# Start Menu icons
-if test -d /var/lib/menu/kde/Applications/OracleXE
-then
- echo ""
-else
- mkdir -p /var/lib/menu/kde/Applications/OracleXE/GetHelp
-fi
+mergefile()
+{
+ MENUFILE="$1"
-if [ -f /var/lib/menu/kde/Applications/OracleXE/.directory ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/.directory
- ln -s /usr/share/desktop-menu-files/oraclexe-10g.directory /var/lib/menu/kde/Applications/OracleXE/.directory
-else
- ln -s /usr/share/desktop-menu-files/oraclexe-10g.directory /var/lib/menu/kde/Applications/OracleXE/.directory
-fi
+ if [ -z "$MENUFILE" ]
+ then
+ return
+ fi
-if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.desktop
- ln -s /usr/share/applications/oraclexe-startdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.desktop
-else
- ln -s /usr/share/applications/oraclexe-startdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-startdb.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/server/config/scripts/oraclexe-merge.menu ; sed -n '1,/<\/Menu>/!p' "$MENUFILE" ) > "$TFILE"
+ cp -f "$TFILE" "$MENUFILE"
+ rm -f "$TFILE"
+}
-if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop ]
+if [ -f /etc/xdg/menus/gnome-applications.menu ]
then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop
- ln -s /usr/share/applications/oraclexe-stopdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop
-else
- ln -s /usr/share/applications/oraclexe-stopdb.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-stopdb.desktop
+ mergefile /etc/xdg/menus/gnome-applications.menu
fi
-
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop ]
+if [ -f /etc/xdg/menus/kde-applications.menu ]
then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop
- ln -s /usr/share/applications/oraclexe-dbhp.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop
-else
- ln -s /usr/share/applications/oraclexe-dbhp.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-dbhp.desktop
+ mergefile /etc/xdg/menus/kde-applications.menu
fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop
- ln -s /usr/share/applications/oraclexe-getstarted.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop
-else
- ln -s /usr/share/applications/oraclexe-getstarted.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-getstarted.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop
- ln -s /usr/share/applications/oraclexe-runsql.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop
-else
- ln -s /usr/share/applications/oraclexe-runsql.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-runsql.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop
- ln -s /usr/share/applications/oraclexe-backup.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop
-else
- ln -s /usr/share/applications/oraclexe-backup.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-backup.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop
- ln -s /usr/share/applications/oraclexe-restore.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop
-else
- ln -s /usr/share/applications/oraclexe-restore.desktop /var/lib/menu/kde/Applications/OracleXE/oraclexe-restore.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory
- ln -s /usr/share/desktop-menu-files/oraclexe-gethelp.directory /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory
-else
- ln -s /usr/share/desktop-menu-files/oraclexe-gethelp.directory /var/lib/menu/kde/Applications/OracleXE/GetHelp/.directory
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop
- ln -s /usr/share/applications/oraclexe-registerforonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop
-else
- ln -s /usr/share/applications/oraclexe-registerforonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-registerforonlineforum.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop
- ln -s /usr/share/applications/oraclexe-readdocumentation.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop
-else
- ln -s /usr/share/applications/oraclexe-readdocumentation.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readdocumentation.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop
- ln -s /usr/share/applications/oraclexe-gotoonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop
-else
- ln -s /usr/share/applications/oraclexe-gotoonlineforum.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-gotoonlineforum.desktop
-fi
-
-if [ -f /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop ]
-then
- rm -fr /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop
- ln -s /usr/share/applications/oraclexe-readonlinehelp.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop
-else
- ln -s /usr/share/applications/oraclexe-readonlinehelp.desktop /var/lib/menu/kde/Applications/OracleXE/GetHelp/oraclexe-readonlinehelp.desktop
-fi
-
if [ -f /etc/xdg/menus/applications.menu ]
then
- cp -r /usr/share/desktop-menu-files/oraclexe-10g.directory /usr/share/desktop-directories/oraclexe-10g.directory
- cp -r /usr/share/desktop-menu-files/oraclexe-gethelp.directory /usr/share/desktop-directories/oraclexe-gethelp.directory
- cp -r /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe.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/server/config/scripts/oraclexe-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/server/config/scripts/oraclexe-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
homedir=`echo $HOME`
@@ -233,7 +136,6 @@
fi
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/server/postrm
===================================================================
--- trunk/debian/server/postrm 2005-12-01 22:22:44 UTC (rev 15)
+++ trunk/debian/server/postrm 2005-12-08 21:31:38 UTC (rev 16)
@@ -24,21 +24,35 @@
#rm -fr /var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
rm -fr /usr/share/gnome/vfolders/oraclexe-10g.directory
rm -fr /usr/share/gnome/vfolders/oraclexe-gethelp.directory
-if [ -f /etc/xdg/menus/applications.menu ]
-then
- rm -fr /usr/share/desktop-directories/oraclexe-10g.directory
- rm -fr /usr/share/desktop-directories/oraclexe-gethelp.directory
- rm -r /etc/xdg/menus/oraclexe.menu
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!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 \-->/,/<\!\-- End of Oracle XE \-->/!p' "$MENUFILE" > "$TFILE"
+ cp -f "$TFILE" "$MENUFILE"
+ rm -f "$TFILE"
+}
+
+if [ -f /etc/xdg/menus/gnome-applications.menu ]
then
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!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
+
homedir=`echo $HOME`
if [ "$homedir" = "/root" ]
then
Modified: trunk/debian/server/preinst
===================================================================
--- trunk/debian/server/preinst 2005-12-01 22:22:44 UTC (rev 15)
+++ trunk/debian/server/preinst 2005-12-08 21:31:38 UTC (rev 16)
@@ -153,25 +153,21 @@
if [ $shmmax -lt 536870912 ]
then
- kernel.shmmax="536870912"
changeshmmax=yes
fi
if [ $shmmni -lt 4096 ]
then
- kernel.shmmni="4096"
changeshmmni=yes
fi
if [ $shmall -lt 2097152 ]
then
- kernel.shmall="2097152"
- changeshmall=yes
+ changeshmall=yes
fi
if [ $filemax -lt 65536 ]
then
- fs.file-max="65536"
changefilemax=yes
fi
Modified: trunk/debian/server/rules
===================================================================
--- trunk/debian/server/rules 2005-12-01 22:22:44 UTC (rev 15)
+++ trunk/debian/server/rules 2005-12-08 21:31:38 UTC (rev 16)
@@ -46,8 +46,18 @@
$(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-10g.directory debian/tmp/usr/share/desktop-directories
+ mv debian/tmp/usr/share/desktop-menu-files/oraclexe-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/server/config/scripts/oraclexe.menu debian/tmp/etc/xdg/menus
+
+ # Install linitian bits
mkdir -p -m 0755 debian/tmp/usr/share/lintian/overrides
cp debian/oracle-xe.lintian debian/tmp/usr/share/lintian/overrides/oracle-xe
+
+ # Do the init script for Debian-like systems
mv debian/tmp/etc/init.d/oracle-xe debian/oracle-xe.init
chmod 0755 debian/oracle-xe.init
Modified: trunk/override/server/config/scripts/oracle-xe
===================================================================
--- trunk/override/server/config/scripts/oracle-xe 2005-12-01 22:22:44 UTC (rev 15)
+++ trunk/override/server/config/scripts/oracle-xe 2005-12-08 21:31:38 UTC (rev 16)
@@ -264,7 +264,6 @@
chmod -R 640 /usr/lib/oracle/xe/oradata/XE
chmod 750 /usr/lib/oracle/xe/oradata/XE
- chown -R oracle:dba /usr/lib/oracle/xe
rm -fr $ORACLE_HOME/config/seeddb
if [ -f /etc/oratab ]
More information about the Xedeb-commits
mailing list