./packages/openofficeorg/3.0.1/unstable r1456: merge
------------------------------------------------------------
revno: 1456
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-15 11:42:15 +0200
message:
merge
modified:
changelog
control
control.debug.in
control.in
control.lang.in
control.ure.in
=== modified file 'changelog'
--- a/changelog 2009-04-15 09:35:28 +0000
+++ b/changelog 2009-04-15 09:42:15 +0000
@@ -7,6 +7,10 @@
- Standards-Version: 3.8.1
* debian/rules, debian/control.debug.in:
- fix lintians dbg-package-missing-depends
+ * debian/control*in:
+ - update for new sections:
+ - -dbg -> debug, -l10n-* -> localization, -officebean -> java,
+ -base -> database
-- Rene Engelhard <rene@debian.org> Mon, 13 Apr 2009 19:43:23 +0200
=== modified file 'control'
--- a/control 2009-04-15 09:35:28 +0000
+++ b/control 2009-04-15 09:42:15 +0000
@@ -219,7 +219,11 @@
Package: openoffice.org-base
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
+<<<<<<< TREE
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
+=======
+Section: database
+>>>>>>> MERGE-SOURCE
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java, openoffice.org-gcj, openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${binary:Version}), openoffice.org-common (= 2.0.4-4)
@@ -399,8 +403,12 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
+<<<<<<< TREE
Section: misc
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends}, ${misc:Depends}
+=======
+Section: java
+>>>>>>> MERGE-SOURCE
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
@@ -474,6 +482,7 @@
OpenOffice.org 1.x(!) XML file format.
Package: openoffice.org-l10n-af
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-af
@@ -501,6 +510,7 @@
the language packs.
Package: openoffice.org-l10n-ar
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ar , ttf-arabeyes
@@ -528,6 +538,7 @@
the language packs.
Package: openoffice.org-l10n-as-in
+Section: localization
Architecture: all
Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1), ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-as
@@ -555,6 +566,7 @@
the language packs.
Package: openoffice.org-l10n-be-by
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-be
@@ -582,6 +594,7 @@
the language packs.
Package: openoffice.org-l10n-bg
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-bg
@@ -609,6 +622,7 @@
the language packs.
Package: openoffice.org-l10n-bn
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-bn , ttf-bengali-fonts
@@ -636,6 +650,7 @@
the language packs.
Package: openoffice.org-l10n-br
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-br
@@ -663,6 +678,7 @@
the language packs.
Package: openoffice.org-l10n-bs
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-bs
@@ -690,6 +706,7 @@
the language packs.
Package: openoffice.org-l10n-ca
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ca
@@ -717,6 +734,7 @@
the language packs.
Package: openoffice.org-l10n-cs
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-cs
@@ -744,6 +762,7 @@
the language packs.
Package: openoffice.org-l10n-cy
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-cy
@@ -771,6 +790,7 @@
the language packs.
Package: openoffice.org-l10n-da
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-da
@@ -798,6 +818,7 @@
the language packs.
Package: openoffice.org-l10n-de
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-de
@@ -825,6 +846,7 @@
the language packs.
Package: openoffice.org-l10n-dz
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-dz , ttf-dzongkha
@@ -852,6 +874,7 @@
the language packs.
Package: openoffice.org-l10n-el
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-el
@@ -879,6 +902,7 @@
the language packs.
Package: openoffice.org-l10n-en-gb
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-en
@@ -906,6 +930,7 @@
the language packs.
Package: openoffice.org-l10n-en-za
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-en
@@ -933,6 +958,7 @@
the language packs.
Package: openoffice.org-l10n-eo
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-eo
@@ -960,6 +986,7 @@
the language packs.
Package: openoffice.org-l10n-es
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-es
@@ -987,6 +1014,7 @@
the language packs.
Package: openoffice.org-l10n-et
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-et
@@ -1014,6 +1042,7 @@
the language packs.
Package: openoffice.org-l10n-eu
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-eu
@@ -1041,6 +1070,7 @@
the language packs.
Package: openoffice.org-l10n-fa
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-fa , ttf-farsiweb
@@ -1068,6 +1098,7 @@
the language packs.
Package: openoffice.org-l10n-fi
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-fi
@@ -1095,6 +1126,7 @@
the language packs.
Package: openoffice.org-l10n-fr
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-fr
@@ -1122,6 +1154,7 @@
the language packs.
Package: openoffice.org-l10n-ga
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ga
@@ -1149,6 +1182,7 @@
the language packs.
Package: openoffice.org-l10n-gl
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-gl
@@ -1176,6 +1210,7 @@
the language packs.
Package: openoffice.org-l10n-gu-in
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-gu , ttf-gujarati-fonts
@@ -1203,6 +1238,7 @@
the language packs.
Package: openoffice.org-l10n-he
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-he , culmus
@@ -1230,6 +1266,7 @@
the language packs.
Package: openoffice.org-l10n-hi-in
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-hi , ttf-devanagari-fonts
@@ -1257,6 +1294,7 @@
the language packs.
Package: openoffice.org-l10n-hr
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-hr
@@ -1284,6 +1322,7 @@
the language packs.
Package: openoffice.org-l10n-hu
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-hu
@@ -1311,6 +1350,7 @@
the language packs.
Package: openoffice.org-l10n-it
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-it
@@ -1338,6 +1378,7 @@
the language packs.
Package: openoffice.org-l10n-ja
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ja
@@ -1365,6 +1406,7 @@
the language packs.
Package: openoffice.org-l10n-ka
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ka
@@ -1392,6 +1434,7 @@
the language packs.
Package: openoffice.org-l10n-km
+Section: localization
Architecture: all
Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-km , ttf-khmeros
@@ -1419,6 +1462,7 @@
the language packs.
Package: openoffice.org-l10n-ko
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ko
@@ -1446,6 +1490,7 @@
the language packs.
Package: openoffice.org-l10n-ku
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ku
@@ -1473,6 +1518,7 @@
the language packs.
Package: openoffice.org-l10n-lo
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-lo , ttf-lao
@@ -1500,6 +1546,7 @@
the language packs.
Package: openoffice.org-l10n-lt
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-lt
@@ -1527,6 +1574,7 @@
the language packs.
Package: openoffice.org-l10n-lv
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-lv
@@ -1554,6 +1602,7 @@
the language packs.
Package: openoffice.org-l10n-mk
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-mk
@@ -1581,6 +1630,7 @@
the language packs.
Package: openoffice.org-l10n-mn
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-mn
@@ -1608,6 +1658,7 @@
the language packs.
Package: openoffice.org-l10n-ml-in
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ml , ttf-malayalam-fonts
@@ -1635,6 +1686,7 @@
the language packs.
Package: openoffice.org-l10n-mr-in
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-mr , ttf-devanagari-fonts
@@ -1662,6 +1714,7 @@
the language packs.
Package: openoffice.org-l10n-nb
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-nb
@@ -1689,6 +1742,7 @@
the language packs.
Package: openoffice.org-l10n-ne
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ne , ttf-devanagari-fonts
@@ -1716,6 +1770,7 @@
the language packs.
Package: openoffice.org-l10n-nl
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-nl
@@ -1743,6 +1798,7 @@
the language packs.
Package: openoffice.org-l10n-nn
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-nn
@@ -1770,6 +1826,7 @@
the language packs.
Package: openoffice.org-l10n-nr
+Section: localization
Architecture: all
Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1), ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-nr
@@ -1797,6 +1854,7 @@
the language packs.
Package: openoffice.org-l10n-ns
+Section: localization
Architecture: all
Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ns
@@ -1824,6 +1882,7 @@
the language packs.
Package: openoffice.org-l10n-or-in
+Section: localization
Architecture: all
Depends: locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1), ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-or , ttf-oriya-fonts
@@ -1851,6 +1910,7 @@
the language packs.
Package: openoffice.org-l10n-pa-in
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-pa , ttf-punjabi-fonts
@@ -1878,6 +1938,7 @@
the language packs.
Package: openoffice.org-l10n-pl
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-pl
@@ -1905,6 +1966,7 @@
the language packs.
Package: openoffice.org-l10n-pt
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-pt
@@ -1932,6 +1994,7 @@
the language packs.
Package: openoffice.org-l10n-pt-br
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-pt
@@ -1959,6 +2022,7 @@
the language packs.
Package: openoffice.org-l10n-ro
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ro
@@ -1986,6 +2050,7 @@
the language packs.
Package: openoffice.org-l10n-ru
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ru
@@ -2013,6 +2078,7 @@
the language packs.
Package: openoffice.org-l10n-rw
+Section: localization
Architecture: all
Depends: locales (>= 2.3.6) | belocs-locales-data | locales-all (>= 2.3.6), ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-rw
@@ -2040,6 +2106,7 @@
the language packs.
Package: openoffice.org-l10n-sk
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-sk
@@ -2067,6 +2134,7 @@
the language packs.
Package: openoffice.org-l10n-sl
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-sl
@@ -2094,6 +2162,7 @@
the language packs.
Package: openoffice.org-l10n-sr
+Section: localization
Architecture: all
Depends: locales (>= 2.3.6.ds1-5) | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-sr
@@ -2121,6 +2190,7 @@
the language packs.
Package: openoffice.org-l10n-ss
+Section: localization
Architecture: all
Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ss
@@ -2148,6 +2218,7 @@
the language packs.
Package: openoffice.org-l10n-st
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-st
@@ -2175,6 +2246,7 @@
the language packs.
Package: openoffice.org-l10n-sv
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-sv
@@ -2202,6 +2274,7 @@
the language packs.
Package: openoffice.org-l10n-ta-in
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ta , ttf-tamil-fonts
@@ -2229,6 +2302,7 @@
the language packs.
Package: openoffice.org-l10n-te-in
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-te , ttf-telugu-fonts
@@ -2256,6 +2330,7 @@
the language packs.
Package: openoffice.org-l10n-tg
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-tg
@@ -2283,6 +2358,7 @@
the language packs.
Package: openoffice.org-l10n-th
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-th , ttf-thai-tlwg
@@ -2310,6 +2386,7 @@
the language packs.
Package: openoffice.org-l10n-tn
+Section: localization
Architecture: all
Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-tn
@@ -2337,6 +2414,7 @@
the language packs.
Package: openoffice.org-l10n-tr
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-tr
@@ -2364,6 +2442,7 @@
the language packs.
Package: openoffice.org-l10n-ts
+Section: localization
Architecture: all
Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ts
@@ -2391,6 +2470,7 @@
the language packs.
Package: openoffice.org-l10n-uk
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-uk
@@ -2418,6 +2498,7 @@
the language packs.
Package: openoffice.org-l10n-uz
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-uz
@@ -2445,6 +2526,7 @@
the language packs.
Package: openoffice.org-l10n-ve
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-ve
@@ -2472,6 +2554,7 @@
the language packs.
Package: openoffice.org-l10n-vi
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-vi
@@ -2499,6 +2582,7 @@
the language packs.
Package: openoffice.org-l10n-xh
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-xh
@@ -2526,6 +2610,7 @@
the language packs.
Package: openoffice.org-l10n-zh-cn
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-zh
@@ -2553,6 +2638,7 @@
the language packs.
Package: openoffice.org-l10n-zh-tw
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-zh
@@ -2580,6 +2666,7 @@
the language packs.
Package: openoffice.org-l10n-zu
+Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: openoffice.org-core (>> ${base-version}) | language-support-translations-zu
@@ -2994,7 +3081,7 @@
- libuno_purpenvhelpergcc3: "purpose environments" helper
Package: uno-libs3-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
@@ -3034,7 +3121,7 @@
imagine.
Package: ure-dbg
-Section: devel
+Section: debug
Priority: extra
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: ure (= ${ure:Version}), uno-libs3-dbg (= ${ure:Version}), ${misc:Depends}
@@ -3271,7 +3358,7 @@
bullets (needed for bullets in OpenOffice.org) and non-latin character
Package: openoffice.org-dbg
-Section: devel
+Section: debug
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Priority: extra
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}
=== modified file 'control.debug.in'
--- a/control.debug.in 2009-04-15 09:35:28 +0000
+++ b/control.debug.in 2009-04-15 09:42:15 +0000
@@ -1,5 +1,5 @@
Package: openoffice.orgVER-dbg
-Section: devel
+Section: debug
Architecture: %OOO_ARCHS%
Priority: extra
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}
=== modified file 'control.in'
--- a/control.in 2009-04-15 09:33:39 +0000
+++ b/control.in 2009-04-15 09:42:15 +0000
@@ -445,8 +445,12 @@
Package: openoffice.orgVER-base
Architecture: %OOO_ARCHS%
+<<<<<<< TREE
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base-core (= ${binary:Version}),
+=======
+Section: database
+>>>>>>> MERGE-SOURCE
${shlibs:Depends},
${java-runtime-depends},
${base-hsqldb-depends},
@@ -672,8 +676,12 @@
Package: openoffice.orgVER-officebean
Architecture: %OOO_JAVA_ARCHS%
+<<<<<<< TREE
Section: misc
Depends: openoffice.orgVER-core (= ${binary:Version}),
+=======
+Section: java
+>>>>>>> MERGE-SOURCE
${shlibs:Depends},
${java-runtime-depends},
${java-common-depends},
=== modified file 'control.lang.in'
--- a/control.lang.in 2009-03-29 20:28:49 +0000
+++ b/control.lang.in 2009-04-15 09:42:15 +0000
@@ -1,4 +1,5 @@
Package: openoffice.orgVER-l10n-@LCODE@
+Section: localization
Architecture: all
Depends: @LOCALES_DEPENDS@,
${misc:Depends}
=== modified file 'control.ure.in'
--- a/control.ure.in 2009-03-29 20:28:49 +0000
+++ b/control.ure.in 2009-04-15 09:42:15 +0000
@@ -22,7 +22,7 @@
- libuno_purpenvhelpergcc3: "purpose environments" helper
Package: uno-libs3-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: %OOO_ARCHS%
Depends: uno-libs3 (= ${ure:Version}),
@@ -64,7 +64,7 @@
imagine.
Package: ure-dbg
-Section: devel
+Section: debug
Priority: extra
Architecture: %OOO_ARCHS%
Depends: ure (= ${ure:Version}), uno-libs3-dbg (= ${ure:Version}),
Reply to: