CVS:oo-deb/debian changelog,1.349,1.350 rules,1.220,1.221
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv18939/debian
Modified Files:
changelog rules
Log Message:
add hack to remove fontconfig dependency from tff-opensymbol on woody backports
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- changelog 10 Jul 2004 14:31:50 -0000 1.349
+++ changelog 10 Jul 2004 18:27:07 -0000 1.350
@@ -1,3 +1,10 @@
+openoffice.org (1.1.2-2.3pre) unstable; urgency=low
+
+ * add hack to remove fontconfig dependency from tff-opensymbol
+ on woody backports [RE]
+
+ -- Rene Engelhard <rene@debian.org> Sat, 10 Jul 2004 20:19:23 +0200
+
openoffice.org (1.1.2-2) unstable; urgency=low
* New patches:
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- rules 10 Jul 2004 14:31:50 -0000 1.220
+++ rules 10 Jul 2004 18:27:07 -0000 1.221
@@ -1138,6 +1138,11 @@
-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)'
# -v1.1.1+1.1.2rc3-`dpkg-parsechangelog | grep urgency \
# | awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2`
+ ifeq "$(PATCHSET)" "DebianWoody"
+ # hack to remove fontconfig dependency on woody backports
+ perl -pi -e 's/(Depends: ).*fontconfig(.*)/\1\2/' \
+ debian/ttf-opensymbol/DEBIAN/control
+ endif
dh_md5sums
dh_builddeb
Reply to: