[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/libreoffice/3.3.0/experimental r2275: * debian/rules:



------------------------------------------------------------
revno: 2275
committer: Matthias Klose <doko@canonical.com>
branch nick: 3.3
timestamp: Thu 2010-12-30 16:33:22 +0100
message:
   * debian/rules:
      - Avoid over long lines in build dependencies.
modified:
  changelog
  control
  rules
  scripts/joinctrl.py
=== modified file 'changelog'
--- a/changelog	2010-12-30 15:24:20 +0000
+++ b/changelog	2010-12-30 15:33:22 +0000
@@ -17,7 +17,8 @@
     - Move architecture specific config before distro specific config.
     - Add build support for dh_python2.
     - Do not re-introduce arm (old ARM ABI).
-  * debian/control:
+    - Avoid over long lines in build dependencies.
+  * debian/control.in:
     -  Remove packages and versions in build dependencies,
        which are present in the last old stable release.
     - Avoid empty filed in build dependencies.

=== modified file 'control'
--- a/control	2010-12-30 15:28:35 +0000
+++ b/control	2010-12-30 15:33:22 +0000
@@ -3,9 +3,154 @@
 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 [alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libglu1-mesa-dev [alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [alpha amd64 armel armhf hppa i
 386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , 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 [alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , ant (>= 1.7.0) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], ant-optional (>= 1.7.0) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , gcc-mingw32 [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
  mingw32-runtime [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , libcommons-codec-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libcommons-httpclient-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libcommons-lang-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libcommons-logging-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , libservlet2.5-java , libbase-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libsac-java [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 
 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libxml-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libflute-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libpentaho-reporting-flow-engine-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], liblayout-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libloader-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libformula-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], librepository-java-openoffi
 ce.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libfonts-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libserializer-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , libcommons-logging-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , libservlet2.5-java , xulrunner-dev [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386], libnss3-dev (>= 3.12.3) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-d
 ev (>= 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) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , libhsqldb-java (>> 1.8.0.10) [alpha amd64 
 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , bsh (>= 2.0b4) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386] , 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 [alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libglu1-mesa-dev [alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libpoppler-dev (>= 0.8.0),
+ libgraphite-dev [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ 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 [alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libgcj-common (>= 1:4.4.1) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ ant (>= 1.7.0) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ ant-optional (>= 1.7.0) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ gcc-mingw32 [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ mingw32-runtime [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libcommons-codec-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libcommons-httpclient-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libcommons-lang-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libcommons-logging-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libservlet2.5-java,
+ libbase-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libsac-java [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libxml-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libflute-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libpentaho-reporting-flow-engine-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ liblayout-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libloader-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libformula-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ librepository-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libfonts-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libserializer-java-openoffice.org [alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libcommons-logging-java [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libservlet2.5-java,
+ xulrunner-dev [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libnss3-dev (>= 3.12.3) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ 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) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libebook1.2-dev [!armel],
+ libxrandr-dev,
+ liblucene2-java (>= 2.3.2) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ libhsqldb-java (>> 1.8.0.10) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ bsh (>= 2.0b4) [alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386],
+ 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 14:36:01 +0000
+++ b/rules	2010-12-30 15:33:22 +0000
@@ -1749,7 +1749,8 @@
 endif
 
 	python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
-	mv debian/control.tmp debian/control
+	python debian/scripts/joinctrl.py --split < debian/control.tmp > debian/control
+	rm debian/control.tmp
 
 ifeq "$(VER)" ""
 	# no conflict with "universal Linux packages" as they have the version in their

=== modified file 'scripts/joinctrl.py'
--- a/scripts/joinctrl.py	2008-03-05 11:23:49 +0000
+++ b/scripts/joinctrl.py	2010-12-30 15:33:22 +0000
@@ -5,6 +5,7 @@
 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
@@ -46,7 +47,10 @@
         print line
 
 def main():
-    #splitlines()
-    joinlines()
+    if len(sys.argv) > 1 and sys.argv[1] in ('-s', '--split'):
+        del sys.argv[1]
+        splitlines()
+    else:
+        joinlines()
 
 main()


Reply to: