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

Modified Files:
      Tag: OPENOFFICE_ORG680
        control control.in changelog 
Log Message:
clean builddeps up a bit, li{xt,xp}-java not yet used, epm still needed because 
--disable-epm is buggy

Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.338.2.25.2.32
retrieving revision 1.338.2.25.2.33
diff -u -d -r1.338.2.25.2.32 -r1.338.2.25.2.33
--- changelog   31 Mar 2005 22:15:54 -0000      1.338.2.25.2.32
+++ changelog   3 Apr 2005 00:57:04 -0000       1.338.2.25.2.33
@@ -40,6 +40,8 @@
       we need the Mozilla profile for XML Security... [RE]
     - also use ${base-version} at the -debian-files dependency in -core [RE]
     - add openoffice.org2-filter-so52 [RE]
+    - temporarily build-depend on epm since --disable-epm is not working
+      at the moment.
   * debian/control.help.in:
     - add openoffice.org-help-* stuff [RE]
   * debian/rules:
@@ -74,7 +76,7 @@
    - some cleanup [RE]
   * debian/java-gcj-compat_1.0.14.orig.tar.gz.uu: add [RE]
 
- -- Rene Engelhard <[EMAIL PROTECTED]>  Thu, 31 Mar 2005 13:58:54 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]>  Sun,  3 Apr 2005 02:51:07 +0200
 
 openoffice.org2 (1.9.76-0pre) experimental; urgency=low
 

Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.142.2.6.2.22
retrieving revision 1.142.2.6.2.23
diff -u -d -r1.142.2.6.2.22 -r1.142.2.6.2.23
--- control.in  30 Mar 2005 17:33:40 -0000      1.142.2.6.2.22
+++ control.in  3 Apr 2005 00:57:04 -0000       1.142.2.6.2.23
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), 
gij-4.0 (>= 4.0-0pre7), libgcj6-dev (>= 4.0-0pre7), autoconf, sharutils, 
libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, 
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) 
[powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, 
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, 
libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, 
libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 
1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, 
libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm 
%Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%, libldap2-dev, 
libexpat1-dev, libgnomevfs2-dev, l
 ibant1.6-java, gjdoc, fastjar, libsndfile1-dev, libxp-java, libxt-java, 
libxerces2-java
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), 
gij-4.0 (>= 4.0-0pre7), libgcj6-dev (>= 4.0-0pre7), autoconf, sharutils, 
libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, 
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) 
[powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, 
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, 
libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, 
libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 
1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, 
libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm 
%Ubuntu=libxinerama-dev, libarts1-dev, libqt3-mt-dev, xlibs-dev%, libldap2-dev, 
libexpat1-dev, libgnomevfs2-dev, l
 ibant1.6-java, gjdoc, fastjar, libsndfile1-dev, epm
 Standards-Version: 3.6.1
 
 Package: openoffice.orgVER

Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.175.2.8.2.21
retrieving revision 1.175.2.8.2.22
diff -u -d -r1.175.2.8.2.21 -r1.175.2.8.2.22
--- control     30 Mar 2005 17:33:40 -0000      1.175.2.8.2.21
+++ control     3 Apr 2005 00:57:02 -0000       1.175.2.8.2.22
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), 
gij-4.0 (>= 4.0-0pre7), libgcj6-dev (>= 4.0-0pre7), autoconf, sharutils, 
libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, 
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) 
[powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, 
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, 
libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, 
libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 
1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, 
libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm , libldap2-dev, 
libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar, 
libsndfile1-dev, libxp-java, libx
 t-java, libxerces2-java
+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++-4.0 (>= 4.0-0pre7), gcc-4.0 (>= 4.0-0pre7), gcj-4.0 (>= 4.0-0pre7), 
gij-4.0 (>= 4.0-0pre7), libgcj6-dev (>= 4.0-0pre7), autoconf, sharutils, 
libgtk2.0-dev, pkg-config, libart-2.0-dev (>= 2.3.13), imagemagick, xutils, 
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) 
[powerpc], zlib1g-dev, libfreetype6-dev, libaudio-dev, xlibs-static-pic, 
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libice-dev, libsane-dev, 
libcurl3-dev, libxrender-dev, render-dev, unixodbc-dev, python-dev, 
libneon24-dev, libcupsys2-dev, libarchive-zip-perl, mozilla-dev, libnss-dev (>= 
1.7.5), libstartup-notification0-dev, libpng12-dev, bzip2, libjpeg62-dev, 
libxml2-dev, kdelibs4-dev, dmake (>=4.3-1), lsb-release, rpm , libldap2-dev, 
libexpat1-dev, libgnomevfs2-dev, libant1.6-java, gjdoc, fastjar, 
libsndfile1-dev, epm
 Standards-Version: 3.6.1
 
 Package: openoffice.org2


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

Reply via email to