CVS:oo-deb/debian changelog,1.401,1.402 rules,1.247,1.248

[Chris Halls <halls@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5879

Modified Files:
	changelog rules 
Log Message:
- fix clobbering of DEBHELPER_OPTIONS 
- don't special case buildd user (not needed since the binary-arch/indep split and breaks Ubuntu) 
- don't add splashscreen on Ubuntu 


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- changelog	6 Dec 2004 15:12:25 -0000	1.401
+++ changelog	6 Dec 2004 15:28:46 -0000	1.402
@@ -11,8 +11,12 @@
     - mention -kde and -gtk-gnome in openoffice.orgs description [RE]
   * debian/rules:
     - fix typo in the disable-kde-for-ubuntu section, thanks martink [RE]
+    - fix clobbering of DEBHELPER_OPTIONS [CH]
+    - don't special case buildd user (not needed since the binary-arch/indep
+      split and breaks Ubuntu) [CH]
+    - don't add splashscreen on Ubuntu [CH]
 
- -- Rene Engelhard <rene@debian.org>  Mon,  6 Dec 2004 16:11:04 +0100
+ -- Chris Halls <halls@debian.org>  Mon,  6 Dec 2004 15:23:43 +0000
 
 openoffice.org (1.1.3-3) unstable; urgency=low
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- rules	6 Dec 2004 15:12:25 -0000	1.247
+++ rules	6 Dec 2004 15:28:46 -0000	1.248
@@ -68,6 +68,7 @@
 		 --with-stlport4-home=$(STLPORT_HOME) \
                  --with-python=/usr/bin/python \
 		 --enable-libsn
+DEBHELPER_OPTIONS=
 
 ifneq "$(DIST)" "Ubuntu"
   BUILD_KDE=y
@@ -99,10 +100,9 @@
 ifneq (jdkhome=,$(findstring jdkhome=,$(DEB_BUILD_OPTIONS)))
   USE_JAVA=n
   CONFIGURE_FLAGS+= --disable-java
-  DEBHELPER_OPTIONS=-Nopenoffice.org-java -Nopenoffice.org-dev-doc-java
+  DEBHELPER_OPTIONS+=-Nopenoffice.org-java -Nopenoffice.org-dev-doc-java
 else
   USE_JAVA=y
-  DEBHELPER_OPTIONS=
   JDK_HOME:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*jdkhome=\([^,]*\),.*/\1/p')
   SUNJDK_VER:=$(shell $(JDK_HOME)/bin/java -version 2>&1 | sed -n '1s/java version "\([0-9._]*\)"/\1/p')
   
@@ -122,13 +122,6 @@
 ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
   BUILD_ALL_LANGPACKS=n
   BUILDLANG:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^.*lang=\([^,]*\),.*/\1/p')
-else
-   # the buildds do binary-only builds; thefore we only need to build en
-   # (thanks James Troup for the username info)
-  ifeq (buildd,$(shell whoami))
-    BUILD_ALL_LANGPACKS=n
-    BUILDLANG:=en
-  endif
 endif
 
 ifeq "$(BUILD_ALL_LANGPACKS)" "y"
@@ -593,6 +586,7 @@
 $(STAMP_DIR)/build.prepare.artwork: $(STAMP_DIR)/icons.scale
 $(STAMP_DIR)/build.prepare.artwork: debian/openintro_debian.xcf.uu
 
+ifneq "$(DIST)" "Ubuntu"
 	# add the splashscreen with the Debian logo
 	uudecode debian/openintro_debian.xcf.uu > \
 		debian/openintro_debian.xcf && \
@@ -601,6 +595,7 @@
 		cp debian/openintro_debian.bmp offmgr/res/openintro_debian.bmp
 
 #		mogrify -colors 8 debian/openintro_debian.bmp && \
+endif
 	
 	cd $(OOO_BUILD)/src && uudecode $(OOO_ICONS_VER).tar.gz.uu
 	tar xzf $(OOO_BUILD)/src/$(OOO_ICONS_VER).tar.gz