./packages/openofficeorg/3.3.0/experimental r2114: merge 1:3.2.1-7
------------------------------------------------------------
revno: 2114 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2010-09-26 18:27:23 +0200
message:
merge 1:3.2.1-7
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2010-09-22 20:00:21 +0000
+++ b/changelog 2010-09-26 16:27:23 +0000
@@ -9,9 +9,6 @@
- use 3.2.98.1 release
- use new ooo-build build insfrastructure
- * debian/patches/pdf-link-export-fix.diff: import from ooo-build master;
- don't export PDFs with damaged xref table (closes: #594275)
-
* debian/rules:
- add and rework target(s) for new external sources handling upstream
- updates for 3.3 and its various configuration changes
@@ -21,8 +18,6 @@
- adapt jar locations to actually match Java policy: public jars
inside /usr/share/java (and /usr/lib/ure/...) and "internal" ones
to /usr/share/java/basisX.Y/program/classes. Keep the symlinks there
- - change Class-Path: of jurt.jar to contain /usr/lib/ure/lib hardcoded
- as otherwise libjpipe.so (needed in the Java bridge) is not found...
- remove WITH_SPLIT option, upstream vanilla tarballs not supported by
new ooo-build build anymore
- temporarily disable -sdbc-postgresql as unopkg apparently has problems
@@ -42,7 +37,6 @@
* debian/control.in:
- move binfilter to suggests (and remove from openoffice.orgs
Description), it is not in the default install anymore
- - we use bc in debian/rules control, we probably should build-dep on it
* debian/uno-libs3.symbols: update
* debian/icons: remove again
* debian/broffice.org*: update diversions
@@ -59,10 +53,25 @@
extensions in /usr/lib/openoffice/share/extensions have been
installed/updated
* debian/control.in, debian/rules: stop building industrial package
+
+ -- Rene Engelhard <rene@debian.org> Wed, 22 Sep 2010 09:43:06 +0200
+
+openoffice.org (1:3.2.1-7) unstable; urgency=low
+
+ * debian/patches/add-some-missing-german-translations.diff: as named,
+ thanks Andre Schnabel
+ * debian/patches/pdf-link-export-fix.diff: import from ooo-build master;
+ don't export PDFs with damaged xref table (closes: #594275)
+
+ * debian/control.in:
+ - we use bc in debian/rules control, we probably should build-dep on it
+ * debian/rules:
+ - change Class-Path: of jurt.jar to contain /usr/lib/ure/lib hardcoded
+ as otherwise libjpipe.so (needed in the Java bridge) is not found...
* debian/scripts/fix_image_rgb: -resize to 548x364 to work around
i#95472 (closes: #513746)
- -- Rene Engelhard <rene@debian.org> Wed, 22 Sep 2010 09:43:06 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 22 Sep 2010 17:58:25 +0200
openoffice.org (1:3.2.1-6) unstable; urgency=high
Reply to: