CVS:oo-deb/debian changelog,1.387,1.388 rules,1.239,1.240
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv14014
Modified Files:
changelog rules
Log Message:
* debian/rules:
- remove autogenerated maintainer scripts in clean,
thanks Matthias Klose for noticing (closes: #281423)
- merge some minor changes from 1.1.3 rules file
* back to .pre version (Ahem Rene! :)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -d -r1.387 -r1.388
--- changelog 16 Nov 2004 11:33:51 -0000 1.387
+++ changelog 16 Nov 2004 13:10:33 -0000 1.388
@@ -1,12 +1,16 @@
-openoffice.org (1.1.2dfsg1-3) unstable; urgency=low
+openoffice.org (1.1.2dfsg1-2.pre3) unstable; urgency=low
- * New patches:
+ * New patches: [RE]
- sigh, and again: actually apply hebrew-culmus.diff (closes: #280084)
- * debian/patches/linux-arm-support:
+ * debian/patches/linux-arm-support: [RE]
- don't define PYTHONLIB=-lpython; the error was somewhere else
- comment out LINKFLAGSDEFS
+ * debian/rules: [CH]
+ - remove autogenerated maintainer scripts in clean,
+ thanks Matthias Klose for noticing (closes: #281423)
+ - merge some minor changes from 1.1.3 rules file
- -- Rene Engelhard <rene@zero> Tue, 16 Nov 2004 11:26:07 +0100
+ -- Chris Halls <halls@debian.org> Tue, 16 Nov 2004 13:08:26 +0000
openoffice.org (1.1.2dfsg1-2) unstable; urgency=medium
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- rules 1 Nov 2004 18:36:57 -0000 1.239
+++ rules 16 Nov 2004 13:10:33 -0000 1.240
@@ -14,7 +14,7 @@
# Modified by Jan-Hendrik Palic <jan.palic@linux-debian.de>
# Modified by Chris Halls <halls@debian.org>
# Modified by Rene Engelhard <rene@debian.org>
-# Copyright 1996-2001,2002,2003 Software in the Public Interest, Inc.
+# Copyright 1996-2004 Software in the Public Interest, Inc.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Branden Robinson, Stephen Early, Mark Eichin, and Manoj Srivastava.
@@ -371,7 +371,8 @@
if [ -d $(OOO_BUILD)/test ]; then \
find $(OOO_BUILD)/test -type f \
\( -name '*.xls' -o -name '*.sx?' -o -name '*.doc' \
- -o -name '*.123' \) -exec rm {} \; ;\
+ -o -name '*.123' -o -name '*.lwp' -o -name '*.ppt' \
+ -o -name '*.wb2' -o -name '*.png' \) -exec rm {} \; ;\
fi
cd $(SOURCE_TREE)/config_office && \
@@ -453,6 +454,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
@@ -594,7 +598,7 @@
fi
ifeq "$(USE_JAVA)" "y"
- # adding them to the classpath somehow doesn't help (done neverthless)
+ # adding them to the classpath somehow doesn't help (done nevertheless)
# we need to make symlinks here...
if [ ! -d external/common ]; then mkdir -p external/common; fi
ln -sf /usr/share/java/xp.jar external/common/parser.jar
Reply to: