CVS:oo-deb/debian .cvsignore,1.8,1.9 changelog,1.209,1.210 openoffice.org-bin.config,1.2,1.3 openoffice.org.overrides.lintian,1.1,1.2 rules,1.143,1.144

[Rene Engelhard <rene@gluck.debian.org>]

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

Modified Files:
	.cvsignore changelog openoffice.org-bin.config 
	openoffice.org.overrides.lintian rules 
Log Message:
- add openintro_debian.{xcf,bmp} to .cvsignore
- mention xvfb-run calling change (-a)
- s/Ximian+Debian/ooo-build/ in the lintian overrides, too
- fix -bin.config to actually do something with dpkg-reconfigure


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- changelog	10 Oct 2003 16:19:10 -0000	1.209
+++ changelog	11 Oct 2003 18:35:26 -0000	1.210
@@ -57,6 +57,8 @@
   * debian/openoffice.org-bin.install:
     - Add wildcard suffix for Sparc libraries [CH]
     - remove java files [JT]
+  * debian/openoffice.org-bin.config:
+    - fix to make dpkg-reconfigure actually affect anything... [RE]
   * debian/README:
     - update documentation to reflect that OpenOffice.org no longer requires
       a JDK to build, but can optionally be built with one. [JT]
@@ -90,6 +92,7 @@
       debian/patches directory [JT]
     - install ooo-build changelog as changelog.ooo-build.gz instead
       of changelog.Ximian+Debian.gz [RE]
+    - use -a for xvfb-run [RE]
   * debian/scripts/detect_java.sh:
     - removed [JT]
   * debian/setperms:

Index: openoffice.org.overrides.lintian
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org.overrides.lintian,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- openoffice.org.overrides.lintian	22 Aug 2003 13:28:37 -0000	1.1
+++ openoffice.org.overrides.lintian	11 Oct 2003 18:35:26 -0000	1.2
@@ -1,2 +1,2 @@
 # this is not an upstream changelog....
-openoffice.org: wrong-name-for-upstream-changelog usr/share/doc/openoffice.org/changelog.Ximian+Debian.gz
+openoffice.org: wrong-name-for-upstream-changelog usr/share/doc/openoffice.org/changelog.ooo-build.gz

Index: .cvsignore
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- .cvsignore	11 Aug 2003 11:31:30 -0000	1.8
+++ .cvsignore	11 Oct 2003 18:35:26 -0000	1.9
@@ -10,6 +10,8 @@
 openoffice.org-l10n-??-??
 openoffice.org.substvars
 openoffice.org-*.substvars
+openintro_debian.bmp
+openintro_debian.xcf
 *.postinst
 *.postrm
 *.preinst

Index: openoffice.org-bin.config
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/openoffice.org-bin.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openoffice.org-bin.config	25 Aug 2003 20:35:17 -0000	1.2
+++ openoffice.org-bin.config	11 Oct 2003 18:35:26 -0000	1.3
@@ -5,8 +5,9 @@
 # source debconf module
 . /usr/share/debconf/confmodule
 
-if [ -e /etc/openoffice/settings.debconf ]; then
-	. /etc/openoffice/settings.debconf
+CONFIGFILE=/etc/openoffice/settings.debconf
+if [ -e $CONFIGFILE ]; then
+	. $CONFIGFILE
 else
 	prelink=false
 fi
@@ -17,5 +18,17 @@
 	db_set openoffice.org-bin/prelink $prelink
 	db_input medium openoffice.org-bin/prelink || true
 	db_go
-
+	
+	# needed for dpkg-reconfigure...
+	db_get openoffice.org-bin/prelink
+	prelink=$RET
+	if [ -e $CONFIGFILE ]; then
+		TMP=`mktemp -q`
+		cp -a -f $CONFIGFILE $TMP
+		if grep -q "^prelink=.*" $CONFIGFILE; then
+			sed -e s"/^ *prelink=.*/prelink=\"$prelink\"/" \
+			< $CONFIGFILE > $TMP
+		fi
+		mv -f $TMP $CONFIGFILE 
+	fi
 fi

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- rules	11 Oct 2003 14:54:42 -0000	1.143
+++ rules	11 Oct 2003 18:35:26 -0000	1.144
@@ -478,7 +478,7 @@
 		xvfb-run -a debian/scripts/xcftobmp \
 			debian/openintro_debian.xcf && \
 		cp debian/openintro_debian.bmp offmgr/res/openintro_debian.bmp
-		
+
 #		mogrify -colors 8 debian/openintro_debian.bmp && \
 	
 	cd $(TOOLS_DIR)/src && uudecode $(OOO_ICONS_VER).tar.gz.uu
@@ -491,9 +491,9 @@
 	cp -dRvf $(SOURCE_TREE)/$(OOO_ICONS_VER)/* $(SOURCE_TREE)
 
 	# Force rebuild of image lists and resource files
-	find $(SOURCE_TREE)/*/$(ARCHBUILDDIR)/bin -name "*.res" -exec rm {} \;
-	find $(SOURCE_TREE)/*/$(ARCHBUILDDIR)/srs -name "*.srs" -exec rm {} \;
-	find $(SOURCE_TREE)/*/$(ARCHBUILDDIR)/misc -name "*_img??.don" -exec rm {} \;
+	-find $(SOURCE_TREE)/*/$(ARCHBUILDDIR)/bin -name "*.res" -exec rm {} \;
+	-find $(SOURCE_TREE)/*/$(ARCHBUILDDIR)/srs -name "*.srs" -exec rm {} \;
+	-find $(SOURCE_TREE)/*/$(ARCHBUILDDIR)/misc -name "*_img??.don" -exec rm {} \;
 	#find $(SOURCE_TREE) -name '*.src' -exec touch {} \;
 
 	touch $@