[X2Go-Commits] [pale-moon] 03/04: debian/patches: remove installer modification integration into the upstream build system.

git-admin at x2go.org git-admin at x2go.org
Fri Feb 22 06:33:52 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 16926546342708e4541e896a338cc3f87ed146a4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 22 06:28:54 2019 +0100

    debian/patches: remove installer modification integration into the upstream build system.
---
 debian/changelog                                        |  2 ++
 ...pstream-build-system-create-debian-installer-M.patch | 17 -----------------
 debian/patches/series                                   |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0983a24..b524fa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium
       section. While the file's documentation mentions that specific paths can
       be removed, this operation is actually not implemented and doing so
       would be difficult to accomplish.
+    - Remove installer modification integration into the upstream build
+      system.
 
  -- Mihai Moldovan <ionic at ionic.de>  Thu, 31 Jan 2019 01:36:58 +0100
 
diff --git a/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch b/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch
deleted file mode 100644
index b97b48f..0000000
--- a/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Mike Hommey <mh at glandium.org>
-Date: Mon, 16 Dec 2013 11:11:13 +0900
-Subject: Make upstream build system create debian/installer/Makefile
-
----
- moz.build | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/moz.build
-+++ b/moz.build
-@@ -88,4 +88,6 @@ if not CONFIG['JS_STANDALONE'] and CONFI
- if not CONFIG['LIBXUL_SDK']:
-     DIRS += ['debian/extra-stuff']
- 
-+CONFIGURE_SUBST_FILES += ['debian/installer/Makefile']
-+
- include('build/templates.mozbuild')
diff --git a/debian/patches/series b/debian/patches/series
index 0c0ca9f..0e06003 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch
-debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch
 

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