[SCM] OpenOffice.org packaging repository branch, ubuntu-natty-3.3.1, updated. 9c392db2e86a48a7a758bc1dc52fd56f306c97db
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 9c392db2e86a48a7a758bc1dc52fd56f306c97db
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Apr 28 19:39:18 2011 +0200
lp#772387: remove broken package deps
diff --git a/changelog b/changelog
index 2c0b613..bd59232 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+openoffice.org (1:3.3.0-7ubuntu2) natty; urgency=low
+
+ * remove broken package deps (LP: #722387)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 28 Apr 2011 19:36:19 +0200
+
openoffice.org (1:3.3.0-7ubuntu1) natty; urgency=low
* Merged all all changes up to 3.3.0-7. Remaining changes:
diff --git a/control b/control
index bd1640a..d03d597 100644
--- a/control
+++ b/control
@@ -1037,7 +1037,6 @@ Package: openoffice.org-zemberek
Architecture: all
Priority: extra
Section: text
-Depends: libreoffice-zemberek
Description: Turkish spell checker extension for LibreOffice
This is a transitional package, replacing the OpenOffice.org packaging
with the LibreOffice packaging.
@@ -1367,7 +1366,6 @@ Package: openoffice.org-dmaths
Architecture: all
Priority: extra
Section: doc
-Depends: libreoffice-dmaths
Description: Formula editor improvements for LibreOffice
This is a transitional package, replacing the OpenOffice.org packaging
with the LibreOffice packaging.
diff --git a/scripts/gentranspkgs.py b/scripts/gentranspkgs.py
index 83052e8..2a8ad44 100644
--- a/scripts/gentranspkgs.py
+++ b/scripts/gentranspkgs.py
@@ -3,6 +3,8 @@
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-evolution', 'openoffice.org-nlpsolver', 'openoffice.org-hyphenation-show')
+#lp#772387
+nodep_packages = ('openoffice.org-dmaths', 'openoffice.org-zemberek')
def gen_transitonal_packages():
skip = True
@@ -47,7 +49,8 @@ def gen_transitonal_packages():
if f in ('Priority'):
v = v.replace('optional', 'extra');
print "%s: %s" % (f, v)
- print "Depends: %s" % attrs['Depends']
+ if p not in nodep_packages:
+ print "Depends: %s" % attrs['Depends']
print "Description: %s" % attrs['Description']
print " This is a transitional package, replacing the OpenOffice.org packaging"
print " with the LibreOffice packaging."
--
OpenOffice.org packaging repository
Reply to: