Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv4111
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog control control.in
Log Message:
Build-Conflict against debhelper 4.2.22 (dh_desktop broken)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.28
retrieving revision 1.362.2.29
diff -u -d -r1.362.2.28 -r1.362.2.29
--- changelog 28 Oct 2004 14:11:26 -0000 1.362.2.28
+++ changelog 28 Oct 2004 23:56:30 -0000 1.362.2.29
@@ -52,6 +52,7 @@
- change -mimelnk description to say that we ship additioal mimelnks
to those in kdelibs-data [RE]
- add libebook-dev to Build-Depends: [RE]
+ - Build Conflict against broken (dh_desktop) debhelper 4.2.22 [RE]
* debian/rules:
- use ooo-build-1-3 branch of ooo-build [RE]
- --enable-kde --enable-gtk --enable-libsn [RE]
@@ -94,7 +95,7 @@
* debian/openoffice.org-bin.templates.master: rename to .templates [RE]
* debian/po/*: update for plain po-debconf usage [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 28 Oct 2004 16:09:54 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 29 Oct 2004 01:53:41 +0200
openoffice.org (1.1.2-5) unstable; urgency=high
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.153.2.13
retrieving revision 1.153.2.14
diff -u -d -r1.153.2.13 -r1.153.2.14
--- control.in 24 Oct 2004 00:36:52 -0000 1.153.2.13
+++ control.in 28 Oct 2004 23:56:30 -0000 1.153.2.14
@@ -4,7 +4,7 @@
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev,
libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev,
render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>=
4.6.2-1), libcupsys2-dev, kdelibs4-dev, libgnomevfs2-dev,
libstartup-notification0-dev, libebook-dev
-Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-3)
+Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Package: openoffice.org
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.186.2.15
retrieving revision 1.186.2.16
diff -u -d -r1.186.2.15 -r1.186.2.16
--- control 24 Oct 2004 00:36:45 -0000 1.186.2.15
+++ control 28 Oct 2004 23:56:30 -0000 1.186.2.16
@@ -4,7 +4,7 @@
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: bison (>= 1:1.875a-1) | bison (<= 1:1.75-1), debhelper (>=
4.2.21), flex | flex-old, libpam0g-dev | libpam-dev, libxaw7-dev, tcsh, unzip,
zip, g++-3.3 (>= 1:3.3.1-1), autoconf, sharutils, libgtk2.0-dev, pkg-config,
libart-2.0-dev (>= 2.3.8), xsltproc (>= 1.0.30), imagemagick, xutils,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], gimp | gimp1.2, xvfb, xbase-clients, xfonts-base, zlib1g-dev, dmake,
libfreetype6-dev, libdb4.2++-dev, libaudio-dev, xlibs-static-pic, libx11-dev,
libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, libcurl3-dev,
libmyspell-dev (>= 1:3.1-1), libaltlinuxhyph-dev (>= 0.1.1-6), libxrender-dev,
render-dev, unixodbc-dev, python-dev, libneon23-dev, libstlport4.6-dev (>=
4.6.2-1), libcupsys2-dev, kdelibs4-dev, libgnomevfs2-dev,
libstartup-notification0-dev, libebook-dev
-Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-3)
+Build-Conflicts: g++-3.3 (= 1:3.3.3-0pre3), libart-2.0-dev (= 2.3.16-3),
libart-2.0-dev (= 2.3.16-4), libidn11 (<< 0.5.2-3), debhelper (= 4.2.22)
Standards-Version: 3.6.1
Package: openoffice.org
