[SCM] OpenOffice.org packaging repository branch, master, updated. openoffice.org_3.3.0-11-9-g32566ce
The following commit has been merged in the master branch:
commit d1def667abf3f33c0f172c1076de4cdcdbedbc6b
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 5 22:54:37 2011 +0200
exclude new hyphen-* in sid and fix up -ns and -be transitional packages (got renamed in 3.4.x)
diff --git a/changelog b/changelog
index 6dbe2bc..c5141ed 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,11 @@ openoffice.org (1:3.4.0~ooo340m1-1) unstable; urgency=low
* update version to OOo snapshot LibreOffice 3.4.x uses
* make main libreoffice packages depend on the 3.4.x versions
+ * debian/scripts/gentranspkgs.py:
+ - exclude new hyphen-* in sid
+ - fix up -ns and -be transitional packages (got renamed in 3.4.x)
- -- Rene Engelhard <rene@debian.org> Mon, 05 Sep 2011 22:49:31 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 05 Sep 2011 22:49:57 +0200
openoffice.org (1:3.3.0-11) unstable; urgency=high
diff --git a/control b/control
index 899591f..b129b21 100644
--- a/control
+++ b/control
@@ -97,7 +97,7 @@ Description: office productivity suite -- Vietnamese language package
.
It can be safely removed after an upgrade.
-Package: openoffice.org-l10n-nso
+Package: openoffice.org-l10n-ns
Architecture: all
Priority: extra
Section: localization
@@ -306,17 +306,6 @@ Description: Serbian (Cyrillic) hyphenation patterns for LibreOffice/OpenOffice.
.
It can be safely removed after an upgrade.
-Package: openoffice.org-hyphenation-bn
-Architecture: all
-Priority: extra
-Section: text
-Depends: hyphen-bn
-Description: Bengali hyphenation patterns for OpenOffice.org/LibreOffice
- This is a transitional package, replacing the OpenOffice.org packaging
- with the LibreOffice packaging.
- .
- It can be safely removed after an upgrade.
-
Package: openoffice.org-thesaurus-cs
Architecture: all
Priority: extra
@@ -581,17 +570,6 @@ Description: French Thesaurus for LibreOffice/OpenOffice.org
.
It can be safely removed after an upgrade.
-Package: openoffice.org-hyphenation-gu
-Architecture: all
-Priority: extra
-Section: text
-Depends: hyphen-gu
-Description: Gujarati hyphenation patterns for OpenOffice.org/LibreOffice
- This is a transitional package, replacing the OpenOffice.org packaging
- with the LibreOffice packaging.
- .
- It can be safely removed after an upgrade.
-
Package: openoffice.org-hyphenation-pa
Architecture: all
Priority: extra
@@ -922,7 +900,7 @@ Description: Hindi hyphenation patterns for OpenOffice.org/LibreOffice
.
It can be safely removed after an upgrade.
-Package: openoffice.org-l10n-be
+Package: openoffice.org-l10n-be-by
Architecture: all
Priority: extra
Section: localization
@@ -1637,17 +1615,6 @@ Description: office productivity suite -- English_british help
.
It can be safely removed after an upgrade.
-Package: openoffice.org-hyphenation-kn
-Architecture: all
-Priority: extra
-Section: text
-Depends: hyphen-kn
-Description: Kannada hyphenation patterns for OpenOffice.org/LibreOffice
- This is a transitional package, replacing the OpenOffice.org packaging
- with the LibreOffice packaging.
- .
- It can be safely removed after an upgrade.
-
Package: openoffice.org-l10n-af
Architecture: all
Priority: extra
diff --git a/scripts/gentranspkgs.py b/scripts/gentranspkgs.py
index ce658fd..faaafe9 100644
--- a/scripts/gentranspkgs.py
+++ b/scripts/gentranspkgs.py
@@ -2,7 +2,7 @@
import re, sys, fileinput
-skip_packages = ('openoffice.org-core', 'openoffice.org-report-builder-bin', 'openoffice.org-base-core', 'openoffice.org-dev', 'openoffice.org-dev-doc', 'openoffice.org-dbg', 'openoffice.org-help-sk', 'openoffice.org-nlpsolver', 'openoffice.org-hyphenation-show', 'openoffice.org-script-provider-bsh')
+skip_packages = ('openoffice.org-core', 'openoffice.org-report-builder-bin', 'openoffice.org-base-core', 'openoffice.org-dev', 'openoffice.org-dev-doc', 'openoffice.org-dbg', 'openoffice.org-help-sk', 'openoffice.org-nlpsolver', 'openoffice.org-hyphenation-show', 'openoffice.org-script-provider-bsh', 'openoffice.org-hyphenation-bn','openoffice.org-hyphenation-gu', 'openoffice.org-hyphenation-kn')
other_source_packages = ('docvert-openoffice.org', 'openclipart-openoffice.org','openoffice.org-dmaths','openoffice.org-mysql-connector','openoffice.org-pdfimport','openoffice.org-presentation-minimizer','openoffice.org-report-builder', 'openoffice.org-voikko','openoffice.org-writer2latex','openffice.org-wiki-publisher','openoffice.org-zemberek');
def gen_transitonal_packages():
@@ -40,6 +40,10 @@ def gen_transitonal_packages():
for p, attrs in pkgs.iteritems():
if p in skip_packages:
continue
+ if p.endswith('l10n-nso'):
+ p = p.replace('nso', 'ns')
+ elif p.endswith('l10n-be'):
+ p = p.replace('be', 'be-by')
print "Package: %s" % p
print "Architecture: all"
for f, v in attrs.items():
--
OpenOffice.org packaging repository
Reply to: