The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit f5b7bd781d853b12772d8b6df9c599acddb7663c
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Mon Feb 21 16:42:44 2011 +0100
removed transitional package creation from libreoffice package
* transitional packages will be handled by the openoffice.org source
package as it is done by debian
diff --git a/changelog b/changelog
index 174dc46..bf1486c 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.3.1~rc1-2ubuntu1~ppa2) UNRELEASED; urgency=low
+
+ * moving transitional packages from libreoffice to openoffice.org source
+
+ -- Bjoern Michaelsen <bjoern.michael...@canonical.com> Fri, 18 Feb 2011
10:12:08 +0100
+
libreoffice (1:3.3.1~rc1-2ubuntu1~ppa1) natty; urgency=low
* merging all pre rc2 debian changes
diff --git a/rules b/rules
index 8603221..237aca3 100755
--- a/rules
+++ b/rules
@@ -109,7 +109,6 @@ OOO_ARCHS = alpha amd64 armel hppa i386 ia64 mips mipsel
powerpc powerpcspe ppc6
PATCHSET=$(DIST)
BUILD_DEPS=
-OOO_TRANS_PKGS=n
# These are components which can be built from internal copies, or used from
the
# distribution. See configure --help for valid values (--with-system-<value>).
@@ -514,7 +513,6 @@ ifeq "$(DIST)" "Ubuntu"
ifeq ($(DISTREL),natty)
SYSTEM_STUFF := $(filter-out lucene, $(SYSTEM_STUFF))
- OOO_TRANS_PKGS=y
# FIXME: smoketest fails, but we need the indep packages for the other
archs
ifneq (,$(filter $(ARCH),armel i386))
RUN_SMOKETEST=n
@@ -767,9 +765,6 @@ BUILD_ISOS = $(ISOS)
ifeq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-help-en-us
- ifeq "$(OOO_TRANS_PKGS)" "y"
- DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-help-en-us
- endif
endif
ifneq "$(BUILD_ONLY_EN_US)" "y"
@@ -1719,12 +1714,6 @@ ifneq "$(DICT_DIR)" "/usr/share/hunspell"
perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control
endif
-ifeq "$(OOO_TRANS_PKGS)" "y"
- python debian/scripts/gentranspkgs.py < debian/control >
debian/control.ooo
- cat debian/control.ooo >> debian/control
- rm -f debian/control.ooo
-endif
-
.DELETE_ON_ERROR: debian/control
build: build-arch build-indep
diff --git a/scripts/gentranspkgs.py b/scripts/gentranspkgs.py
deleted file mode 100644
index 028e23a..0000000
--- a/scripts/gentranspkgs.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /usr/bin/python
-
-import re, sys, fileinput
-
-skip_packages = (
- 'openoffice.org-dbg', # not in Ubuntu
- 'openoffice.org-style-industrial' # not in LO
- )
-
-def gen_transitonal_packages():
- skip = True
- copy_fields = ('Section', 'Architecture', 'Priority', 'Description')
- copy_fields = ('Section', 'Priority', 'Description')
- pkgs = []
- for line in fileinput.input():
- if line == '\n':
- skip = True
- if ':' in line:
- f, v = line.split(':', 1)
- v = v.strip()
- if f == 'Package':
- if v.startswith('libreoffice'):
- n = v.replace('libreoffice', 'openoffice.org')
- p = {'Package': n, 'Depends': v}
- pkgs.append(p)
- skip = False
- else:
- skip = True
- if not skip and f in copy_fields:
- p[f] = v
-
- for p in pkgs:
- if p['Package'] in skip_packages:
- continue
- print "Package: %s" % p['Package']
- print "Architecture: all"
- for f, v in p.items():
- if f in ('Package', 'Depends', 'Description'):
- continue
- print "%s: %s" % (f, v)
- print "Depends: %s, ${misc:Depends}" % p['Depends']
- print "Description: %s" % p['Description']
- print " This is a transitional package, replacing the OpenOffice.org
packaging"
- print " with the LibreOffice packaging."
- print " ."
- print " It can be safely removed after an upgrade."
- print
-
-def main():
- gen_transitonal_packages()
-
-main()
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pshsy-0003nj...@alioth.debian.org
