[Xedeb-commits] jlbec commits r28 - in trunk: . debian/server-universal override sources
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Sat Feb 11 00:01:29 CST 2006
Author: jlbec
Date: 2006-02-10 23:53:43 -0600 (Fri, 10 Feb 2006)
New Revision: 28
Added:
trunk/debian/server-universal/oracle-xe-universal.conffiles
trunk/debian/server-universal/oracle-xe-universal.copyright
trunk/debian/server-universal/oracle-xe-universal.docs
trunk/debian/server-universal/oracle-xe-universal.install
trunk/debian/server-universal/oracle-xe-universal.lintian
trunk/debian/server-universal/oracle-xe-universal.manpages
trunk/debian/server-universal/oracle-xe-universal.oracle-xe.default
trunk/sources/oracle-xe-universal-10.2.0.1.tar.gz
Removed:
trunk/debian/server-universal/oracle-xe-we.conffiles
trunk/debian/server-universal/oracle-xe-we.copyright
trunk/debian/server-universal/oracle-xe-we.docs
trunk/debian/server-universal/oracle-xe-we.install
trunk/debian/server-universal/oracle-xe-we.lintian
trunk/debian/server-universal/oracle-xe-we.manpages
trunk/debian/server-universal/oracle-xe-we.oracle-xe.default
trunk/override/server-we/
Modified:
trunk/Makefile
trunk/debian/server-universal/changelog
trunk/debian/server-universal/control
trunk/debian/server-universal/rules
Log:
o Add the universal bits.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/Makefile 2006-02-11 05:53:43 UTC (rev 28)
@@ -3,6 +3,8 @@
SERVER_SOURCE = sources/oracle-xe-10.2.0.1.tar.gz
SERVER_DIR = $(patsubst %.tar.gz,%,$(notdir $(SERVER_SOURCE)))
+SERVER_UNIVERSAL_SOURCE = sources/oracle-xe-universal-10.2.0.1.tar.gz
+SERVER_UNIVERSAL_DIR = $(patsubst %.tar.gz,%,$(notdir $(SERVER_UNIVERSAL_SOURCE)))
CLIENT_SOURCE = sources/oracle-xe-client-10.2.0.1.tar.gz
CLIENT_DIR = $(patsubst %.tar.gz,%,$(notdir $(CLIENT_SOURCE)))
@@ -10,6 +12,10 @@
tar -zxvf $<
touch $@
+.$(SERVER_UNIVERSAL_DIR).stamp: $(SERVER_UNIVERSAL_SOURCE)
+ tar -zxvf $<
+ touch $@
+
.$(CLIENT_DIR).stamp: $(CLIENT_SOURCE)
tar -zxvf $<
touch $@
@@ -20,34 +26,45 @@
$(SERVER_DIR)/debian: debian/server
ln -s ../debian/server $(SERVER_DIR)/debian
+$(SERVER_UNIVERSAL_DIR)/debian: debian/server-universal
+ ln -s ../debian/server-universal $(SERVER_UNIVERSAL_DIR)/debian
+
prep-dir-server: .$(SERVER_DIR).stamp
+prep-dir-server-universal: .$(SERVER_UNIVERSAL_DIR).stamp
prep-dir-client: .$(CLIENT_DIR).stamp
-prep-dirs: prep-dir-server prep-dir-client
+prep-dirs: prep-dir-server prep-dir-server-universal prep-dir-client
prep-debian-server: prep-dir-server $(SERVER_DIR)/debian
+prep-debian-server-universal: prep-dir-server-universal $(SERVER_UNIVERSAL_DIR)/debian
prep-debian-client: prep-dir-client $(CLIENT_DIR)/debian
-prep-debian: prep-debian-server prep-debian-client
+prep-debian: prep-debian-server prep-debian-server-universal prep-debian-client
SERVER_OVERRIDES = $(addprefix $(SERVER_DIR)/, $(shell cd override/server && find . -name .svn -prune -o -type f -print))
$(SERVER_OVERRIDES): $(SERVER_DIR)/%: override/server/%
cp -f $< $@
+SERVER_UNIVERSAL_OVERRIDES = $(addprefix $(SERVER_UNIVERSAL_DIR)/, $(shell cd override/server-universal && find . -name .svn -prune -o -type f -print))
+$(SERVER_UNIVERSAL_OVERRIDES): $(SERVER_UNIVERSAL_DIR)/%: override/server-universal/%
+ cp -f $< $@
+
CLIENT_OVERRIDES = $(addprefix $(CLIENT_DIR)/, $(shell cd override/client && find . -name .svn -prune -o -type f -print))
$(CLIENT_OVERRIDES): $(CLIENT_DIR)/%: override/client/%
cp -f $< $@
overrides-server: prep-dir-server $(SERVER_OVERRIDES)
+overrides-server-universal: prep-dir-server-universal $(SERVER_UNIVERSAL_OVERRIDES)
overrides-client: prep-dir-client $(CLIENT_OVERRIDES)
-overrides: overrides-server overrides-client
+overrides: overrides-server overrides-server-universal overrides-client
prep-server: prep-debian-server overrides-server
+prep-server-universal: prep-debian-server-universal overrides-server-universal
prep-client: prep-debian-client overrides-client
-prep: prep-server prep-client
+prep: prep-server prep-server-universal prep-client
server-debs: prep-server
mkdir -p tmp
@@ -57,6 +74,14 @@
mkdir -p tmp
TD="`pwd`/tmp" && cd $(SERVER_DIR) && debuild -e TMPDIR="$$TD" -r fakeroot $(patsubst server-debs-%,%,$@)
+server-universal-debs: prep-server-universal
+ mkdir -p tmp
+ TD="`pwd`/tmp" && cd $(SERVER_UNIVERSAL_DIR) && debuild -e TMPDIR="$$TD" -r fakeroot
+
+server-universal-debs-%: prep-server-universal
+ mkdir -p tmp
+ TD="`pwd`/tmp" && cd $(SERVER_UNIVERSAL_DIR) && debuild -e TMPDIR="$$TD" -r fakeroot $(patsubst server-universal-debs-%,%,$@)
+
client-debs: prep-client
mkdir -p tmp
TD="`pwd`/tmp" && cd $(CLIENT_DIR) && debuild -e TMPDIR="$$TD" -r fakeroot
@@ -65,25 +90,33 @@
mkdir -p tmp
TD="`pwd`/tmp" && cd $(CLIENT_DIR) && debuild -e TMPDIR="$$TD" -r fakeroot $(patsubst client-debs-%,%,$@)
-debs: server-debs client-debs
+debs: server-debs server-universal-debs client-debs
clean-server:
-cd $(SERVER_DIR) && debuild -r fakeroot clean
-rm -f oracle-xe_*
+clean-server-universal:
+ -cd $(SERVER_UNIVERSAL_DIR) && debuild -r fakeroot clean
+ -rm -f oracle-xe-universal_*
+
clean-client:
-cd $(CLIENT_DIR) && debuild -r fakeroot clean
-rm -f oracle-xe-client_*
-clean: clean-server clean-client
+clean: clean-server clean-server-universal clean-client
realclean-server: clean-server
-rm -rf $(SERVER_DIR)
-rm -f .$(SERVER_DIR).stamp
+realclean-server-universal: clean-server-universal
+ -rm -rf $(SERVER_UNIVERSAL_DIR)
+ -rm -f .$(SERVER_UNIVERSAL_DIR).stamp
+
realclean-client: clean-client
-rm -rf $(CLIENT_DIR)
-rm -f .$(CLIENT_DIR).stamp
-realclean: realclean-server realclean-client
+realclean: realclean-server realclean-server-universal realclean-client
-rm -rf tmp
Modified: trunk/debian/server-universal/changelog
===================================================================
--- trunk/debian/server-universal/changelog 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/changelog 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,6 +1,6 @@
-oracle-xe-we (10.2.0.1-0.RC2) unstable; urgency=low
+oracle-xe-universal (10.2.0.1-0.RC2) unstable; urgency=low
- * Fork off WE control bits for RC2.
+ * Fork off Universal control bits for RC2.
-- Joel Becker <joel.becker at oracle.com> Thu, 9 Feb 2006 19:38:22 -0800
Modified: trunk/debian/server-universal/control
===================================================================
--- trunk/debian/server-universal/control 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/control 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,16 +1,16 @@
-Source: oracle-xe-we
+Source: oracle-xe-universal
Section: misc
Priority: optional
Maintainer: Joel Becker <joel.becker at oracle.com>
Standards-Version: 3.6.1
Build-Depends: debhelper (>= 4)
-Package: oracle-xe-we
+Package: oracle-xe-universal
Architecture: i386
Depends: libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>=0.3.96)
Section: misc
Conflicts: oracle-xe
-Description: Oracle Database 10g Express Edition (Western European)
+Description: Oracle Database 10g Express Edition
This is the Express Edition of the Oracle Database 10g. This package
- provides Western European languages only.
+ provides the Universal set of languages.
Copied: trunk/debian/server-universal/oracle-xe-universal.conffiles (from rev 26, trunk/debian/server-universal/oracle-xe-we.conffiles)
Copied: trunk/debian/server-universal/oracle-xe-universal.copyright (from rev 26, trunk/debian/server-universal/oracle-xe-we.copyright)
Copied: trunk/debian/server-universal/oracle-xe-universal.docs (from rev 26, trunk/debian/server-universal/oracle-xe-we.docs)
Copied: trunk/debian/server-universal/oracle-xe-universal.install (from rev 26, trunk/debian/server-universal/oracle-xe-we.install)
Copied: trunk/debian/server-universal/oracle-xe-universal.lintian (from rev 26, trunk/debian/server-universal/oracle-xe-we.lintian)
Copied: trunk/debian/server-universal/oracle-xe-universal.manpages (from rev 26, trunk/debian/server-universal/oracle-xe-we.manpages)
Copied: trunk/debian/server-universal/oracle-xe-universal.oracle-xe.default (from rev 26, trunk/debian/server-universal/oracle-xe-we.oracle-xe.default)
Deleted: trunk/debian/server-universal/oracle-xe-we.conffiles
===================================================================
--- trunk/debian/server-universal/oracle-xe-we.conffiles 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/oracle-xe-we.conffiles 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,6 +0,0 @@
-/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
-/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/init.ora
-/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
-/etc/default/oracle-xe
Deleted: trunk/debian/server-universal/oracle-xe-we.copyright
===================================================================
--- trunk/debian/server-universal/oracle-xe-we.copyright 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/oracle-xe-we.copyright 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,6 +0,0 @@
-Copyright (C) Oracle, All Rights Reserved.
-
-This program is distributed under the Oracle Express license. This
-licence can be found as /usr/share/doc/oracle-xe/LICENSE in the
-installation.
-
Deleted: trunk/debian/server-universal/oracle-xe-we.docs
===================================================================
--- trunk/debian/server-universal/oracle-xe-we.docs 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/oracle-xe-we.docs 2006-02-11 05:53:43 UTC (rev 28)
@@ -1 +0,0 @@
-LICENSE
Deleted: trunk/debian/server-universal/oracle-xe-we.install
===================================================================
--- trunk/debian/server-universal/oracle-xe-we.install 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/oracle-xe-we.install 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,42 +0,0 @@
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/ctx
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/dbs
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/demo
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/hs
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jdbc
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jlib
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/ldap
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/lib
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/nls
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/opmn
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/oracore
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/plsql
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/slax
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/sqlplus
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/precomp
-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-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/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/runsqlplus.sh
-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-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
Deleted: trunk/debian/server-universal/oracle-xe-we.lintian
===================================================================
--- trunk/debian/server-universal/oracle-xe-we.lintian 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/oracle-xe-we.lintian 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,6 +0,0 @@
-oracle-xe: executable-not-elf-or-script
-oracle-xe: binary-or-shlib-defines-rpath
-oracle-xe: shlib-with-non-pic-code
-oracle-xe: image-file-in-usr-lib
-oracle-xe: manpage-has-errors-from-man usr/share/man/man1/impdp.1
-oracle-xe: unstripped-binary-or-object ./usr/lib/oracle/xe/app/oracle/product/10.2.0/server/lib/hsdb_ora.so
Deleted: trunk/debian/server-universal/oracle-xe-we.manpages
===================================================================
--- trunk/debian/server-universal/oracle-xe-we.manpages 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/oracle-xe-we.manpages 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,6 +0,0 @@
-debian/tmp/usr/share/man/man1/sqlplus.1
-debian/tmp/usr/share/man/man1/oracle.1
-debian/tmp/usr/share/man/man1/imp.1
-debian/tmp/usr/share/man/man1/exp.1
-debian/tmp/usr/share/man/man1/impdp.1
-debian/tmp/usr/share/man/man1/sqlldr.1
Deleted: trunk/debian/server-universal/oracle-xe-we.oracle-xe.default
===================================================================
--- trunk/debian/server-universal/oracle-xe-we.oracle-xe.default 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/oracle-xe-we.oracle-xe.default 2006-02-11 05:53:43 UTC (rev 28)
@@ -1,3 +0,0 @@
-#
-# Please run "/etc/init.d/oracle-xe configure" to configure Oracle XE.
-#
Modified: trunk/debian/server-universal/rules
===================================================================
--- trunk/debian/server-universal/rules 2006-02-11 01:08:51 UTC (rev 27)
+++ trunk/debian/server-universal/rules 2006-02-11 05:53:43 UTC (rev 28)
@@ -23,7 +23,7 @@
rm -f build-stamp
dh_clean
- rm -f debian/oracle-xe-we.oracle-xe.init
+ rm -f debian/oracle-xe-universal.oracle-xe.init
install: DH_OPTIONS=
install: build
@@ -60,11 +60,11 @@
# Install linitian bits
mkdir -p -m 0755 debian/tmp/usr/share/lintian/overrides
- cp debian/oracle-xe-we.lintian debian/tmp/usr/share/lintian/overrides/oracle-xe-we
+ cp debian/oracle-xe-universal.lintian debian/tmp/usr/share/lintian/overrides/oracle-xe-universal
# Do the init script for Debian-like systems
- mv debian/tmp/etc/init.d/oracle-xe debian/oracle-xe-we.oracle-xe.init
- chmod 0755 debian/oracle-xe-we.oracle-xe.init
+ mv debian/tmp/etc/init.d/oracle-xe debian/oracle-xe-universal.oracle-xe.init
+ chmod 0755 debian/oracle-xe-universal.oracle-xe.init
dh_install
Added: trunk/sources/oracle-xe-universal-10.2.0.1.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/sources/oracle-xe-universal-10.2.0.1.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Xedeb-commits
mailing list