[Xedeb-commits] jlbec commits r11 - in trunk: . debian/server

Wed Nov 30 03:01:47 CST 2005

Author: jlbec
Date: 2005-11-30 03:01:44 -0600 (Wed, 30 Nov 2005)
New Revision: 11

Added:
   trunk/debian/server/oracle-xe.conffiles
Modified:
   trunk/
   trunk/Makefile
   trunk/debian/server/
   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/prerm
   trunk/debian/server/rules
Log:

o Updated for new file lists.




Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
.*.stamp
oracle-xe-*
*.build
*.dsc
*.tar.gz

   + .*.sw?
.*.stamp
oracle-xe-*
*.build
*.dsc
*.tar.gz
*.deb


Modified: trunk/Makefile
===================================================================

--- trunk/Makefile	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/Makefile	2005-11-30 09:01:44 UTC (rev 11)
@@ -37,7 +37,8 @@
 prep: prep-dirs prep-debian overrides
 
 server-debs: prep
-	cd $(SERVER_DIR) && debuild -r fakeroot
+	mkdir -p tmp
+	TD="`pwd`/tmp" && cd $(SERVER_DIR) && debuild -e TMPDIR="$$TD" -r fakeroot
 
 realclean-server:
 	-rm -rf $(SERVER_DIR)


Property changes on: trunk/debian/server
___________________________________________________________________
Name: svn:ignore
   - oracle-xe
oracle-xe.init
tmp

   + oracle-xe
oracle-xe.init
tmp
*.debhelper


Modified: trunk/debian/server/changelog
===================================================================
--- trunk/debian/server/changelog	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/changelog	2005-11-30 09:01:44 UTC (rev 11)
@@ -1,3 +1,9 @@
+oracle-xe (10.2.0.1-0.3) unstable; urgency=low
+
+  * Updated sources, still need to merge 0.2 stuff.
+
+ -- Joel Becker <joel.becker at oracle.com>  Wed, 29 Nov 2005 20:47:35 -0800
+
 oracle-xe (10.2.0.1-0.1) unstable; urgency=low
 
   * Initial package, first beta.

Added: trunk/debian/server/oracle-xe.conffiles
===================================================================
--- trunk/debian/server/oracle-xe.conffiles	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/oracle-xe.conffiles	2005-11-30 09:01:44 UTC (rev 11)
@@ -0,0 +1,3 @@
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/listener.ora
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/tnsnames.ora
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/postDBCreation.sql

Modified: trunk/debian/server/oracle-xe.install
===================================================================
--- trunk/debian/server/oracle-xe.install	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/oracle-xe.install	2005-11-30 09:01:44 UTC (rev 11)
@@ -21,19 +21,20 @@
 debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/odbc
 debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/xdk
 debian/tmp/usr/share/pixmaps/*
-debian/tmp/usr/share/applications/oraclexe-Backup.desktop
-debian/tmp/usr/share/applications/oraclexe-GotoDBHome.desktop
-debian/tmp/usr/share/applications/oraclexe-OnlineForum.desktop
-debian/tmp/usr/share/applications/oraclexe-ReadDoc.desktop
-debian/tmp/usr/share/applications/oraclexe-Register.desktop
-debian/tmp/usr/share/applications/oraclexe-Restore.desktop
-debian/tmp/usr/share/applications/oraclexe-SQL.desktop
-debian/tmp/usr/share/applications/oraclexe-Start.desktop
-debian/tmp/usr/share/applications/oraclexe-Stop.desktop
-debian/tmp/var/lib/menu/kde/Applications/OracleXE.directory
-debian/tmp/var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
-debian/tmp/usr/share/gnome/vfolders/OracleXE.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.directory
+debian/tmp/usr/share/applications/oraclexe-dbhp.desktop
+debian/tmp/usr/share/applications/oraclexe-gotoonlineforum.desktop
+debian/tmp/usr/share/applications/oraclexe-readdocumentation.desktop
+debian/tmp/usr/share/applications/oraclexe-registerforonlineforum.desktop
+debian/tmp/usr/share/applications/oraclexe-runsql.desktop
+debian/tmp/usr/share/applications/oraclexe-startdb.desktop
+debian/tmp/usr/share/applications/oraclexe-stopdb.desktop
+debian/tmp/usr/share/applications/oraclexe-getstarted.desktop
+debian/tmp/usr/share/applications/oraclexe-getstarteddesktop.desktop
+debian/tmp/usr/share/applications/oraclexe-readonlinehelp.desktop
+debian/tmp/usr/share/applications/oraclexe-backup.desktop
+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/lib/oracle/xe/app/oracle/doc

Modified: trunk/debian/server/postinst
===================================================================
--- trunk/debian/server/postinst	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/postinst	2005-11-30 09:01:44 UTC (rev 11)
@@ -1,23 +1,7 @@
 #!/bin/sh
 
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/oracle-xe" ]; then
-	update-rc.d oracle-xe defaults >/dev/null
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d oracle-xe start || exit 0
-	else
-		/etc/init.d/oracle-xe start || exit 0
-	fi
-fi
-# End automatically added section
+#DEBHELPER#
 
-set -e
-# Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
-    update-menus
-fi
-# End automatically added section
-
 echo "Executing Post-install steps.........."
 if `grep -q dba /etc/group`
 then

Modified: trunk/debian/server/postrm
===================================================================
--- trunk/debian/server/postrm	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/postrm	2005-11-30 09:01:44 UTC (rev 11)
@@ -1,16 +1,7 @@
 #!/bin/sh
 
-# Automatically added by dh_installinit
-if [ "$1" = "purge" ] ; then
-	update-rc.d oracle-xe remove >/dev/null || exit 0
-fi
-# End automatically added section
+#DEBHELPER#
 
-set -e
-# Automatically added by dh_installmenu
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
-# End automatically added section
-
 /sbin/ldconfig
 /bin/cp /etc/oratab /etc/oratab.xe
 /bin/sed -i -s '/XE:/d' /etc/oratab.xe

Modified: trunk/debian/server/preinst
===================================================================
--- trunk/debian/server/preinst	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/preinst	2005-11-30 09:01:44 UTC (rev 11)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
+#DEBHELPER#
 
-
 #User must be root
 if [ $(id -u) != "0" ]
 then

Modified: trunk/debian/server/prerm
===================================================================
--- trunk/debian/server/prerm	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/prerm	2005-11-30 09:01:44 UTC (rev 11)
@@ -1,14 +1,6 @@
 #!/bin/sh
 
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/oracle-xe" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d oracle-xe stop || exit 0
-	else
-		/etc/init.d/oracle-xe stop || exit 0
-	fi
-fi
-# End automatically added section
+#DEBHELPER#
 
 if [ -f "/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopdb.sh" ]; then
 	/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopdb.sh

Modified: trunk/debian/server/rules
===================================================================
--- trunk/debian/server/rules	2005-11-30 04:34:43 UTC (rev 10)
+++ trunk/debian/server/rules	2005-11-30 09:01:44 UTC (rev 11)
@@ -39,13 +39,14 @@
 	mkdir -p debian/tmp/usr/share/applications
 	mkdir -p debian/tmp/usr/share/pixmaps
 	mkdir -p debian/tmp/usr/share/doc/oracle_xe
-	mkdir -p debian/tmp/var/lib/menu/kde/Applications
+	mkdir -p debian/tmp/var/lib/menu/kde/Applications/OracleXE/GetHelp
 	mkdir -p debian/tmp/usr/share/gnome/vfolders
 	mkdir -p debian/tmp/usr/share/desktop-menu-files
+	mkdir -p debian/tmp/etc/init.d
 
 	$(MAKE) destroot=`pwd`/debian/tmp install
 
-	mv debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe debian/oracle-xe.init
+	mv debian/tmp/etc/init.d/oracle-xe debian/oracle-xe.init
 	chmod 0755 debian/oracle-xe.init
 
 	dh_install

