[SCM] LibreOffice packaging repository branch, master, updated. 2e33dfbf6664d0da59e23d23aeebec8db269a15a

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 2e33dfbf6664d0da59e23d23aeebec8db269a15a
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Mar 20 15:12:21 2011 +0000

    run dh_link before dh_python2, not after

diff --git a/changelog b/changelog
index 331f1d3..00a2368 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.3.2~rc2-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - move dh_link before dh_python2 as dh_python2 gets confused by symlinks
+      before dh_link fixed them up
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 20 Mar 2011 12:15:19 +0000
+
 libreoffice (1:3.3.2~rc2-1) unstable; urgency=low
 
   * new upstream release candidate
diff --git a/rules b/rules
index 48f88a8..0ab95bf 100755
--- a/rules
+++ b/rules
@@ -3220,6 +3220,7 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 	dh_installchangelogs -s -k
 	dh_installmime -s
 	dh_installmenu -s
+	dh_link -s
 ifeq "$(BUILD_JARS_NATIVE)" "y"
 	dh_nativejava -plibreoffice$(VER)-gcj -o
 endif
@@ -3239,7 +3240,6 @@ else
 endif
 	dh_lintian -s
 	dh_bugfiles -s -A
-	dh_link -s
 	dh_fixperms -s
 ifeq "$(BUILD_DBG_PACKAGE)" "y"
 	dh_strip -s -Nure -Nuno-libs3 --dbg-package=libreoffice$(VER)-dbg
@@ -3442,9 +3442,9 @@ endif
 	done
 	dh_installchangelogs -i -k
 	dh_installmime -i
+	dh_link -i
 	dh_lintian -i
 	dh_bugfiles -i -A
-	dh_link -i
 	dh_fixperms -i
 ifeq "$(LENNY_BACKPORT)" "y"
 	dh_desktop -i

-- 
LibreOffice packaging repository