[X2Go-Commits] [pale-moon] 82/216: debian/rules: /usr/lib/palemoon-devel/idl also is a symlink by default, dito.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 16 02:43:01 CET 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit 6ed64954a2d20599c0fbcd933ded712e9ebf44ae
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Sep 17 05:57:29 2018 +0200

    debian/rules: /usr/lib/palemoon-devel/idl also is a symlink by default, dito.
    
    Additionally, stage idl from /usr/share/idl/palemoon-* to
    /usr/lib/palemoon-devel/idl instead of
    /usr/lib/palemoon-devel/share/idl.
    
    Make sure to remove directories we no longer need to not end up with
    empty installed directories.
---
 debian/changelog |  5 +++++
 debian/rules     | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46988b4..e49de98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,11 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Replace hardcoded locations with $(LIB_DIR).
     - /usr/lib/palemoon-devel/include is a symlink by default, so make sure to
       properly check for and remove it.
+    - /usr/lib/palemoon-devel/idl also is a symlink by default, dito.
+      Additionally, stage idl from /usr/share/idl/palemoon-* to
+      /usr/lib/palemoon-devel/idl instead of
+      /usr/lib/palemoon-devel/share/idl. Make sure to remove directories we no
+      longer need to not end up with empty installed directories.
   * debian/mozconfig:
     - Remove autoconf flags that should better be handled by debian/rules.
   * debian/make.mk:
diff --git a/debian/rules b/debian/rules
index 167ed0e..3f55962 100755
--- a/debian/rules
+++ b/debian/rules
@@ -239,9 +239,14 @@ endif
 	
 	# Palemoon-specific hacks.
 	
-	# Stage idl into $(LIB_DIR)-devel/share.
-	install -d -m 755 debian/tmp$(LIB_DIR)-devel/share
-	mv debian/tmp/usr/share/idl debian/tmp$(LIB_DIR)-devel/share/
+	# Stage idl into $(LIB_DIR)-devel/.
+	test -L debian/tmp/$(LIB_DIR)-devel/idl # Fail if it's not a symlink.
+	rm -f debian/tmp/$(LIB_DIR)-devel/idl
+	install -d -m 755 debian/tmp$(LIB_DIR)-devel/idl
+	mv debian/tmp/usr/share/idl/palemoon-*/* debian/tmp$(LIB_DIR)-devel/idl/
+	rmdir debian/tmp/usr/share/idl/palemoon-*
+	rmdir debian/tmp/usr/share/idl
+	rmdir debian/tmp/usr/share
 	
 	# remove vestigial duplicate file
 	#rm -rf debian/tmp$(LIB_DIR)/palemoon-bin

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list