./packages/openofficeorg/3.2/experimental r1816: fix merge error
------------------------------------------------------------
revno: 1816
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2010-02-16 09:36:49 +0100
message:
fix merge error
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2010-02-15 18:55:31 +0000
+++ b/changelog 2010-02-16 08:36:49 +0000
@@ -21,9 +21,6 @@
* debian/rules:
- wrap KDELIBS_MINVER for KDE4 into ifneq "$(LENNY_BACKPORT)" "y" as it
for some reason also gets used for lenny-backports which has KDE3..
- * debian/ure.preinst:
- - add a || true to db_input for ure/possibly_corrupted_rdbs
- (closes: #569840)
* debian/control.ure.in: fix uno-libs3*'s ure replaces
* debian/changelog: mention security fixes in last uploads
* debian/po:
@@ -32,7 +29,7 @@
* debian/ure.preinst, debian/shell-lib-{extensions,components}:
- add a || true to db_input/db_go where missing (closes: #569840)
- -- Rene Engelhard <rene@debian.org> Sun, 14 Feb 2010 20:38:15 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Feb 2010 19:57:40 +0100
openoffice.org (1:3.2.0~rc5-2) experimental; urgency=low
Reply to: