[X2Go-Commits] [pale-moon] 123/216: debian/rules: use safer UPSTREAM_VERSION instead of globbing *.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 16 02:43:17 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 25ccaaad754e14b25d924366828b358554e6b00c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Sep 21 04:16:56 2018 +0200

    debian/rules: use safer UPSTREAM_VERSION instead of globbing *.
---
 debian/changelog |  1 +
 debian/rules     | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a580f12..0d7e078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -112,6 +112,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Export MOZILLA_OFFICIAL variable.
     - Use UPSTREAM_VERSION instead of GRE_VERSION, since GRE_VERSION is not
       used within Palemoon (and refers to the Goanna version).
+    - Use safer UPSTREAM_VERSION instead of globbing *.
   * 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 3607a78..7f8e169 100755
--- a/debian/rules
+++ b/debian/rules
@@ -225,9 +225,9 @@ endif
 	# 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
+	mv debian/tmp/$(LIB_DIR)-devel-$(UPSTREAM_VERSION)/* debian/tmp/$(LIB_DIR)-devel/
+	rmdir debian/tmp/$(LIB_DIR)-devel-$(UPSTREAM_VERSION)
+	mv debian/tmp/usr/include/palemoon-$(UPSTREAM_VERSION) debian/tmp/usr/include/palemoon
 	
 	# Stage headers into $(LIB_DIR)-devel/include.
 	test -L debian/tmp/$(LIB_DIR)-devel/include # Fail if it's not a symlink.
@@ -271,8 +271,8 @@ endif
 	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-*
+	mv debian/tmp/usr/share/idl/palemoon-$(UPSTREAM_VERSION)/* debian/tmp$(LIB_DIR)-devel/idl/
+	rmdir debian/tmp/usr/share/idl/palemoon-$(UPSTREAM_VERSION)
 	rmdir debian/tmp/usr/share/idl
 	rmdir debian/tmp/usr/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