[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CVS:oo-deb/debian changelog,1.315,1.316 rules,1.208,1.209



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

Modified Files:
	changelog rules 
Log Message:
remove htmltheme.orig, too

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- changelog	7 May 2004 12:01:20 -0000	1.315
+++ changelog	7 May 2004 20:50:40 -0000	1.316
@@ -4,7 +4,7 @@
     - print-resolution-generic: improve generic printer, resolution [MM]
     - build-arch-flags: support ARCH_FLAGS to change compiler flags
       from envrionment [MM]
-    - java-use-xlst-filters: Install Java filters (if Java enabled) [MM]
+    - java-use-xslt-filters: Install Java filters (if Java enabled) [MM]
     - version-strike: OOO_BUILD_EXTENSION can specify a version suffix
       for OOo to display [MM]
     - setup-upgrade,license: No click-through license screen, upgrade from
@@ -32,8 +32,8 @@
     - build with system-python only on sid, woody's default python is too
       old [RE]
     - build with system-neon on sid [RE]
-    - remove .orig files in helpcontent that would otherwise get into install
-      set [CH]
+    - remove .orig files that would (probably) otherwise get into install
+      set (closes: #247781) [CH, RE]
     - build with system STLport; do not create useless stlport-home, just
       use --with-stlport4-home=/usr [RE]
     - get-ooo-build: Gnome CVS module name has changed from openoffice to
@@ -50,7 +50,7 @@
     icons to not confuse imagemagick, thanks Daniel Kobras
     (closes: #247313) [RE]
 
- -- Rene Engelhard <rene@debian.org>  Thu,  6 May 2004 23:30:37 +0200
+ -- Rene Engelhard <rene@debian.org>  Fri,  7 May 2004 22:14:28 +0200
 
 openoffice.org (1.1.1-2) unstable; urgency=high
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- rules	6 May 2004 20:19:40 -0000	1.208
+++ rules	7 May 2004 20:50:40 -0000	1.209
@@ -544,6 +544,8 @@
 	# seperately, but we apply it anyway to help with testing
 	# install sets]
 	rm -f $(SOURCE_TREE)/helpcontent/unx/common/*/*.orig
+	# same with sd-export-html-descr.diff
+	rm -f $(SOURCE_TREE)/extras/source/gallery/htmltheme.orig
 	
         # uudecode OpenSymbol font
 	if [ ! -s $(OOO_BUILD)/fonts/opens___.ttf ]; then \



Reply to: