------------------------------------------------------------
revno: 1493
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Wed 2009-04-15 11:38:01 +0200
message:
merge
modified:
broffice.org.postrm.in
changelog
control
control.debug.in
control.in
rules
------------------------------------------------------------
revno: 1332.1.119
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Thu 2009-04-09 00:23:39 +0200
message:
typo; update ooo-build
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.120
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Mon 2009-04-13 23:30:26 +0200
message:
released -10 with some updates (ooo-build, GSIs)
modified:
changelog
------------------------------------------------------------
revno: 1332.1.121
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Mon 2009-04-13 23:43:09 +0200
message:
BUILD_KDE=n + conditional improvements (from 3.1 branch)
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.122
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2009-04-15 11:33:39 +0200
message:
Standards-v ersion: 3.8.1
modified:
broffice.org.postrm.in
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.123
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2009-04-15 11:35:28 +0200
message:
fix lintians dbg-package-missing-depends
modified:
changelog
control
control.debug.in
rules
=== modified file 'broffice.org.postrm.in'
--- a/broffice.org.postrm.in 2009-01-07 20:14:44 +0000
+++ b/broffice.org.postrm.in 2009-04-15 09:33:39 +0000
@@ -14,7 +14,7 @@
LANGPACKISOS="@LANGPACKISOS@"
-if [ "$1" = "remove" ]; then
+if [ "$1" = "remove" -o "$1" = "abort-install" -o "$1" = "disappear" ]; then
for i in $DIVERSIONS; do
dpkg-divert --package $THIS_PACKAGE --remove --rename --divert
$i.ooo $i
done
=== modified file 'changelog'
--- a/changelog 2009-04-13 21:28:27 +0000
+++ b/changelog 2009-04-15 09:38:01 +0000
@@ -3,6 +3,10 @@
* debian/control.in, debian/control.kde.in, debian/rules:
- disable -kde and -kdeab as they're for KDE3 (closes: #523899). Improve
BUILD_KDE conditional
+ * debian/control.in, debian/broffice.org.postrm.in:
+ - Standards-Version: 3.8.1
+ * debian/rules, debian/control.debug.in:
+ - fix lintians dbg-package-missing-depends
-- Rene Engelhard <[email protected]> Mon, 13 Apr 2009 19:43:23 +0200
=== modified file 'control'
--- a/control 2009-04-13 17:45:22 +0000
+++ b/control 2009-04-15 09:38:01 +0000
@@ -5,7 +5,7 @@
Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]>
Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), 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)
[powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev,
libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev,
libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes,
xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64]
, gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>=
1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc
mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libflute-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips
mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips
mipsel s390 arm armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>=
2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64],
mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [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] ,
libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-4),
lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
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], base-files (= 5)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
XS-Python-Version: current
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
Vcs-Git: git://anongit.freedesktop.org/git/ooo-build/ooo-build
@@ -3396,7 +3396,8 @@
Section: debug
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Priority: extra
-Depends: ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version} | openoffice.org-gcj (=
${binary:Version} | openoffice.org-dev (= ${binary:Version} |
openoffice.org-gnome (= ${binary:Version} | openoffice.org-kde (=
${binary:Version} | openoffice.org-calc (= ${binary:Version},
openoffice.org-base-core (= ${binary:Version} | openoffice.org-base (=
${binary:Version}, openoffice.org-filter-binfilter (= ${binary:Version} |
openoffice.org-draw (= ${binary:Version}, openoffice.org-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.org (= ${binary:Version}, ${misc:Depends}
+Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.debug.in'
--- a/control.debug.in 2009-03-29 21:16:28 +0000
+++ b/control.debug.in 2009-04-15 09:38:01 +0000
@@ -2,7 +2,8 @@
Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
-Depends: ${misc:Depends}
+Depends: openoffice.orgVER-core (= ${binary:Version} | openoffice.orgVER-gcj
(= ${binary:Version} | openoffice.orgVER-dev (= ${binary:Version} |
openoffice.orgVER-gnome (= ${binary:Version} | openoffice.orgVER-kde (=
${binary:Version} | openoffice.orgVER-calc (= ${binary:Version},
openoffice.orgVER-base-core (= ${binary:Version} | openoffice.orgVER-base (=
${binary:Version}, openoffice.orgVER-filter-binfilter (= ${binary:Version} |
openoffice.orgVER-draw (= ${binary:Version}, openoffice.orgVER-writer (=
${binary:Version} | python-uno (= ${binary:Version} | cli-uno-bridge (=
${binary:Version} | mozilla-openoffice.orgVER (= ${binary:Version},
${misc:Depends}
+Recommends: ure-dbg
Suggests: ${dbg-dbg-suggests}
Description: full-featured office productivity suite -- debug symbols
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.in'
--- a/control.in 2009-04-13 17:45:22 +0000
+++ b/control.in 2009-04-15 09:38:01 +0000
@@ -50,7 +50,7 @@
bc
%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.8.0
+Standards-Version: 3.8.1
XS-Python-Version: @PYTHON_VERSION@
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
Vcs-Git: git://anongit.freedesktop.org/git/ooo-build/ooo-build
=== modified file 'rules'
--- a/rules 2009-04-13 17:45:22 +0000
+++ b/rules 2009-04-15 09:38:01 +0000
@@ -472,7 +472,7 @@
else
SMALL_SYMBOLS = y
endif
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], ure-dbg, libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head
-n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg,
libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg,
libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg
[kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64
!alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg,
libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(shell g++ --version | head
-n 1 | cut -d' ' -f3 | cut -d'.' -f1,2)-dbg, libx11-6-dbg, libxext6-dbg,
libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg,
libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
else
