CVS:oo-deb/debian changelog,1.362.2.38,1.362.2.39 rules,1.231.2.24,1.231.2.25
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv5327
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog rules
Log Message:
Forward port fix for generated maintainer script removal
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.38
retrieving revision 1.362.2.39
diff -u -d -r1.362.2.38 -r1.362.2.39
--- changelog 15 Nov 2004 14:30:42 -0000 1.362.2.38
+++ changelog 16 Nov 2004 13:13:28 -0000 1.362.2.39
@@ -10,11 +10,13 @@
JDK 1.4?) (closes: #260435) [RE]
* debian/rules:
- remove patch apply conditionals on arm, now in ooo-build proper [RE]
+ - remove autogenerated maintainer scripts in clean,
+ thanks Matthias Klose for noticing [CH]
* debian/patches/linux-arm-support.diff: remove, now in ooo-build proper [RE]
* debian/MANIFEST.arm: remove bogus blank line [RE]
* merge 1.1.2dfsg1-2 [RE]
- -- Rene Engelhard <rene@debian.org> Mon, 15 Nov 2004 15:29:04 +0100
+ -- Chris Halls <halls@debian.org> Tue, 16 Nov 2004 13:11:51 +0000
openoffice.org (1.1.3-1) experimental; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.231.2.24
retrieving revision 1.231.2.25
diff -u -d -r1.231.2.24 -r1.231.2.25
--- rules 11 Nov 2004 22:11:47 -0000 1.231.2.24
+++ rules 16 Nov 2004 13:13:28 -0000 1.231.2.25
@@ -423,6 +423,9 @@
rm -f external/common/xt.jar
rm -f external/common/parser.jar
+ # Files created in debian directory
+ rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
+
$(MAKE) -f debian/rules control
Reply to: