[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-4-5-g426304a
The following commit has been merged in the master branch:
commit 8935e0739f60701ddd7ab3a82dc068963ca35edb
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 20 01:00:19 2012 +0200
move libreoffice-common.links to libreoffice-common.links.in again as we need to subsitute @OODIR@
diff --git a/changelog b/changelog
index f8cda67..f1eff39 100644
--- a/changelog
+++ b/changelog
@@ -4,11 +4,14 @@ libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
* debian/patches/db5.3.diff: add 5.3 to checked db versions
* debian/rules:
- build-depend on new g++-mingw-w64-i686 instead of the whole thing
+ * debian/libreoffice-common.links: move ...
+ * debian/libreoffice-common.links.in: ... here again as we need to
+ subsitute @OODIR@ (closes: #669138)
[ Björn Michaelsen ]
* add visio mimetype to libreoffice draw desktop file
- -- Rene Engelhard <rene@debian.org> Mon, 16 Apr 2012 09:02:21 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 20 Apr 2012 00:57:45 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
diff --git a/libreoffice-common.links b/libreoffice-common.links.in
similarity index 100%
rename from libreoffice-common.links
rename to libreoffice-common.links.in
diff --git a/rules b/rules
index e7aea35..03a6bcc 100755
--- a/rules
+++ b/rules
@@ -1223,7 +1223,7 @@ endif
# Files created in debian directory
$(MAKE) -f debian/rules clean-debdir
- find debian -name "*.links" ! -name "libreoffice-common*.links" -exec rm {} \;
+ find debian -name "*.links" -exec rm {} \;
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
rm -f debian/*.bug-script
--
LibreOffice packaging repository
Reply to: