[X2Go-Commits] [pale-moon] 01/01: debian/rules: unstubbify MPL rules again, but take files out of debian directory.

git-admin at x2go.org git-admin at x2go.org
Sat Feb 23 02:06:40 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 14faad1cdad8db81e372d3b790f5c0d6c08824de
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 23 02:06:10 2019 +0100

    debian/rules: unstubbify MPL rules again, but take files out of debian directory.
---
 debian/changelog |  1 +
 debian/rules     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48ce0a9..b789a81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium
       --target.
     - No need to generate a special manifest file and use it any longer.
     - Keep MPL-1.1 and MPL-2.0 targets as stubs.
+    - Unstubbify MPL rules again, but take files out of debian directory.
   * debian/installer/Makefile.in:
     - Switch some hardcoded places to use $(MOZ_BUILD_APP), some other places
       to hardcoded filename extensions and drop the (hopefully unneeded)
diff --git a/debian/rules b/debian/rules
index aef6bbf..ebc8155 100755
--- a/debian/rules
+++ b/debian/rules
@@ -298,14 +298,14 @@ endif
 	rmdir debian/tmp/usr/share/idl
 	rmdir debian/tmp/usr/share
 
-# PM copied these files manually, but keep rules here for downstream packaging sync as stubbed-out targets.
-MPL-1.1:
-# gfx/cairo/cairo/COPYING-MPL-1.1
-#	cp -f $< $@
-#
-MPL-2.0:
-# b2g/LICENSE
-#	cp -f $< $@
+# PM copied these files manually, but keep rules here for downstream packaging sync.
+#MPL-1.1: gfx/cairo/cairo/COPYING-MPL-1.1
+MPL-1.1: debian/MPL-1.1
+	cp -f $< $@
+
+#MPL-2.0: b2g/LICENSE
+MPL-2.0: debian/MPL-2.0
+	cp -f $< $@
 
 override_dh_installdocs: MPL-1.1 MPL-2.0
 	dh_installdocs -A $^

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