[X2Go-Commits] [pale-moon] 04/05: debian/rules: handle include files by moving the versionated /usr/include/palemoon-$VER directory to /usr/include/palemoon and afterwards its contents to /usr/lib/palemoon-devel/include/.

git-admin at x2go.org git-admin at x2go.org
Mon Sep 17 04:14:09 CEST 2018


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

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

commit f3689f7fe42e069da42e5f57fa59dac03e76e3bc
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Sep 17 04:05:22 2018 +0200

    debian/rules: handle include files by moving the versionated /usr/include/palemoon-$VER directory to /usr/include/palemoon and afterwards its contents to /usr/lib/palemoon-devel/include/.
---
 debian/changelog |  3 +++
 debian/rules     | 26 ++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e21c69a..93d69ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,9 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Move data from /usr/lib/palemoon-devel-$VER to /usr/lib/palemoon-devel
       to harmonize the base.
     - Fixup comment grammar for last change.
+    - Handle include files by moving the versionated
+      /usr/include/palemoon-$VER directory to /usr/include/palemoon and
+      afterwards its contents to /usr/lib/palemoon-devel/include/.
   * 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 d2b90b5..a504aa0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -190,15 +190,24 @@ endif
 		TAR_CREATE_FLAGS="--exclude=.mkdir.done --hard-dereference -chf" \
 		SIGN_NSS=
 	
+	# Palemoon-specific hacks.
+	
 	# 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 the versioned content over to the palemoon-devel directory.
+	# Likewise for the include files.
 	mkdir -p debian/tmp/$(LIB_DIR)-devel
 	mv debian/tmp/$(LIB_DIR)-devel-*/* debian/tmp/$(LIB_DIR)-devel/
 	rmdir debian/tmp/$(LIB_DIR)-devel-*
+	mv debian/tmp/usr/include/palemoon-* debian/tmp/usr/include/palemoon
+	
+	# Stage headers into $(LIB_DIR)-devel/include.
+	install -d -m 755 debian/tmp$(LIB_DIR)-devel/include
+	mv debian/tmp/usr/include/palemoon/* debian/tmp$(LIB_DIR)-devel/include/
+	rmdir debian/tmp/usr/include/palemoon
 	
 	# Fixup permissions
-	find debian/tmp/usr/share debian/tmp/usr/include -type f -print0 | xargs -0 chmod 644
+	find debian/tmp/usr/share debian/tmp/$(LIB_DIR)-devel/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.
 	
 	# Replace some installed files by symlinks
@@ -212,25 +221,22 @@ endif
 	done
 	
 ifneq (,$(USE_SYSTEM_NSPR)$(USE_SYSTEM_NSS))
-	# FIXME: this needs to be updated to work on debian/tmp$(LIB_DIR)-devel.
-	for f in $(if $(USE_SYSTEM_NSPR),/usr/include/nspr/*) $(if $(USE_SYSTEM_NSS),/usr/include/nss/*); do \
-		ln -s $$f debian/tmp/usr/include/palemoon/$$(basename $$f); \
+	for f in $(if $(USE_SYSTEM_NSPR),/usr/include/nspr/*); do \
+		ln -s $$f debian/tmp/$(LIB_DIR)-devel/include/nspr/$$(basename $$f); \
+	done
+	for f in $(if $(USE_SYSTEM_NSS),/usr/include/nss/*); do \
+		ln -s $$f debian/tmp/$(LIB_DIR)-devel/include/nss/$$(basename $$f); \
 	done
 endif
-	# FIXME: this needs to be updated to work on debian/tmp$(LIB_DIR)-devel.
 	for h in $$(grep -l -r EXPORTS build-palemoon/media | grep Makefile$ | \
 		while read f; do $(MAKE) --no-print-directory -C $$(dirname $$f) echo-variable-EXPORTS echo-variable-EXPORTS_NAMESPACES; done); do \
-		rm -rf debian/tmp/usr/include/palemoon/$$h; \
+		rm -rf debian/tmp/$(LIB_DIR)-devel/include/$$h; \
 	done
 	
 	-TZ=UTC unzip -d debian/tmp$(LIB_DIR)/browser debian/tmp$(LIB_DIR)/browser/omni.ja 'defaults/preferences/*'
 	
 	# Palemoon-specific hacks.
 	
-	# Stage headers into $(LIB_DIR)-devel/include.
-	install -d -m 755 debian/tmp$(LIB_DIR)-devel/include
-	mv debian/tmp/usr/include/palemoon debian/tmp$(LIB_DIR)-devel/include/
-	
 	# 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/

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