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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.2_rc1-1-37-ge2ede8b



The following commit has been merged in the debian-experimental-3.6 branch:
commit e2ede8b9d6b78f6091e2c741888031b07f1912b8
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Oct 14 12:36:07 2012 +0200

    exclude .desktop from dh_link call to get absolute symlinks

diff --git a/changelog b/changelog
index 3e775d4..97a0864 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.6.3~rc1-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
 
   * new upstream release candidate
 
@@ -10,11 +10,13 @@ libreoffice (1:3.6.3~rc1-1) UNRELEASED; urgency=low
     - try again with gcc 4.6 for mips* since apparently testtools/smoketest
       now work..
     - document truth and remove alpha from supported architectures
+    - exclude .desktop from dh_link call to get absolute symlinks
+      (closes: #690336)
 
   [ Bjoern Michaelsen ]
   * make metapackage explicit in short description 
 
- -- Rene Engelhard <rene@debian.org>  Thu, 04 Oct 2012 17:26:00 +0200
+ -- Rene Engelhard <rene@debian.org>  Sat, 13 Oct 2012 14:36:45 +0200
 
 libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
 
diff --git a/rules b/rules
index 15aa430..d06d48a 100755
--- a/rules
+++ b/rules
@@ -2793,7 +2793,7 @@ ifeq "$(ENABLE_PYTHON3)" "y"
 endif
 	dh_lintian -s
 	dh_bugfiles -s -A
-	dh_link -s
+	dh_link -s -X.desktop
 	dh_fixperms -s
 ifeq "$(BUILD_DBG_PACKAGE)" "y"
 	dh_strip -s -Nure -Nuno-libs3 --dbg-package=libreoffice$(VER)-dbg
@@ -3008,7 +3008,7 @@ endif
 	dh_installmime -i
 	dh_lintian -i
 	dh_bugfiles -i -A
-	dh_link -i
+	dh_link -i -X.desktop
 	dh_fixperms -i
 	dh_icons -i
 	dh_installxmlcatalogs -i

-- 
LibreOffice packaging repository


Reply to: