Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv712

Modified Files:
      Tag: OPENOFFICE_ORG680
        changelog control control.in 
Log Message:
use libpng12-dev, -3-dev is a dummy package

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.7
retrieving revision 1.338.2.25.2.8
diff -u -d -r1.338.2.25.2.7 -r1.338.2.25.2.8
--- changelog   19 Jan 2005 23:45:11 -0000      1.338.2.25.2.7
+++ changelog   20 Jan 2005 01:11:28 -0000      1.338.2.25.2.8
@@ -28,7 +28,7 @@
   * debian/control.in:
     - add new build dependencies: libnss-dev, evolution-data-server-dev,
       kdelibs4-dev, libarchive-zip-perl, mozilla-dev, libnss-dev,
-      libstartup-notification0-dev, libpng3-dev, bzip2, libjpeg62-dev,
+      libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev,
       libxml2-dev
     - update build dependencies: dmake -> dmake (>= 4.3-1)
   * debian/README: remove some obsolete documentation

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.4
retrieving revision 1.142.2.6.2.5
diff -u -d -r1.142.2.6.2.4 -r1.142.2.6.2.5
--- control.in  20 Jan 2005 00:09:06 -0000      1.142.2.6.2.4
+++ control.in  20 Jan 2005 01:11:29 -0000      1.142.2.6.2.5
@@ -3,7 +3,7 @@
 Priority: optional
 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], zlib1g-dev, 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, evolution-data-server-dev, 
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, 
libpng3-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-dev
+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], zlib1g-dev, 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, evolution-data-server-dev, 
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, 
libpng12-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-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-1)
 Standards-Version: 3.6.1
 

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.4
retrieving revision 1.175.2.8.2.5
diff -u -d -r1.175.2.8.2.4 -r1.175.2.8.2.5
--- control     20 Jan 2005 00:09:05 -0000      1.175.2.8.2.4
+++ control     20 Jan 2005 01:11:29 -0000      1.175.2.8.2.5
@@ -3,7 +3,7 @@
 Priority: optional
 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], zlib1g-dev, 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, evolution-data-server-dev, 
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, 
libpng3-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-dev
+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], zlib1g-dev, 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, evolution-data-server-dev, 
libarchive-zip-perl, mozilla-dev, libnss-dev, libstartup-notification0-dev, 
libpng12-dev, dmake (>= 4.3-1), bzip2, libjpeg62-dev, libxml2-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-1)
 Standards-Version: 3.6.1
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to