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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-2-11-g0908ff4



The following commit has been merged in the master branch:
commit a0ac4cc44ad40b096ab23696b29135637c136a0a
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 14b2e00..d07ab3d 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,11 @@ libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
   * debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
     Jordi Mallach
   * debian/patches/CVE-2012-4233.diff: fix CVE-2012-4233.diff/HTB23106 
+  * debian/rules:
+    - exclude .desktop from dh_link call to get absolute symlinks
+      (closes: #690336)
 
- -- Rene Engelhard <rene@debian.org>  Mon, 08 Oct 2012 15:54:51 +0200
+ -- Rene Engelhard <rene@debian.org>  Sun, 14 Oct 2012 12:54:30 +0200
 
 libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
 
diff --git a/rules b/rules
index 4f9d988..49d2e79 100755
--- a/rules
+++ b/rules
@@ -2773,7 +2773,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
@@ -2980,7 +2980,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: