------------------------------------------------------------
revno: 1738
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sat 2009-10-31 13:03:49 +0100
message:
update ooo-build: move templates to openoffice.org-common.templates.in
renamed:
templates => openoffice.org-common.templates.in
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-10-30 18:20:33 +0000
+++ b/changelog 2009-10-31 12:03:49 +0000
@@ -1,8 +1,8 @@
-openoffice.org (1:3.1.1-6) unstable; urgency=low
+openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
[ Rene Engelhard ]
* ooo-build:
- - update (8c34432a931671efb7e2271205c3dafade1c5682)
+ - update (390b0ce544dfca09e36d6cf4f03f7d12b988af87)
- fixes wrong filter texts in KDE4 fpicker (closes: #551774)
- Correct fix for the mirrored range selection bug in RTL mode.
(closes: #548767)
@@ -27,12 +27,15 @@
(closes: #553370)
* debian/control.in:
- conflict against libhsqldb-java (>= 1.8.1~)
+ * debian/templates, debian/openoffice.org-common.templates.in
+ debian/rules: move templates to openoffice.org-common so that they get
+ installed into openoffice.org-common per default, not openoffice.org...
[ Rail Aliev ]
* debian/po:
- update ru.po, tr.po
- -- Rene Engelhard <[email protected]> Fri, 30 Oct 2009 12:48:32 +0100
+ -- Rene Engelhard <[email protected]> Sat, 31 Oct 2009 09:56:17 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== renamed file 'templates' => 'openoffice.org-common.templates.in'
=== modified file 'rules'
--- a/rules 2009-10-30 18:20:33 +0000
+++ b/rules 2009-10-31 12:03:49 +0000
@@ -3151,7 +3151,7 @@
dh_installdocs -plibmythes-dev debian/copyright
for p in pdfimport presenter-console mysql-connector filter-binfilter \
evolution kab sdbc-postgresql presentation-minimizer; do \
- cat debian/templates > debian/openoffice.org-$$p.templates; \
+ cat debian/openoffice.org-common.templates.in >
debian/openoffice.org-$$p.templates; \
done
dh_installdebconf -s
dh_installman -s
@@ -3388,8 +3388,8 @@
dh_installdocs -i -A debian/README.Debian \
$(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
ooo-build/NEWS
- for p in emailmerge wiki-publisher report-builder; do \
- cat debian/templates > debian/openoffice.org-$$p.templates; \
+ for p in common emailmerge wiki-publisher report-builder; do \
+ cat debian/openoffice.org-common.templates.in >
debian/openoffice.org-$$p.templates; \
done
dh_installdebconf -i
dh_installman -i
