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

CVS:oo-deb/debian changelog,1.262.4.30,1.262.4.31 rules,1.182.4.14,1.182.4.15



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

Modified Files:
      Tag: OPENOFFICE_ORG_1_1_1
	changelog rules 
Log Message:
* debian/rules:
   - Remove new binary bitmaps for Red Hat


Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.30
retrieving revision 1.262.4.31
diff -u -d -r1.262.4.30 -r1.262.4.31
--- changelog	22 Mar 2004 12:47:48 -0000	1.262.4.30
+++ changelog	22 Mar 2004 15:11:19 -0000	1.262.4.31
@@ -1,8 +1,10 @@
 openoffice.org (1.1.0+cvs20040317-1.2pre) unstable; urgency=low
 
   * debian/control.in: 
-    + Tighten dependencies between packages to ensure all main packages are at
+    - Tighten dependencies between packages to ensure all main packages are at
       least 1.1.1rc3 (closes: #239193) [CH]
+  * debian/rules:
+    - Remove new binary bitmaps for Red Hat [CH]
 
  -- Chris Halls <halls@debian.org>  Mon, 22 Mar 2004 13:44:12 +0100
 

Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.14
retrieving revision 1.182.4.15
diff -u -d -r1.182.4.14 -r1.182.4.15
--- rules	18 Mar 2004 05:22:05 -0000	1.182.4.14
+++ rules	22 Mar 2004 15:11:19 -0000	1.182.4.15
@@ -344,6 +344,10 @@
 	# remove xcf and bmp of the Debian splashscreen
 	rm -f debian/openintro_debian.xcf debian/openintro_debian.bmp \
 		offmgr/res/openintro_debian.bmp
+	
+	# remove Red Hat binary bitmaps
+	rm -f ooo-build/src/openabout_redhat.bmp \
+	      ooo-build/src/openintro_redhat.bmp
 
 	# undo scaling (i.e. remove stamps, scaled icons)
 	chmod 755 $(OOO_BUILD)/bin/scale-icons



Reply to: