[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. ae161aa34866c5490b1c49b9ea78dd2fea0d1e4f



The following commit has been merged in the master branch:
commit 2b3f64d0984a8db192c3c90ebfcf929bbf394901
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Mar 22 12:37:07 2011 +0000

    Revert "run dh_link before dh_python2, not after"
    
    This reverts commit 2e33dfbf6664d0da59e23d23aeebec8db269a15a.

diff --git a/rules b/rules
index b449f03..01e670a 100755
--- a/rules
+++ b/rules
@@ -3160,7 +3160,6 @@ $(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
@@ -3180,6 +3179,7 @@ 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
@@ -3379,9 +3379,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
 	dh_icons -i
 	dh_installxmlcatalogs -i

-- 
LibreOffice packaging repository


Reply to: