CVS:oo-deb/debian changelog,1.350,1.351 control,1.178,1.179 control.in,1.145,1.146 rules,1.221,1.222
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv32142/debian
Modified Files:
changelog control control.in rules
Log Message:
revert my previous commit and just make ttf-opensymbol ony recommend fontconfig
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- rules 10 Jul 2004 18:27:07 -0000 1.221
+++ rules 10 Jul 2004 20:26:40 -0000 1.222
@@ -1138,11 +1138,6 @@
-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
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- control.in 10 Jul 2004 14:31:50 -0000 1.145
+++ control.in 10 Jul 2004 20:26:40 -0000 1.146
@@ -111,7 +111,7 @@
Package: ttf-opensymbol
Architecture: all
-Depends: fontconfig
+Recommends: fontconfig
Section: x11
Replaces: openoffice.org (<< 1.1.1+1.1.2rc3)
Description: The OpenSymbol TrueType font
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -d -r1.350 -r1.351
--- changelog 10 Jul 2004 18:27:07 -0000 1.350
+++ changelog 10 Jul 2004 20:26:40 -0000 1.351
@@ -1,9 +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]
+ * debian/control.in:
+ - just Recommend fontconfig instead of depending on it at
+ ttf-opensymbol [RE]
- -- Rene Engelhard <rene@debian.org> Sat, 10 Jul 2004 20:19:23 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 10 Jul 2004 22:23:17 +0200
openoffice.org (1.1.2-2) unstable; urgency=low
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- control 10 Jul 2004 14:31:50 -0000 1.178
+++ control 10 Jul 2004 20:26:40 -0000 1.179
@@ -111,7 +111,7 @@
Package: ttf-opensymbol
Architecture: all
-Depends: fontconfig
+Recommends: fontconfig
Section: x11
Replaces: openoffice.org (<< 1.1.1+1.1.2rc3)
Description: The OpenSymbol TrueType font
Reply to: