./packages/libreoffice/3.3.0/experimental r2295: revert r2294
------------------------------------------------------------
revno: 2295
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sat 2011-01-01 20:54:49 +0100
message:
revert r2294
removed:
scripts/gentranspkgs.py
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2011-01-01 19:45:36 +0000
+++ b/changelog 2011-01-01 19:54:49 +0000
@@ -2,8 +2,7 @@
[ Rene Engelhard ]
* debian/patches/fix-mesa-headers-check.diff: backport fix from
- master: check for mesaa headers only when OpenGL enabled. Fixes FTBFS
- on arm(el)/mips(el)
+ master: check for mesaa headers only when OpenGL enabled.
* debian/rules
- merge OOo lenny-backport fixes
@@ -14,6 +13,7 @@
- add explicit --with-system-mesa-headers
- update hsqldb conditionals for new SYSTEM_STUFF variable.
- fix report-builder install to actually install the files
+ - remove unneeded LICENSE files in the extensions
[ Matthias Klose ]
* debian/rules:
@@ -27,7 +27,6 @@
- Don't special case CC_PREFIX on sparc, not needed.
- Eliminate the explicit macros for the configuration of system
components.
- - Allow the generation of transitional openoffice.org-* packages.
* debian/control.in:
- Remove packages and versions in build dependencies,
which are present in the last old stable release.
@@ -36,7 +35,7 @@
* debian/scripts/joinctrl.py:
- Normalize whitespace in dependencies and similar fields.
- -- Rene Engelhard <rene@debian.org> Sat, 01 Jan 2011 17:52:35 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 01 Jan 2011 19:29:18 +0100
libreoffice (1:3.3.0~rc2-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2011-01-01 19:45:36 +0000
+++ b/rules 2011-01-01 19:54:49 +0000
@@ -111,8 +111,6 @@
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>).
SYSTEM_STUFF = dicts
@@ -1753,12 +1751,6 @@
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
@@ -2847,6 +2839,7 @@
mkdir -p $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
mv debian/tmp/$(OOBRANDDIR)/share/extensions/presentation-minimizer \
$(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions
+ rm -f $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions/presentation-minimizer/LICENSE
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
@@ -2868,6 +2861,7 @@
mkdir -p $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
mv debian/tmp/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo \
$(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions
+ rm -f $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo/LICENSE
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
@@ -2875,6 +2869,7 @@
mkdir -p $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
mv debian/tmp/$(OOBRANDDIR)/share/extensions/pdfimport \
$(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions
+ rm -f $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions/pdfimport/LICENSE
endif
# move services.rdb to /var/lib/openoffice
@@ -3236,18 +3231,14 @@
ifeq "$(ENABLE_REPORTDESIGN)" "y"
ifeq "$(ENABLE_JAVA)" "y"
- # install this; we need to register this ourselves later in
- # the maintainer scripts. This is intended upstream (*rpt* stuff
- # in OOo and the actual report builder as an extension, without which
- # the *rpt* stuff is a no-op.
rm -rf $(PKGDIR)-report-builder
mkdir -p $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions
mv debian/tmp/$(OOBRANDDIR)/share/extensions/report-builder \
$(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions
# unneeded license files
for i in THIRDPARTYREADMELICENSE.html readme_en-US.html readme_en-US.txt \
- registration/LICENSE_en-US; do \
- rm -f $(PKGDIR)-common/$(OOBRANDDIR)/share/extensions/report-builder/$$i; \
+ registration/LICENSE; do \
+ rm -f $(PKGDIR)-report-builder/$(OOBRANDDIR)/share/extensions/report-builder/$$i; \
done
endif
endif
=== removed file 'scripts/gentranspkgs.py'
--- a/scripts/gentranspkgs.py 2011-01-01 19:45:36 +0000
+++ b/scripts/gentranspkgs.py 1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#! /usr/bin/python
-
-import re, sys, fileinput
-
-skip_packages = ('')
-
-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 = {'Depends': v}
- pkgs[n] = p
- skip = False
- else:
- skip = True
- if not skip and f in copy_fields:
- p[f] = v
-
- for p, attrs in pkgs.iteritems():
- if p in skip_packages:
- continue
- print "Package: %s" % p
- print "Architecture: all"
- for f, v in attrs.items():
- if f in ('Depends', 'Description'):
- continue
- print "%s: %s" % (f, v)
- 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."
- print " ."
- print " It can be safely removed after an upgrade."
- print
-
-def main():
- gen_transitonal_packages()
-
-main()
Reply to: