------------------------------------------------------------
revno: 1162
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-07-15 03:25:07 +0200
message:
Standards-Version: 3.8.0
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-07-15 00:44:55 +0000
+++ b/changelog 2008-07-15 01:25:07 +0000
@@ -6,8 +6,10 @@
* merge from experimental/3.0:
- debian/control.in:
+ remove xutils build-dep, nas was using xmkmf and it's long gone here
+ * debian/control.in:
+ - Standards-Version: 3.8.0 (already following it)
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 14 Jul 2008 13:39:38 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 15 Jul 2008 03:23:54 +0200
openoffice.org (1:2.4.1-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-07-15 00:44:55 +0000
+++ b/control 2008-07-15 01:25:07 +0000
@@ -5,7 +5,7 @@
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcupsys2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0)
[s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390],
libglu1-mesa-dev [i386 powerpc sparc s390] , libcurl4-openssl-dev , libssl-dev
, libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) [i386 powerpc
sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 5.0.51~) ,
gcj-4.3 (>= 4.3.1-2) [armel] , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc
sparc mips mipsel s390 armel amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , mingw32 [i386 powerpc
sparc mips mipsel s390 armel amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10)
[i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libsac-java [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libxml-java [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libflute-1.3-jfree-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips
mipsel s390 armel amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64], libnss3-dev [i386
powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64] , dmake (>= 1:4.11) ,
mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc
amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>=
1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64
ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64
ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libxrandr-dev , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel
s390 armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel
s390 armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>=
5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
XS-Python-Version: current
Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4.1/unstable
Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/branches/ooo-build-2-4-1
=== modified file 'control.in'
--- a/control.in 2008-07-15 00:44:55 +0000
+++ b/control.in 2008-07-15 01:25:07 +0000
@@ -50,7 +50,7 @@
libpq-dev
%BUILD_DEPS%
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
XS-Python-Version: current
Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4.1/unstable
Vcs-Svn: %OOO_BUILD_SVN%
