[X2Go-Commits] [pale-moon] 01/01: debian/rules: use old sed rule for MOZ_APP_REMOTINGNAME change - config.status is still a python script in Palemoon.

git-admin at x2go.org git-admin at x2go.org
Sat Sep 22 23:37:17 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 94da32d495e174da5a23ec820a25e2104e2f9732
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Sep 22 23:32:54 2018 +0200

    debian/rules: use old sed rule for MOZ_APP_REMOTINGNAME change - config.status is still a python script in Palemoon.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4821467..33aed7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -185,6 +185,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Include upstream.mk for proper DIST support (and the like).
     - Disable using system libraries completely, not compatible with official
       branding. This is a Palemoon-imposed restriction.
+    - Use old sed rule for MOZ_APP_REMOTINGNAME change - config.status is
+      still a python script in Palemoon.
   * 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 696a492..ec29c0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -180,7 +180,7 @@ stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig
 	../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr $(CONFIGURE_FLAGS) \
 		--with-default-mozilla-five-home=$(LIB_DIR) \
 		$(BRANDING_CONFIGURE_FLAG)
-	sed -i "/MOZ_APP_REMOTINGNAME/s/'[^']*',/'$(MOZ_APP_REMOTINGNAME)',/" build-palemoon/config.status
+	sed -i "/MOZ_APP_REMOTINGNAME/s/r''' [^']* '''/r''' $(MOZ_APP_REMOTINGNAME) '''/" build-palemoon/config.status
 
 stamps/build-palemoon:: stamps/configure-check-palemoon
 	dh_auto_build --parallel --builddirectory=build-palemoon -- \

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