./packages/libreoffice/3.3.0/experimental r2280: revert r2275
------------------------------------------------------------
revno: 2280
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2010-12-30 21:25:41 +0100
message:
revert r2275
modified:
changelog
control
rules
scripts/joinctrl.py
=== modified file 'changelog'
--- a/changelog 2010-12-30 18:14:00 +0000
+++ b/changelog 2010-12-30 20:25:41 +0000
@@ -17,7 +17,6 @@
- Move architecture specific config before distro specific config.
- Add build support for dh_python2.
- Do not re-introduce arm (old ARM ABI).
- - Avoid over long lines in build dependencies.
- Add a helper macro gen_no_archs to generate macros OOO_NO_<foo>_ARCHS
from OOO_<foo>_ARCHS. Use these macros in build dependencies.
- Factor out SYSTEM_GCC_VERSION macro.
=== modified file 'control'
--- a/control 2010-12-30 17:34:26 +0000
+++ b/control 2010-12-30 20:25:41 +0000
@@ -3,154 +3,9 @@
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release,
- bzip2,
- bison,
- flex,
- libxaw7-dev,
- unzip,
- zip,
- autoconf,
- automake,
- sharutils,
- pkg-config,
- libfontconfig1-dev,
- libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
- 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,
- libjpeg-dev,
- libxml2-dev,
- libexpat1-dev,
- fastjar,
- xsltproc,
- libxkbfile-dev,
- libxinerama-dev,
- x11proto-render-dev,
- unixodbc-dev (>= 2.2.11),
- libxml-parser-perl,
- gperf,
- libpq-dev,
- po-debconf,
- bc,
- wget | curl,
- g++ (>> 4.3.0) [s390],
- gcc (>> 4.3.0) [s390],
- g++-4.4 (>= 4.4.2-5) [armel],
- dpkg-dev (>= 1.15.1),
- libgl1-mesa-dev [!armel !armhf !mips !mipsel],
- libglu1-mesa-dev [!armel !armhf !mips !mipsel],
- libpoppler-dev (>= 0.8.0),
- libgraphite-dev,
- libcurl4-gnutls-dev,
- libssl-dev,
- libdb-dev,
- python-central (>= 0.5),
- python-dev,
- debhelper (>= 7.2.3~),
- epm,
- libcppunit-dev (>= 1.12),
- openjdk-6-jdk [alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc],
- gcj-jdk [!powerpc !powerpcspe !ppc64],
- libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64],
- ant (>= 1.7.0),
- ant-optional (>= 1.7.0),
- gcc-mingw32,
- mingw32-runtime,
- libcommons-codec-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
- libcommons-logging-java,
- libservlet2.5-java,
- libbase-java-openoffice.org [!armel],
- libsac-java [!armel],
- libxml-java-openoffice.org [!armel],
- libflute-java-openoffice.org [!armel],
- libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
- liblayout-java-openoffice.org [!armel],
- libloader-java-openoffice.org [!armel],
- libformula-java-openoffice.org [!armel],
- librepository-java-openoffice.org [!armel],
- libfonts-java-openoffice.org [!armel],
- libserializer-java-openoffice.org [!armel],
- libcommons-logging-java,
- libservlet2.5-java,
- xulrunner-dev,
- libnss3-dev (>= 3.12.3),
- dmake (>= 1:4.11),
- mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
- libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
- mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
- cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386],
- libhunspell-dev (>= 1.1.5-2),
- libhyphen-dev (>= 2.4),
- libstlport4.6-dev (>= 4.6.2-3) [i386],
- libboost-dev (>= 1.38),
- libmdds-dev,
- libvigraimpex-dev,
- libwpd-dev (>= 0.9.0),
- libmythes-dev (>= 2:1.2),
- libwps-dev (>= 0.2.0),
- libwpg-dev (>= 0.2.0),
- libicu-dev (>= 4.0),
- libxslt1-dev,
- libcairo2-dev,
- kdelibs5-dev (>= 4:4.3.4),
- libqt4-dev (>= 4.5),
- libmysqlclient-dev,
- libmysqlcppconn-dev (>= 1.1.0~r791),
- libebook1.2-dev [!armel],
- libxrandr-dev,
- liblucene2-java (>= 2.3.2),
- libhsqldb-java (>> 1.8.0.10),
- bsh (>= 2.0b4),
- liblpsolve55-dev (>= 5.5.0.13-5+b1),
- lp-solve (>= 5.5.0.13-5+b1),
- libsuitesparse-dev (>= 1:3.4.0),
- libdbus-glib-1-dev (>= 0.60),
- libgstreamer-plugins-base0.10-dev,
- libneon27-gnutls-dev,
- librdf0-dev (>= 1.0.8),
- libgtk2.0-dev (>= 2.10),
- libgnomevfs2-dev,
- libgconf2-dev,
- libldap2-dev
-Build-Depends-Indep: fdupes,
- xml-core,
- imagemagick,
- libtextcat-data-utf8,
- fontforge
-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),
- libmono-dev (= 2.4+dfsg-2) [sparc],
- gcj-4.2 (= 4.2.2-6),
- flex (= 2.5.34-1) [amd64],
- libboost1.39-dev (<< 1.39.0-2),
- graphicsmagick-imagemagick-compat (<< 1.3.9~),
- ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
- ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
- ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
- base-files (= 5),
- libhsqldb-java (>= 1.8.1~)
+Build-Depends: lsb-release, bzip2, bison, flex, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [!armel !armhf !mips !mipsel], libglu1-mesa-dev [!armel !armhf !mips !mipsel] , libpoppler-dev (>= 0.8.0) , libgraphite-dev , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12) , openjdk-6-jdk [alpha amd6
4 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc] , gcj-jdk [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64] , ant (>= 1.7.0), ant-optional (>= 1.7.0) , gcc-mingw32, mingw32-runtime , libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java , libservlet2.5-java , libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel] , libcommons-logging-java , libservlet2.5-java , xulrunner-dev, libnss3-dev (>= 3.12.3) , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmon
o-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev , libvigraimpex-dev , libwpd-dev (>= 0.9.0) , libmythes-dev (>= 2:1.2) , libwps-dev (>= 0.2.0) , libwpg-dev (>= 0.2.0) , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) , libhsqldb-java (>> 1.8.0.10) , bsh (>= 2.0b4) , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10)
, libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick , libtextcat-data-utf8 , fontforge
+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), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
XS-Python-Version: current
Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/libreoffice/3.3.0/experimental
=== modified file 'rules'
--- a/rules 2010-12-30 20:21:48 +0000
+++ b/rules 2010-12-30 20:25:41 +0000
@@ -1764,8 +1764,7 @@
endif
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
- python debian/scripts/joinctrl.py --split < debian/control.tmp > debian/control
- rm debian/control.tmp
+ mv debian/control.tmp debian/control
ifeq "$(VER)" ""
# no conflict with "universal Linux packages" as they have the version in their
=== modified file 'scripts/joinctrl.py'
--- a/scripts/joinctrl.py 2010-12-30 15:33:22 +0000
+++ b/scripts/joinctrl.py 2010-12-30 20:25:41 +0000
@@ -5,7 +5,6 @@
def splitlines():
fields = ('Build-Depends', 'Build-Conflicts', 'Build-Depends-Indep', 'Depends', 'Replaces',
'Provides', 'Conflicts', 'Recommends', 'Suggests')
- fields = ('Build-Depends', 'Build-Conflicts', 'Build-Depends-Indep')
for line in fileinput.input():
line = line[:-1]
field = None
@@ -47,10 +46,7 @@
print line
def main():
- if len(sys.argv) > 1 and sys.argv[1] in ('-s', '--split'):
- del sys.argv[1]
- splitlines()
- else:
- joinlines()
+ #splitlines()
+ joinlines()
main()
Reply to: