Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv25186/debian
Modified Files:
changelog rules
Log Message:
add | debconf-2.0 to the debconf depends substitution
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- changelog 3 Jun 2004 20:33:28 -0000 1.337
+++ changelog 4 Jun 2004 13:40:29 -0000 1.338
@@ -26,8 +26,10 @@
- build-conflict against libcurl2-dev (= 7.12.0-1) [RE]
* debian/shlibs.woody.local:
- force removal of bogus libfreetype6 dependency on woody backport. [RE]
+ * debian/rules:
+ - add | debconf-2.0 to the debconf depends substitution [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 3 Jun 2004 21:32:57 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 4 Jun 2004 15:25:44 +0200
openoffice.org (1.1.1-3) unstable; urgency=medium
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- rules 1 Jun 2004 22:15:27 -0000 1.213
+++ rules 4 Jun 2004 13:40:29 -0000 1.214
@@ -1118,7 +1118,7 @@
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
- dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER))' \
+ dh_gencontrol -- -V'debconf-depends=debconf (>= $(MINDEBCONFVER)) |
debconf-2.0' \
-V'python-depends=$(PYTHON_DEPENDS)' \
-V'java-additional-depends=$(JAVA_ADDITIONAL_DEPENDS)'
# -v1.1.0+1.1.1rc3-`dpkg-parsechangelog | grep urgency \
