[X2Go-Commits] [pale-moon] 76/216: debian/rules: move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel to harmonize the base.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 16 02:43:00 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 4e2fb94cd508f70c1800c9db840711879cea0968
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Sep 17 02:03:38 2018 +0200

    debian/rules: move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel to harmonize the base.
---
 debian/changelog | 2 ++
 debian/rules     | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f7b8a07..95c6ca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Generate configure files correctly, since we're actually using a
       nightly-based source.
     - Add rule for package-manifest generation.
+    - Move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel
+      to harmonize the base.
   * 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 b1e23ed..3c2475e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -190,6 +190,13 @@ endif
 		TAR_CREATE_FLAGS="--exclude=.mkdir.done --hard-dereference -chf" \
 		SIGN_NSS=
 	
+	# SDK stuff is typically installed into a versioned directory, but we don't need this additional complexity.
+	# Additionally, Mozilla stopped bundling SDKs as part of the XUL/XPCOM deprecation in favor of WebExtensions, so if PM decided to follow this path, we can easily drop the -dev package, too.
+	# For now, just move content over to the palemoon-devel directory.
+	mkdir -p debian/tmp/$(LIB_DIR)-devel
+	mv debian/tmp/$(LIB_DIR)-devel-*/* debian/tmp/$(LIB_DIR)-devel/
+	rmdir debian/tmp/$(LIB_DIR)-devel-*
+	
 	# Fixup permissions
 	find debian/tmp/usr/share debian/tmp/usr/include -type f -print0 | xargs -0 chmod 644
 	chmod +x debian/tmp/usr/lib/palemoon-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file.

--
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