[X2Go-Commits] [pale-moon] 02/04: debian/: remove debian/installer modifications.

[git-admin at x2go.org]

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

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

commit e0f577e211088c0df4f0eeca0e10b85578d5f873
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Feb 22 06:27:42 2019 +0100

    debian/: remove debian/installer modifications.
    
    We do not need this, since upstream uses a globbing mechanism that will
    pick up any files we throw at the build automatically.
---
 debian/changelog                          |  3 +++
 debian/installer/Makefile.in              | 27 ---------------------------
 debian/installer/package-manifest.browser |  3 ---
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ad6f5a..0983a24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ palemoon (28.3.1+repack-1-0x2go1) UNRELEASED; urgency=medium
     - Replace palemoon.desktop with upstream file (i.e., copy).
     - Merge in changes from downstream Debian packaging. Remove obsolete
       splice patch file.
+    - Remove debian/installer modifications. We do not need this, since
+      upstream uses a globbing mechanism that will pick up any files we throw
+      at the build automatically.
   * debian/control.in:
     - Fix syntax error.
   * debian/upstream.mk:
diff --git a/debian/installer/Makefile.in b/debian/installer/Makefile.in
deleted file mode 100644
index f66cfa5..0000000
--- a/debian/installer/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-STANDALONE_MAKEFILE := 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += $(shell $(MAKE) --no-print-directory -C $(DEPTH)/../build-palemoon/$(MOZ_BUILD_APP)/installer DEPTH="$(abspath $(DEPTH))" topsrcdir="$(abspath $(topsrcdir))" srcdir='$(topsrcdir)/$(MOZ_BUILD_APP)/installer' VPATH='$(srcdir)' echo-variable-DEFINES | sed 's/"/\\"/g')
-
-# FIXME: Debian packaging uses $(MOZ_BUILD_APP) instead of hardcoding the "browser" extension
-# and a call to sed 's/^\[browser\]/[$(MOZ_BUILD_APP)]/' to transform sections into the
-# "correct" internal application name.
-# In PM builds, $(MOZ_BUILD_APP) will evaluate to "application/palemoon" nowadays, so we
-# cannot use that as part of path values (at least not for extensions).
-# Furthermore, the replacement command doesn't actually replace anything under normal
-# circumstances, since in Firefox builds $(MOZ_BUILD_APP) evaluates to just "browser".
-# Let's hope we can just drop it and hardcode the name.
-package-manifest: $(topsrcdir)/$(MOZ_BUILD_APP)/installer/package-manifest.in $(srcdir)/package-manifest.browser
-	$(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) $^ > $@
-
-GARBAGE += package-manifest
-
-libs:: package-manifest
diff --git a/debian/installer/package-manifest.browser b/debian/installer/package-manifest.browser
deleted file mode 100644
index 50392f3..0000000
--- a/debian/installer/package-manifest.browser
+++ /dev/null
@@ -1,3 +0,0 @@
-[debian]
-bin/components/addonsInfo.js
-bin/components/addonsInfo.manifest

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git