Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv2279
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
rules
Log Message:
Hmm. Commit again. Somehow only changelog was done last time. Probably
ctrl-c't too late...
- we have to rm some more gifs in clean
- call the binary pkgs 1.1.0+1.1.1rc
- remove not needed files in -sl langpack
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.5
retrieving revision 1.182.4.6
diff -u -d -r1.182.4.5 -r1.182.4.6
--- rules 1 Mar 2004 17:50:01 -0000 1.182.4.5
+++ rules 2 Mar 2004 22:59:24 -0000 1.182.4.6
@@ -322,7 +322,8 @@
# we do not need them and they make problem with dpkg-source....
rm -f $(OOO_BUILD)/desktop/*.png $(OOO_BUILD)/www/*.png \
- $(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s*
+ $(OOO_BUILD)/www/images/*.png $(OOO_BUILD)/templates/*.s* \
+ $(OOO_BUILD)/www/l10n/*.gif
cd $(SOURCE_TREE)/config_office && \
rm -f config.cache config.log \
@@ -995,6 +996,9 @@
# therefore installed in openoffice.org
rm -rf debian/openoffice.org$(VER)-l10n-en$(OPENOFFICEDIR)/user
+ # remove files in -sl langauge pack conflicting with openoffice.org
+ rm -rf debian/openoffice.org$(VER)-l10n-sl$(OPENOFFICEDIR)/user/config
+
touch $@
@@ -1041,7 +1045,9 @@
# -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' \
-V'debianutils-depends=$(DEBIANUTILSDEPENDS)' \
- -V'java-additional-depends=$(JAVA_ADDITOONAL_DEPENDS)'
+ -V'java-additional-depends=$(JAVA_ADDITOONAL_DEPENDS)' \
+ -u-v1.1.0+1.1.1rc-`dpkg-parsechangelog | grep urgency \
+ | awk '{print $2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2`
dh_md5sums
dh_builddeb
