./packages/openofficeorg/3.2.1/unstable r2099: add 3.2.1-11+squeeze2 changes
------------------------------------------------------------
revno: 2099
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2011-01-30 17:45:26 +0100
message:
add 3.2.1-11+squeeze2 changes
modified:
changelog
patches/series
patches/tread-invalid-path-segments-correctly.diff
=== modified file 'changelog'
--- a/changelog 2011-01-30 16:44:58 +0000
+++ b/changelog 2011-01-30 16:45:26 +0000
@@ -1,3 +1,11 @@
+openoffice.org (1:3.2.1-11+squeeze2) unstable; urgency=high
+
+ * debian/patches/tread-invalid-path-segments-correctly.diff: gah,
+ actually add hunk to patch patches/dev300/apply to actually apply
+ the patch - thanks Kees Cook; make properly apply
+
+ -- Rene Engelhard <rene@debian.org> Wed, 26 Jan 2011 00:50:53 +0000
+
openoffice.org (1:3.2.1-11+squeeze1) testing-security; urgency=high
* debian/patches/tread-invalid-path-segments-correctly.diff:
=== modified file 'patches/series'
--- a/patches/series 2011-01-30 16:44:58 +0000
+++ b/patches/series 2011-01-30 16:45:26 +0000
@@ -13,7 +13,7 @@
pdf-link-export-fix.diff
set-correct-default-formula-syntax.diff
slideshow-clipfix.diff
-tread-invalid-path-segments-correctly.diff
cws-hb22.diff
security-fixes-from-cws-os145.diff
security-fixes-from-cws-impress208.diff
+tread-invalid-path-segments-correctly.diff
=== modified file 'patches/tread-invalid-path-segments-correctly.diff'
--- a/patches/tread-invalid-path-segments-correctly.diff 2011-01-30 16:44:58 +0000
+++ b/patches/tread-invalid-path-segments-correctly.diff 2011-01-30 16:45:26 +0000
@@ -90,7 +90,7 @@
+--- ucb/source/ucp/package/makefile.mk Mon Jul 26 18:27:06 2010 +0200
++++ ucb/source/ucp/package/makefile.mk Tue Aug 10 11:05:20 2010 +0200
+@@ -68,6 +68,7 @@
-+ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
++ SHL1VERSIONMAP=exports.map
+
+ SHL1STDLIBS=\
++ $(COMPHELPERLIB) \
@@ -202,3 +202,13 @@
+ }
+ }
+
+--- openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply-old 2011-01-26 00:47:59.000000000 +0000
++++ openoffice.org-3.2.1/ooo-build-3-2-1-4/patches/dev300/apply 2011-01-26 00:48:12.000000000 +0000
+@@ -4096,6 +4096,7 @@
+
+ [ Security ]
+ SA40775.diff
++tread-invalid-path-segments-correctly.diff
+ cws-hb22.diff
+ security-fixes-from-cws-os145.diff
+ security-fixes-from-cws-impress208.diff
Reply to: