./packages/libreoffice/3.3.0/experimental r2284: debian/scripts/joinctrl.py:
------------------------------------------------------------
revno: 2284
committer: Matthias Klose <doko@canonical.com>
branch nick: 3.3
timestamp: Thu 2010-12-30 22:07:33 +0100
message:
debian/scripts/joinctrl.py:
- Normalize whitespace in dependencies and similiar fields.
modified:
changelog
control
scripts/joinctrl.py
=== modified file 'changelog'
--- a/changelog 2010-12-30 20:40:47 +0000
+++ b/changelog 2010-12-30 21:07:33 +0000
@@ -26,6 +26,8 @@
which are present in the last old stable release.
- Avoid empty filed in build dependencies.
- Adjust for slightly changed OOO_NO_BASE_ARCHS macro.
+ * debian/scripts/joinctrl.py:
+ - Normalize whitespace in dependencies and similiar fields.
-- Rene Engelhard <rene@debian.org> Wed, 29 Dec 2010 23:57:14 +0100
=== modified file 'control'
--- a/control 2010-12-30 20:26:12 +0000
+++ b/control 2010-12-30 21:07:33 +0000
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex (>= 2.5.25-7) | flex-old, 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-amd
64 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-Depends: lsb-release, bzip2, bison, flex (>= 2.5.25-7) | flex-old, 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~)
Standards-Version: 3.8.4
XS-Python-Version: current
@@ -457,7 +457,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ar , ttf-arabeyes
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ar, ttf-arabeyes
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-ar | myspell-dictionary-ar, libreoffice-hyphenation-ar, libreoffice-help-ar
Description: office productivity suite -- Arabic language package
@@ -587,7 +587,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-bn , ttf-bengali-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-bn, ttf-bengali-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-bn | myspell-dictionary-bn, libreoffice-hyphenation-bn, libreoffice-help-bn
Description: office productivity suite -- Bengali language package
@@ -795,7 +795,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-dz , ttf-dzongkha
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-dz, ttf-dzongkha
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-dz | myspell-dictionary-dz, libreoffice-hyphenation-dz, libreoffice-help-dz
Description: office productivity suite -- Dzongkha language package
@@ -1003,7 +1003,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fa , ttf-farsiweb
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fa, ttf-farsiweb
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-fa | myspell-dictionary-fa, libreoffice-hyphenation-fa, libreoffice-help-fa
Description: office productivity suite -- Farsi language package
@@ -1133,7 +1133,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gu , ttf-gujarati-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gu, ttf-gujarati-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-gu | myspell-dictionary-gu, libreoffice-hyphenation-gu, libreoffice-help-gu
Description: office productivity suite -- Gujarati language package
@@ -1159,7 +1159,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-he , culmus
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-he, culmus
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-he | myspell-dictionary-he, libreoffice-hyphenation-he, libreoffice-help-he, libreoffice-ctl-he
Description: office productivity suite -- Hebrew language package
@@ -1367,7 +1367,7 @@
Section: localization
Architecture: all
Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-km , ttf-khmeros
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-km, ttf-khmeros
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-km | myspell-dictionary-km, libreoffice-hyphenation-km, libreoffice-help-km
Description: office productivity suite -- Khmer language package
@@ -1549,7 +1549,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ml , ttf-malayalam-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ml, ttf-malayalam-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-ml | myspell-dictionary-ml, libreoffice-hyphenation-ml, libreoffice-help-ml
Description: office productivity suite -- Malayalam language package
@@ -1575,7 +1575,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-mr , ttf-devanagari-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-mr, ttf-devanagari-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-mr | myspell-dictionary-mr, libreoffice-hyphenation-mr, libreoffice-help-mr
Description: office productivity suite -- Marathi language package
@@ -1627,7 +1627,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ne , ttf-devanagari-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ne, ttf-devanagari-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-ne | myspell-dictionary-ne, libreoffice-hyphenation-ne, libreoffice-help-ne
Description: office productivity suite -- Nepalese language package
@@ -1809,7 +1809,7 @@
Section: localization
Architecture: all
Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1), ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-or , ttf-oriya-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-or, ttf-oriya-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-or | myspell-dictionary-or, libreoffice-hyphenation-or, libreoffice-help-or
Description: office productivity suite -- Oriya language package
@@ -1835,7 +1835,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pa , ttf-punjabi-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pa, ttf-punjabi-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-pa-in | myspell-dictionary-pa-in, libreoffice-hyphenation-pa-in, libreoffice-help-pa-in
Description: office productivity suite -- Punjabi language package
@@ -2199,7 +2199,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ta , ttf-tamil-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ta, ttf-tamil-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-ta | myspell-dictionary-ta, libreoffice-hyphenation-ta, libreoffice-help-ta
Description: office productivity suite -- Tamil language package
@@ -2225,7 +2225,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-te , ttf-telugu-fonts
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-te, ttf-telugu-fonts
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-te | myspell-dictionary-te, libreoffice-hyphenation-te, libreoffice-help-te
Description: office productivity suite -- Telugu language package
@@ -2277,7 +2277,7 @@
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-th , ttf-thai-tlwg
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-th, ttf-thai-tlwg
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-th | myspell-dictionary-th, libreoffice-hyphenation-th, libreoffice-help-th
Description: office productivity suite -- Thai language package
=== modified file 'scripts/joinctrl.py'
--- a/scripts/joinctrl.py 2010-12-30 20:25:41 +0000
+++ b/scripts/joinctrl.py 2010-12-30 21:07:33 +0000
@@ -1,6 +1,6 @@
#! /usr/bin/python
-import sys, fileinput
+import re, sys, fileinput
def splitlines():
fields = ('Build-Depends', 'Build-Conflicts', 'Build-Depends-Indep', 'Depends', 'Replaces',
@@ -33,7 +33,7 @@
buffer = buffer + ' ' + line.strip()
continue
else:
- print buffer
+ print re.sub(r' *,', r',', buffer)
buffer = None
field = None
for f in fields:
Reply to: