CVS:oo-deb/debian changelog,1.338.2.12,1.338.2.13 rules,1.214.2.9,1.214.2.10

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

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

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_2
	changelog rules 
Log Message:
  * Start 1.1.2-1.2pre
  * Modified patches:
     - gui-fonts-kde: Fix case where font size is -1 points and size
       must be obtained from pixel height field (closes: #254543) 
  * debian/rules:
     - prevent backups of .bmp files in ooo-build, to prevent dpkg-source
       errors after build/clean/build cycle 


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.12
retrieving revision 1.338.2.13
diff -u -d -r1.338.2.12 -r1.338.2.13
--- changelog	28 Jun 2004 23:48:01 -0000	1.338.2.12
+++ changelog	5 Jul 2004 12:15:35 -0000	1.338.2.13
@@ -1,3 +1,14 @@
+openoffice.org (1.1.2-1.2pre) experimental; urgency=low
+
+  * Modified patches:
+     - gui-fonts-kde: Fix case where font size is -1 points and size 
+       must be obtained from pixel height field (closes: #254543) [CH]
+  * debian/rules:
+     - prevent backups of .bmp files in ooo-build, to prevent dpkg-source
+       errors after build/clean/build cycle [CH]
+
+ -- Chris Halls <halls@debian.org>  Mon,  5 Jul 2004 13:56:18 +0200
+
 openoffice.org (1.1.2-1) experimental; urgency=low
 
   * New upstream release.

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.214.2.9
retrieving revision 1.214.2.10
diff -u -d -r1.214.2.9 -r1.214.2.10
--- rules	18 Jun 2004 07:29:16 -0000	1.214.2.9
+++ rules	5 Jul 2004 12:15:35 -0000	1.214.2.10
@@ -396,9 +396,10 @@
 
 	# Delete all bmp and bmp.orig files if we have the backup
 	if [ -d modified_files ]; then \
-	  find . ! -path './ooo-icons*' -a ! -path './debian*' \
-	    -a ! -path *unx*.pro* -a ! -path './modified_files*' \
-	    -a \( -name '*.bmp' -o -name '*.bmp.orig' \) -exec rm {} \; ;\
+	  find . ! -path './ooo-icons*' ! -path './debian*' \
+	    ! -path '$(OOO_BUILD)' \
+	    ! -path *unx*.pro* ! -path './modified_files*' \
+	    \( -name '*.bmp' -o -name '*.bmp.orig' \) -exec rm {} \; ;\
 	fi
 
 	# Delete html export buttons
@@ -518,9 +519,10 @@
 	mkdir -p modified_files 
 
 	# Back up all bmp files (!)
-	find . ! -path './ooo-icons*' -a ! -path './debian*' \
-	  -a ! -path *unx*.pro* -a ! -path './modified_files*' \
-	  -a -name '*.bmp' -exec cp -fp --parent {} modified_files \;
+	find . ! -path './ooo-icons*' ! -path './debian*' \
+	  ! -path '$(OOO_BUILD)' \
+	  ! -path *unx*.pro* ! -path './modified_files*' \
+	  -name '*.bmp' -exec cp -fp --parent {} modified_files \;
 
 	# Back up source files that we modify
 	for f in dmake/configure config_office/configure; do \