This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pale-moon. from 9a2ab48 debian/rules: add clean rules for stamps and config.{guess,sub} files. new 4d2ed75 debian/control: add autotools-dev build dep. new 55e5174 debian/control: add libglib2.0-dev build dep. new ac54f43 debian/control: add dpkg-dev build dep. new 3b2635c debian/: rename mozconfig to palemoon.mozconfig. new 3cb7a32 debian/rules: add stamps/configure-palemoon target. new dccd147 debian/rules: backport LIB_DIR from Firefox 52 build. new cfc6bba debian/rules: add/backport new stamps/configure-check-palemoon target. new 4c29c92 debian/rules: add dh_auto_build{,-arch} overrides. new dc70fec debian/rules: comment out all (%) rule. new d5845b9 debian/rules: rework dh_auto_clean. new ffc55c6 debian/rules: add stamps/build-palemoon target. new 0b37351 debian/rules: "rework" dh_auto_configure override. new a68cf2d debian/rules: drop older dh_auto_build override. new 6c0fe07 debian/rules: add new ("empty") dh_auto_install override. new d6d3bcf debian/rules: add/backport dh_auto_install override. new ef9d96f debian/rules: add a few palemoon-specific hacks for palemoon-dev(el) files. new 7d0fa4a debian/rules: add another hack, but commented out. new 52debcf debian/rules: remove old dh_auto_install override section. new 446ec6e debian/: add new palemoon-dev.install file. new 3f0d6fe debian/control: add new palemoon-dev binary package, blatantly copied from Debian's control file. new 6ac7169 debian/rules: add license doc staging for MPL-1.1 and MPL-2.0. new daba81b debian/: add noinstall file. new b8413b0 debian/rules: replace mkdir with install -d -m 755. new e86fba3 debian/rules: add branding stubs. new 757ff75 debian/rules: add MOZ_APP_REMOTINGNAME. new e512349 debian/rules: enhance configure phase with branding options and the remotingname hack. new 2368cfe debian/rules: move branding and remotingname variables up a few hunks. new c31888d debian/rules: add dh_install stamp. new 208d49b debian/rules: add dh_install override. new 522935a debian/: add very stripped-down upstream.mk file. new d6a529c debian/rules: add dh_strip override. new 24970c6 debian/rules: add dh_shlibdeps override. new f00dd21 debian/rules: remove old dh_shlibdeps override. new c05cd5d debian/rules: add general dh-calling rule. new 8ac7601 debian/rules: remove old and commented-out dh-calling rule. new a8fc976 debian/rules: make some targets phony. new add4706 debian/rules: whitespace fixup only. new e28c72e debian/rules: remove FIXME entry for MPL, downstream seems to do it wrongly, but it's not causing harm, so just keep it. The 38 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 41 +++++++ debian/control | 28 +++++ debian/noinstall | 8 ++ debian/palemoon-dev.install | 1 + debian/{mozconfig => palemoon.mozconfig} | 0 debian/rules | 179 +++++++++++++++++++++++++++---- debian/upstream.mk | 49 +++++++++ 7 files changed, 286 insertions(+), 20 deletions(-) create mode 100644 debian/noinstall create mode 100644 debian/palemoon-dev.install rename debian/{mozconfig => palemoon.mozconfig} (100%) create mode 100644 debian/upstream.mk -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 4d2ed75098901a512b9a29911c5ae7e9e033e347 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 03:17:01 2018 +0200 debian/control: add autotools-dev build dep. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 09dc851..5af312d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Switch maintainer to X2Go Developers. - Remove stray tab. - Switch to contrib/web section. + - Add autotools-dev build dep. * debian/rules: - Tabbify. - Add dh_testdir protection. Debian's firefox(-esr) package uses it. diff --git a/debian/control b/debian/control index 50e60ea..7211c80 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: X2Go Developers <x2go-dev@lists.x2go.org> XSBC-Original-Maintainer: Steven Pusser <stevep@mxlinux.org> Build-Depends: debhelper (>= 9), + autotools-dev, # Add for the conditional in rules to force use of gcc-4.9 on newer distreleases # that default to gcc-5 or 6 lsb-release, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit ac54f437feb2f069cce14a6e7f98c2e82945473f Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 03:18:43 2018 +0200 debian/control: add dpkg-dev build dep. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index f2dfc34..19f8a5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Switch to contrib/web section. - Add autotools-dev build dep. - Add libglib2.0-dev build dep. + - Add dpkg-dev build dep. * debian/rules: - Tabbify. - Add dh_testdir protection. Debian's firefox(-esr) package uses it. diff --git a/debian/control b/debian/control index 9bcb0ab..72f0191 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: X2Go Developers <x2go-dev@lists.x2go.org> XSBC-Original-Maintainer: Steven Pusser <stevep@mxlinux.org> Build-Depends: debhelper (>= 9), autotools-dev, + dpkg-dev (>= 1.16.1.1~) # Add for the conditional in rules to force use of gcc-4.9 on newer distreleases # that default to gcc-5 or 6 lsb-release, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 3b2635c6f036e50e3e04ba5685419cd267689b0b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 03:32:06 2018 +0200 debian/: rename mozconfig to palemoon.mozconfig. --- debian/changelog | 2 ++ debian/{mozconfig => palemoon.mozconfig} | 0 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 19f8a5c..8179022 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Remove autoconf flags that should better be handled by debian/rules. * debian/make.mk: - Add helper utility from Debian crossstream. + * debian/: + - Rename mozconfig to palemoon.mozconfig. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/mozconfig b/debian/palemoon.mozconfig similarity index 100% rename from debian/mozconfig rename to debian/palemoon.mozconfig -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 3cb7a321e6451d1aa427862635fc5da8681fc85e Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 04:12:17 2018 +0200 debian/rules: add stamps/configure-palemoon target. --- debian/changelog | 1 + debian/rules | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8179022..8dc83b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium crossstream. - Add non-parallel stamps/dummy target. - Add clean rules for stamps and config.{guess,sub} files. + - Add stamps/configure-palemoon target. * 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 365374d..4cd2eb1 100755 --- a/debian/rules +++ b/debian/rules @@ -88,6 +88,15 @@ stamps/prepare-configure:: stamps/dummy done chmod 755 configure js/src/configure +stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig + $(if $(wildcard build-palemoon),,mkdir build-palemoon) + cd build-palemoon && \ + MOZCONFIG=$(CURDIR)/debian/palemoon.mozconfig \ + ASFLAGS="-g" \ + $(CONFIGURE_ENV) \ + ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr $(CONFIGURE_FLAGS) \ + --with-default-mozilla-five-home=/usr/lib/palemoon + %: dh $@ --parallel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit dccd147f4f62225fec51768d07e683714af07db7 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 07:57:54 2018 +0200 debian/rules: backport LIB_DIR from Firefox 52 build. --- debian/changelog | 1 + debian/rules | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8dc83b6..cdb206c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add non-parallel stamps/dummy target. - Add clean rules for stamps and config.{guess,sub} files. - Add stamps/configure-palemoon target. + - Backport LIB_DIR from Firefox 52 build. * 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 4cd2eb1..bc07fa6 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,8 @@ $(call lazy,DEB_BUILD_ARCH_ENDIAN,$$(shell dpkg-architecture -qDEB_BUILD_ARCH_EN export SHELL=/bin/bash +LIB_DIR := /usr/lib/palemoon + LDFLAGS := -Wl,--as-needed # Reduce memory usage of the linker at the expense of processing time @@ -95,7 +97,8 @@ stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig ASFLAGS="-g" \ $(CONFIGURE_ENV) \ ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr $(CONFIGURE_FLAGS) \ - --with-default-mozilla-five-home=/usr/lib/palemoon + --with-default-mozilla-five-home=$(LIB_DIR) + %: dh $@ --parallel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 4c29c92eda4af782d3b802121bc6042804219032 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:07:24 2018 +0200 debian/rules: add dh_auto_build{,-arch} overrides. --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 413fb73..73b39ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add stamps/configure-palemoon target. - Backport LIB_DIR from Firefox 52 build. - Add/backport new stamps/configure-check-palemoon target. + - Add dh_auto_build{,-arch} overrides. * 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 2907b85..1916c77 100755 --- a/debian/rules +++ b/debian/rules @@ -120,6 +120,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) +override_dh_auto_build override_dh_auto_build-arch: stamps/build-palemoon %: dh $@ --parallel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit cfc6bbada35e6d310e9b0e8107bed3fdd2518157 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:02:08 2018 +0200 debian/rules: add/backport new stamps/configure-check-palemoon target. --- debian/changelog | 1 + debian/rules | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/debian/changelog b/debian/changelog index cdb206c..413fb73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add clean rules for stamps and config.{guess,sub} files. - Add stamps/configure-palemoon target. - Backport LIB_DIR from Firefox 52 build. + - Add/backport new stamps/configure-check-palemoon target. * 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 bc07fa6..2907b85 100755 --- a/debian/rules +++ b/debian/rules @@ -90,6 +90,27 @@ stamps/prepare-configure:: stamps/dummy done chmod 755 configure js/src/configure +stamps/configure-check-palemoon:: stamps/configure-palemoon +# Ensure --{with,enable}-system options properly set expected variables +# according to the definitions in the mozconfig file. + @awk -F' *# *| *$$' ' \ + BEGIN { confs="$(foreach f,autoconf.mk emptyvars.mk,$(CURDIR)/build-palemoon/config/$(f))" } \ + $$1 ~ /system/ { \ + if (! $$2) { \ + print FILENAME ": Missing variable for",$$1; \ + error=1; \ + } else { \ + split($$2,var,"="); \ + cmd = "grep -l " var[1] " " confs; \ + cmd | getline dir; \ + sub(/\/[^\/]*$$/, "", dir); \ + cmd = "$(MAKE) -C " dir " --no-print-directory echo-variable-" var[1]; \ + cmd | getline value; \ + if (value != var[2]) { print $$1, "triggered", var[1] "=" value,"instead of",$$2; error=1 } \ + } \ + } \ + END { if (error) { exit 1 }}' debian/palemoon.mozconfig + stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig $(if $(wildcard build-palemoon),,mkdir build-palemoon) cd build-palemoon && \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 55e51744f80f13732a315f6dd8bd7542a878c9c9 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 03:17:34 2018 +0200 debian/control: add libglib2.0-dev build dep. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5af312d..f2dfc34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Remove stray tab. - Switch to contrib/web section. - Add autotools-dev build dep. + - Add libglib2.0-dev build dep. * debian/rules: - Tabbify. - Add dh_testdir protection. Debian's firefox(-esr) package uses it. diff --git a/debian/control b/debian/control index 7211c80..9bcb0ab 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9), zip, pkg-config, libgtk2.0-dev (>= 2.14), + libglib2.0-dev (>= 2.16), libdbus-1-dev (>=0.60), libdbus-glib-1-dev (>= 0.60), yasm (>= 1.1), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit a68cf2dfecd8356bc7e5fcbb1201e76e33fdc8e6 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:39:34 2018 +0200 debian/rules: drop older dh_auto_build override. --- debian/changelog | 1 + debian/rules | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index eca35af..c01adca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Rework dh_auto_clean. - Add stamps/build-palemoon target. - "Rework" dh_auto_configure override. + - Drop older dh_auto_build override. * 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 8912f10..d57ddbd 100755 --- a/debian/rules +++ b/debian/rules @@ -150,9 +150,6 @@ override_dh_auto_clean:: done; \ done -override_dh_auto_build: - make -f client.mk build - override_dh_auto_install: make -f client.mk DESTDIR=$$(pwd)/debian/palemoon prefix=/usr \ installdir=/usr/lib/palemoon \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit dc70fec2da4681f1d205c96776acce08f2ed4fdd Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:08:17 2018 +0200 debian/rules: comment out all (%) rule. --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 73b39ff..eaa53e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Backport LIB_DIR from Firefox 52 build. - Add/backport new stamps/configure-check-palemoon target. - Add dh_auto_build{,-arch} overrides. + - Comment out all (%) rule. * 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 1916c77..fc25d0b 100755 --- a/debian/rules +++ b/debian/rules @@ -122,8 +122,8 @@ stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig override_dh_auto_build override_dh_auto_build-arch: stamps/build-palemoon -%: - dh $@ --parallel +#%: +# dh $@ --parallel override_dh_auto_clean:: rm -f mozconfig -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit ffc55c68bd5457eaaeae27a938dfacedb046290d Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:32:59 2018 +0200 debian/rules: add stamps/build-palemoon target. --- debian/changelog | 1 + debian/rules | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6fe9cc6..c473aad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add dh_auto_build{,-arch} overrides. - Comment out all (%) rule. - Rework dh_auto_clean. + - Add stamps/build-palemoon target. * 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 c4b4708..d388458 100755 --- a/debian/rules +++ b/debian/rules @@ -120,6 +120,12 @@ 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) +stamps/build-palemoon:: stamps/configure-check-palemoon + dh_auto_build --parallel --builddirectory=build-palemoon -- \ + LD_LIBS=-Wl,--no-gc-sections \ + _LEAKTEST_FILES=leaktest.py \ + JS_READLINE=1 + override_dh_auto_build override_dh_auto_build-arch: stamps/build-palemoon #%: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 0b373510063fd09b172c00d233379089b2f12f84 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:36:16 2018 +0200 debian/rules: "rework" dh_auto_configure override. --- debian/changelog | 1 + debian/rules | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c473aad..eca35af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Comment out all (%) rule. - Rework dh_auto_clean. - Add stamps/build-palemoon target. + - "Rework" dh_auto_configure override. * 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 d388458..8912f10 100755 --- a/debian/rules +++ b/debian/rules @@ -82,6 +82,8 @@ CXXFLAGS = $(CFLAGS) EXPORTS := CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS $(call lazy,CONFIGURE_ENV,$$(foreach export,$(EXPORTS),$$(export)="$$($$(export))")) +override_dh_auto_configure: + stamps/prepare-configure:: stamps/dummy for dir in $(AUTOCONF_DIRS); do \ for file in config.guess config.sub; do \ @@ -148,10 +150,6 @@ override_dh_auto_clean:: done; \ done - -override_dh_auto_configure: - cp debian/mozconfig mozconfig - override_dh_auto_build: make -f client.mk build -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit d5845b9287b30713eda4c0b3bcb167256c4a9b24 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:23:43 2018 +0200 debian/rules: rework dh_auto_clean. --- debian/changelog | 1 + debian/rules | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index eaa53e6..6fe9cc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add/backport new stamps/configure-check-palemoon target. - Add dh_auto_build{,-arch} overrides. - Comment out all (%) rule. + - Rework dh_auto_clean. * 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 fc25d0b..c4b4708 100755 --- a/debian/rules +++ b/debian/rules @@ -126,10 +126,15 @@ override_dh_auto_build override_dh_auto_build-arch: stamps/build-palemoon # dh $@ --parallel override_dh_auto_clean:: - rm -f mozconfig - rm -rf stamps + # FIXME: handle MPL (Mozilla Public License) file correctly. + rm -f MPL + # FIXME: handle potentially generated files, once we have them. + rm -f configure js/src/configure + rm -rf stamps l10n debian/rules debian/control TESTDIR= - dh_auto_clean + + dh_auto_clean --builddirectory=build-palemoon + find . -name "*.pyc" -o -name "*.pyo" | xargs --no-run-if-empty rm -f for dir in $(AUTOCONF_DIRS); do \ for file in config.guess config.sub; do \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 6c0fe07360e5f07b6b874c0be103bc71712e33dc Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jun 29 08:41:59 2018 +0200 debian/rules: add new ("empty") dh_auto_install override. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index c01adca..476593c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add stamps/build-palemoon target. - "Rework" dh_auto_configure override. - Drop older dh_auto_build override. + - Add new ("empty") dh_auto_install override. * 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 d57ddbd..825a0c9 100755 --- a/debian/rules +++ b/debian/rules @@ -150,6 +150,8 @@ override_dh_auto_clean:: done; \ done +override_dh_auto_install: stamps/install-palemoon + override_dh_auto_install: make -f client.mk DESTDIR=$$(pwd)/debian/palemoon prefix=/usr \ installdir=/usr/lib/palemoon \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit d6d3bcf93b87ad70e8c4500f99ac92fb8f290ef8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:09:12 2018 +0200 debian/rules: add/backport dh_auto_install override. --- debian/changelog | 1 + debian/rules | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/debian/changelog b/debian/changelog index 476593c..b4258d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -42,6 +42,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - "Rework" dh_auto_configure override. - Drop older dh_auto_build override. - Add new ("empty") dh_auto_install override. + - Add/backport dh_auto_install override. * 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 825a0c9..c1acaec 100755 --- a/debian/rules +++ b/debian/rules @@ -152,6 +152,52 @@ override_dh_auto_clean:: override_dh_auto_install: stamps/install-palemoon +ifndef USE_SYSTEM_NSPR +NSPR_VERSION = $(shell awk -F' *= *' '/MOD_[A-Z]*_VERSION/ {v[$$1] = $$2} END {print v["MOD_MAJOR_VERSION"] "." v["MOD_MINOR_VERSION"] "." v["MOD_PATCH_VERSION"]}' build-palemmon/nsprpub/config/autoconf.mk) +debian/mozilla-nspr.pc: VARS += NSPR_VERSION +debian/mozilla-nspr.pc: stamps/build-palemoon +endif + +stamps/install-palemoon:: build-palemoon/debian/installer/package-manifest +ifneq (,$(filter mips,$(DEB_BUILD_ARCH))) + # Failures are not fatal, since this old base doesn't seem to even have a greprefs.js file. + sed -i '/"javascript.options.\(baselinejit\|ion\)"/s/true/false/' build-$(PRODUCT)/dist/bin/greprefs.js || : +endif + dh_auto_install --builddirectory=build-palemoon -- installdir=$(LIB_DIR) \ + MOZ_PKG_MANIFEST=$(CURDIR)/$< \ + MOZ_NONLOCALIZED_PKG_LIST="xpcom debian" \ + MOZ_LOCALIZED_PKG_LIST=en-US \ + TAR_CREATE_FLAGS="--exclude=.mkdir.done --hard-dereference -chf" \ + SIGN_NSS= + + # Fixup permissions + find debian/tmp/usr/share debian/tmp/usr/include -type f -print0 | xargs -0 chmod 644 + chmod +x debian/tmp/usr/lib/palemoon-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file. + + # Replace some installed files by symlinks + for d in lib bin; do \ + cd "$(CURDIR)/debian/tmp/usr/lib/palemoon-devel/sdk/$$d"; \ + for f in *; do \ + if [ -f "$(CURDIR)/debian/tmp$(LIB_DIR)/$$f" ]; then \ + rm -f $$f ; ln -s $(LIB_DIR)/$$f $$f; \ + fi; \ + done; \ + done + +ifneq (,$(USE_SYSTEM_NSPR)$(USE_SYSTEM_NSS)) + # FIXME: this needs to be updated to work on debian/tmp$(LIB_DIR)-devel. + for f in $(if $(USE_SYSTEM_NSPR),/usr/include/nspr/*) $(if $(USE_SYSTEM_NSS),/usr/include/nss/*); do \ + ln -s $$f debian/tmp/usr/include/palemoon/$$(basename $$f); \ + done +endif + # FIXME: this needs to be updated to work on debian/tmp$(LIB_DIR)-devel. + for h in $$(grep -l -r EXPORTS build-palemoon/media | grep Makefile$ | \ + while read f; do $(MAKE) --no-print-directory -C $$(dirname $$f) echo-variable-EXPORTS echo-variable-EXPORTS_NAMESPACES; done); do \ + rm -rf debian/tmp/usr/include/palemoon/$$h; \ + done + + -TZ=UTC unzip -d debian/tmp$(LIB_DIR)/browser debian/tmp$(LIB_DIR)/browser/omni.ja 'defaults/preferences/*' + override_dh_auto_install: make -f client.mk DESTDIR=$$(pwd)/debian/palemoon prefix=/usr \ installdir=/usr/lib/palemoon \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 7d0fa4a30f751dc5d0a6255ec0826d5c849273cf Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:36:15 2018 +0200 debian/rules: add another hack, but commented out. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8b6b019..3ec9bca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add new ("empty") dh_auto_install override. - Add/backport dh_auto_install override. - Add a few palemoon-specific hacks for palemoon-dev(el) files. + - Add another hack, but commented out. * 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 539554f..0ddc875 100755 --- a/debian/rules +++ b/debian/rules @@ -208,6 +208,9 @@ endif mkdir debian/tmp$(LIB_DIR)-devel/share mv debian/tmp/usr/share/idl debian/tmp$(LIB_DIR)-devel/share/ + # remove vestigial duplicate file + #rm -rf debian/tmp$(LIB_DIR)/palemoon-bin + override_dh_auto_install: make -f client.mk DESTDIR=$$(pwd)/debian/palemoon prefix=/usr \ installdir=/usr/lib/palemoon \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit ef9d96f462f704a11d84d56c70a20518b9a0b43b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:34:58 2018 +0200 debian/rules: add a few palemoon-specific hacks for palemoon-dev(el) files. --- debian/changelog | 1 + debian/rules | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index b4258d6..8b6b019 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Drop older dh_auto_build override. - Add new ("empty") dh_auto_install override. - Add/backport dh_auto_install override. + - Add a few palemoon-specific hacks for palemoon-dev(el) files. * 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 c1acaec..539554f 100755 --- a/debian/rules +++ b/debian/rules @@ -197,6 +197,16 @@ endif done -TZ=UTC unzip -d debian/tmp$(LIB_DIR)/browser debian/tmp$(LIB_DIR)/browser/omni.ja 'defaults/preferences/*' + + # Palemoon-specific hacks. + + # Stage headers into $(LIB_DIR)-devel/include. + mkdir debian/tmp$(LIB_DIR)-devel/include + mv debian/tmp/usr/include/palemoon debian/tmp$(LIB_DIR)-devel/include/ + + # Stage idl into $(LIB_DIR)-devel/share. + mkdir debian/tmp$(LIB_DIR)-devel/share + mv debian/tmp/usr/share/idl debian/tmp$(LIB_DIR)-devel/share/ override_dh_auto_install: make -f client.mk DESTDIR=$$(pwd)/debian/palemoon prefix=/usr \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 52debcf6f966270f977c07c910108aaaafb50620 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:37:03 2018 +0200 debian/rules: remove old dh_auto_install override section. --- debian/changelog | 1 + debian/rules | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ec9bca..35c69e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add/backport dh_auto_install override. - Add a few palemoon-specific hacks for palemoon-dev(el) files. - Add another hack, but commented out. + - Remove old dh_auto_install override section. * 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 0ddc875..69776b7 100755 --- a/debian/rules +++ b/debian/rules @@ -211,16 +211,6 @@ endif # remove vestigial duplicate file #rm -rf debian/tmp$(LIB_DIR)/palemoon-bin -override_dh_auto_install: - make -f client.mk DESTDIR=$$(pwd)/debian/palemoon prefix=/usr \ - installdir=/usr/lib/palemoon \ - sdkdir=/usr/lib/palemoon-devel install - rm -rf $$(pwd)/debian/palemoon/usr/share/idl - rm -rf $$(pwd)/debian/palemoon/usr/lib/palemoon-devel - rm -rf $$(pwd)/debian/palemoon/usr/include -# remove vestigial duplicate file - rm -rf $$(pwd)/debian/palemoon/usr/lib/palemoon/palemoon-bin - override_dh_shlibdeps: dh_shlibdeps -l /usr/lib/palemoon -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit daba81b56f78c8b117d403b6e4726a4513e57ca7 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:51:20 2018 +0200 debian/: add noinstall file. Without preprocessing. --- debian/changelog | 1 + debian/noinstall | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 16231e6..028dd81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium * debian/: - Rename mozconfig to palemoon.mozconfig. - Add new palemoon-dev.install file. + - Add noinstall file. Without preprocessing. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/noinstall b/debian/noinstall new file mode 100644 index 0000000..1b72f69 --- /dev/null +++ b/debian/noinstall @@ -0,0 +1,8 @@ +usr/bin/palemoon +usr/lib/palemoon/run-mozilla.sh +usr/lib/palemoon/removed-files +usr/lib/palemoon/palemoon-bin +usr/lib/palemoon/browser/defaults/preferences/firefox-l10n.js +usr/lib/palemoon/dictionaries +usr/include/palemoon/testing +usr/lib/palemoon-devel/sdk/bin/ply -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 3f0d6fe07f9304f8fd4d2716af81bf04e4ade79d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:41:25 2018 +0200 debian/control: add new palemoon-dev binary package, blatantly copied from Debian's control file. --- debian/changelog | 2 ++ debian/control | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index 867715e..2549e33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add autotools-dev build dep. - Add libglib2.0-dev build dep. - Add dpkg-dev build dep. + - Add new palemoon-dev binary package, blatantly copied from Debian's + control file. * debian/rules: - Tabbify. - Add dh_testdir protection. Debian's firefox(-esr) package uses it. diff --git a/debian/control b/debian/control index 72f0191..b34d712 100644 --- a/debian/control +++ b/debian/control @@ -46,3 +46,28 @@ Description: Firefox-based, efficient and easy to use web browser Pale Moon requires a processor that supports the SSE2 instruction set. Run "/proc/cpuinfo" in a terminal, and look for sse2 in the flags to ensure that your processor supports it. + +Package: palemoon-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + python-ply, + libnss3-dev, + libnspr4-dev, + palemoon (= ${binary:Version}) +Description: Development files for the Gecko engine library + This library provides an API for XUL applications and Gecko embedders. + The Gecko engine is the core of the mozilla.org applications such as + Firefox, Thunderbird or SeaMonkey. + . + Gecko features include XPCOM, networking, DOM editing and transaction + support, XBL, XUL, SVG, XSLT, XML Extras (XMLHttpRequest and DOMParser), + Web Services (SOAP), accessibility support, IPC services, gtkmozembed, etc. + . + Install this package if you wish to embed the Gecko engine in your + program or want to develop XPCOM components. + . + This package also provides the Xulrunner Software Development Kit in the + same form as the one you may find on mozilla.org in /usr/lib/palemoon-devel/sdk. +Homepage: http://wiki.mozilla.org/XUL:Lib_XUL -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 6ac716922413bec983c297b16c4b8fe632b1cfa5 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:44:36 2018 +0200 debian/rules: add license doc staging for MPL-1.1 and MPL-2.0. --- debian/changelog | 1 + debian/rules | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2549e33..16231e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add a few palemoon-specific hacks for palemoon-dev(el) files. - Add another hack, but commented out. - Remove old dh_auto_install override section. + - Add license doc staging for MPL-1.1 and MPL-2.0. * 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 69776b7..7c08fe2 100755 --- a/debian/rules +++ b/debian/rules @@ -211,6 +211,15 @@ endif # remove vestigial duplicate file #rm -rf debian/tmp$(LIB_DIR)/palemoon-bin +MPL-1.1: gfx/cairo/cairo/COPYING-MPL-1.1 + cp -f $< $@ + +MPL-2.0: b2g/LICENSE + cp -f $< $@ + +override_dh_installdocs: MPL-1.1 MPL-2.0 + dh_installdocs -A $^ + override_dh_shlibdeps: dh_shlibdeps -l /usr/lib/palemoon -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 446ec6e16e732eb16ba6bc25da5c0c367126b93f Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:40:28 2018 +0200 debian/: add new palemoon-dev.install file. --- debian/changelog | 1 + debian/palemoon-dev.install | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 35c69e2..867715e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add helper utility from Debian crossstream. * debian/: - Rename mozconfig to palemoon.mozconfig. + - Add new palemoon-dev.install file. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/palemoon-dev.install b/debian/palemoon-dev.install new file mode 100644 index 0000000..a6dbc5a --- /dev/null +++ b/debian/palemoon-dev.install @@ -0,0 +1 @@ +usr/lib/palemoon-devel -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit e512349cee42789703fcb2620242bafa61c1eeba Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:10:43 2018 +0200 debian/rules: enhance configure phase with branding options and the remotingname hack. --- debian/changelog | 1 + debian/rules | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 49b7203..ae6cee1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Replace mkdir with install -d -m 755. - Add branding stubs. - Add MOZ_APP_REMOTINGNAME. + - Enhance configure phase with branding options and the remotingname hack. * 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 705657c..d5d0852 100755 --- a/debian/rules +++ b/debian/rules @@ -128,7 +128,9 @@ stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig ASFLAGS="-g" \ $(CONFIGURE_ENV) \ ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr $(CONFIGURE_FLAGS) \ - --with-default-mozilla-five-home=$(LIB_DIR) + --with-default-mozilla-five-home=$(LIB_DIR) \ + $(BRANDING_CONFIGURE_FLAG) + sed -i "/MOZ_APP_REMOTINGNAME/s/'[^']*',/'$(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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 2368cfef3cd957050210465d54c78fa3f545cc38 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:12:00 2018 +0200 debian/rules: move branding and remotingname variables up a few hunks. --- debian/changelog | 1 + debian/rules | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae6cee1..86168d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add branding stubs. - Add MOZ_APP_REMOTINGNAME. - Enhance configure phase with branding options and the remotingname hack. + - Move branding and remotingname variables up a few hunks. * 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 d5d0852..abec09d 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,14 @@ $(call lazy,DEB_BUILD_ARCH_ENDIAN,$$(shell dpkg-architecture -qDEB_BUILD_ARCH_EN export SHELL=/bin/bash +OFFICIAL_BRANDING := browser/branding/official +MOZILLA_OFFICIAL := 1 +BRANDING ?= $(OFFICIAL_BRANDING) + +BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding,--with-branding=$(BRANDING)) + +MOZ_APP_REMOTINGNAME := $(call uc_first,$($(PRODUCT))) + LIB_DIR := /usr/lib/palemoon LDFLAGS := -Wl,--as-needed @@ -40,14 +48,6 @@ export CPP=cpp-4.9 export LD=gcc-4.9 endif -OFFICIAL_BRANDING := browser/branding/official -MOZILLA_OFFICIAL := 1 -BRANDING ?= $(OFFICIAL_BRANDING) - -BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding,--with-branding=$(BRANDING)) - -MOZ_APP_REMOTINGNAME := $(call uc_first,$($(PRODUCT))) - AUTOCONF_DIRS := build/autoconf js/src/build/autoconf ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit c31888dbb07921f77497fe14102df56ee83ffd40 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:12:53 2018 +0200 debian/rules: add dh_install stamp. --- debian/changelog | 1 + debian/rules | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index 86168d0..3cccda2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add MOZ_APP_REMOTINGNAME. - Enhance configure phase with branding options and the remotingname hack. - Move branding and remotingname variables up a few hunks. + - Add dh_install stamp. * 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 abec09d..ef2f163 100755 --- a/debian/rules +++ b/debian/rules @@ -233,6 +233,26 @@ override_dh_installdocs: MPL-1.1 MPL-2.0 override_dh_shlibdeps: dh_shlibdeps -l /usr/lib/palemoon +branding_icon = $(or $(wildcard $(BRANDING)/$(1)),$(wildcard build-palemoon/$(BRANDING)/$(1))) + +stamps/dh_install:: debian/noinstall + awk '{print "debian/tmp/" $$1 }' < debian/noinstall | xargs rm -r + dh_install --fail-missing + + # Install icons + install -d -m 755 debian/palemoon/usr/share/icons/hicolor/16x16/apps + install -m 644 $(call branding_icon,default16.png) \ + debian/palemoon/usr/share/icons/hicolor/16x16/apps/palemoon.png + install -d -m 755 debian/palemoon/usr/share/icons/hicolor/32x32/apps + install -m 644 $(call branding_icon,default32.png) \ + debian/palemoon/usr/share/icons/hicolor/32x32/apps/palemoon.png + install -d -m 755 debian/palemoon/usr/share/icons/hicolor/64x64/apps + install -m 644 $(call branding_icon,content/icon64.png) \ + debian/palemoon/usr/share/icons/hicolor/64x64/apps/palemoon.png + install -d -m 755 debian/palemoon/usr/share/icons/hicolor/symbolic/apps + sed 's/viewBox="[^"]*"/viewBox="-41 35 32 32"/' $(call branding_icon,content/silhouette-40.svg) > \ + debian/palemoon/usr/share/icons/hicolor/symbolic/apps/palemoon-symbolic.svg + # For releases that don't use xz compression by default, such as Wheezy. # It's OK to leave this in for those that do. override_dh_builddeb: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit b8413b000450dc76bc0ab5326209faaef2b1b2e2 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 04:56:51 2018 +0200 debian/rules: replace mkdir with install -d -m 755. --- debian/changelog | 1 + debian/rules | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 028dd81..ee52fd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add another hack, but commented out. - Remove old dh_auto_install override section. - Add license doc staging for MPL-1.1 and MPL-2.0. + - Replace mkdir with install -d -m 755. * 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 7c08fe2..3517a78 100755 --- a/debian/rules +++ b/debian/rules @@ -201,13 +201,13 @@ endif # Palemoon-specific hacks. # Stage headers into $(LIB_DIR)-devel/include. - mkdir debian/tmp$(LIB_DIR)-devel/include + install -d -m 755 debian/tmp$(LIB_DIR)-devel/include mv debian/tmp/usr/include/palemoon debian/tmp$(LIB_DIR)-devel/include/ # Stage idl into $(LIB_DIR)-devel/share. - mkdir debian/tmp$(LIB_DIR)-devel/share + install -d -m 755 debian/tmp$(LIB_DIR)-devel/share mv debian/tmp/usr/share/idl debian/tmp$(LIB_DIR)-devel/share/ - + # remove vestigial duplicate file #rm -rf debian/tmp$(LIB_DIR)/palemoon-bin -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit e86fba36e97746c5b57d614e543530100feaef7c Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:05:55 2018 +0200 debian/rules: add branding stubs. --- debian/changelog | 1 + debian/rules | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index ee52fd0..b7efbe4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Remove old dh_auto_install override section. - Add license doc staging for MPL-1.1 and MPL-2.0. - Replace mkdir with install -d -m 755. + - Add branding stubs. * 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 3517a78..363384c 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,12 @@ export CPP=cpp-4.9 export LD=gcc-4.9 endif +OFFICIAL_BRANDING := browser/branding/official +MOZILLA_OFFICIAL := 1 +BRANDING ?= $(OFFICIAL_BRANDING) + +BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding,--with-branding=$(BRANDING)) + AUTOCONF_DIRS := build/autoconf js/src/build/autoconf ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 757ff75fd1b9d22618efce5701d16b000995f41d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:08:52 2018 +0200 debian/rules: add MOZ_APP_REMOTINGNAME. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index b7efbe4..49b7203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add license doc staging for MPL-1.1 and MPL-2.0. - Replace mkdir with install -d -m 755. - Add branding stubs. + - Add MOZ_APP_REMOTINGNAME. * 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 363384c..705657c 100755 --- a/debian/rules +++ b/debian/rules @@ -46,6 +46,8 @@ BRANDING ?= $(OFFICIAL_BRANDING) BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding,--with-branding=$(BRANDING)) +MOZ_APP_REMOTINGNAME := $(call uc_first,$($(PRODUCT))) + AUTOCONF_DIRS := build/autoconf js/src/build/autoconf ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 208d49bd86a14683c62c7c2c78feddbf9fcb16f1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:14:46 2018 +0200 debian/rules: add dh_install override. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3cccda2..053be13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Enhance configure phase with branding options and the remotingname hack. - Move branding and remotingname variables up a few hunks. - Add dh_install stamp. + - Add dh_install override. * 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 ef2f163..5e7be6c 100755 --- a/debian/rules +++ b/debian/rules @@ -253,6 +253,8 @@ stamps/dh_install:: debian/noinstall sed 's/viewBox="[^"]*"/viewBox="-41 35 32 32"/' $(call branding_icon,content/silhouette-40.svg) > \ debian/palemoon/usr/share/icons/hicolor/symbolic/apps/palemoon-symbolic.svg +override_dh_install: stamps/dh_install + # For releases that don't use xz compression by default, such as Wheezy. # It's OK to leave this in for those that do. override_dh_builddeb: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 522935a29474b7f6e4eca461207aac8600ce315b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 05:52:50 2018 +0200 debian/: add very stripped-down upstream.mk file. --- debian/changelog | 1 + debian/upstream.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/debian/changelog b/debian/changelog index 053be13..5ab7d6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Rename mozconfig to palemoon.mozconfig. - Add new palemoon-dev.install file. - Add noinstall file. Without preprocessing. + - Add very stripped-down upstream.mk file. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/upstream.mk b/debian/upstream.mk new file mode 100644 index 0000000..ee0e36b --- /dev/null +++ b/debian/upstream.mk @@ -0,0 +1,49 @@ +# Generic rules to help download sources from archive.mozilla.org. +# Define the following variables before including this file: +# PRODUCT - product codename (e.g. browser) +# +# Modified for Palemoon. No need to define PRODUCT (yet). +# Fetching upstream source is not supported either. +# That's really a stripped-down version of the original. + +include /usr/share/dpkg/pkg-info.mk + +$(call lazy,UPSTREAM_VERSION,$$(shell cat browser/config/version.txt)) + +# Last version in debian/changelog +DEBIAN_SOURCE := $(DEB_SOURCE) +DEBIAN_VERSION := $(DEB_VERSION) +# Debian part of the above version (anything after the last dash) +DEBIAN_RELEASE := $(lastword $(subst -, ,$(DEBIAN_VERSION))) +# Upstream part of the debian/changelog version (anything before the last dash) +UPSTREAM_RELEASE := $(DEB_VERSION_UPSTREAM) +# Aurora builds have the build id in the upstream part of the debian/changelog version +export MOZ_BUILD_DATE := $(word 2,$(subst +, ,$(UPSTREAM_RELEASE))) +ifndef MOZ_BUILD_DATE +export MOZ_BUILD_DATE := $(shell TZ=UTC date -d "$(shell dpkg-parsechangelog -S Date)" +%Y%m%d%H%M%S) +endif +UPSTREAM_RELEASE := $(firstword $(subst +, ,$(UPSTREAM_RELEASE))) +# If the debian part of the version contains ~bpo or ~deb, it's a backport +DEBIAN_RELEASE_EXTRA := $(word 2,$(subst ~, ,$(DEBIAN_RELEASE))) +DIST = unknown +ifneq (,$(filter experimental,$(DEB_DISTRIBUTION))) +DIST = experimental +endif +ifneq (,$(filter testing% buster% unstable sid,$(DEB_DISTRIBUTION))) +DIST = buster +endif +ifneq (,$(filter bpo% deb%,$(DEBIAN_RELEASE_EXTRA))) +DEBIAN_TARGET := $(subst bpo,,$(subst deb,,$(DEBIAN_RELEASE_EXTRA))) +ifneq (,$(filter 7%,$(DEBIAN_TARGET))) +DIST = wheezy +endif +ifneq (,$(filter 8%,$(DEBIAN_TARGET))) +DIST = jessie +endif +ifneq (,$(filter 9%,$(DEBIAN_TARGET))) +DIST = stretch +endif +ifneq (,$(filter 10%,$(DEBIAN_TARGET))) +DIST = buster +endif +endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit d6a529c5689882440818e5876b04d6953fc791ed Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:03:38 2018 +0200 debian/rules: add dh_strip override. --- debian/changelog | 1 + debian/rules | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5ab7d6b..acc8c48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Move branding and remotingname variables up a few hunks. - Add dh_install stamp. - Add dh_install override. + - Add dh_strip override. * 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 5e7be6c..9bf0621 100755 --- a/debian/rules +++ b/debian/rules @@ -255,6 +255,13 @@ stamps/dh_install:: debian/noinstall override_dh_install: stamps/dh_install +override_dh_strip: +ifneq (,$(filter wheezy jessie,$(DIST))) + dh_strip -a --dbg-package=palemoon-dbg +else + dh_strip +endif + # For releases that don't use xz compression by default, such as Wheezy. # It's OK to leave this in for those that do. override_dh_builddeb: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit f00dd21bc885b95dcf2baa12e420adb6c8a542d2 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:05:36 2018 +0200 debian/rules: remove old dh_shlibdeps override. --- debian/changelog | 1 + debian/rules | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39c5165..203edc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add dh_install override. - Add dh_strip override. - Add dh_shlibdeps override. + - Remove old dh_shlibdeps override. * 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 472ef22..df6428b 100755 --- a/debian/rules +++ b/debian/rules @@ -230,9 +230,6 @@ MPL-2.0: b2g/LICENSE override_dh_installdocs: MPL-1.1 MPL-2.0 dh_installdocs -A $^ -override_dh_shlibdeps: - dh_shlibdeps -l /usr/lib/palemoon - branding_icon = $(or $(wildcard $(BRANDING)/$(1)),$(wildcard build-palemoon/$(BRANDING)/$(1))) stamps/dh_install:: debian/noinstall -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 24970c66df801ad9a0b89530305ddc287c17e9fe Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:05:04 2018 +0200 debian/rules: add dh_shlibdeps override. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index acc8c48..39c5165 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add dh_install stamp. - Add dh_install override. - Add dh_strip override. + - Add dh_shlibdeps override. * 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 9bf0621..472ef22 100755 --- a/debian/rules +++ b/debian/rules @@ -262,6 +262,9 @@ else dh_strip endif +override_dh_shlibdeps: + dh_shlibdeps -a -l$(CURDIR)/debian/tmp$(LIB_DIR) + # For releases that don't use xz compression by default, such as Wheezy. # It's OK to leave this in for those that do. override_dh_builddeb: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit c05cd5d54455db819ca8d85d9465e2fecc71c0d8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:09:08 2018 +0200 debian/rules: add general dh-calling rule. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 203edc9..c407197 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add dh_strip override. - Add dh_shlibdeps override. - Remove old dh_shlibdeps override. + - Add general dh-calling rule. * 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 df6428b..6858105 100755 --- a/debian/rules +++ b/debian/rules @@ -262,6 +262,9 @@ endif override_dh_shlibdeps: dh_shlibdeps -a -l$(CURDIR)/debian/tmp$(LIB_DIR) +binary binary-arch binary-indep build build-arch build-indep clean install: + dh $@ + # For releases that don't use xz compression by default, such as Wheezy. # It's OK to leave this in for those that do. override_dh_builddeb: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 8ac7601e803d6d9cdd40771c8baa665363dfebce Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:09:51 2018 +0200 debian/rules: remove old and commented-out dh-calling rule. --- debian/changelog | 1 + debian/rules | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c407197..9b40fc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add dh_shlibdeps override. - Remove old dh_shlibdeps override. - Add general dh-calling rule. + - Remove old and commented-out dh-calling rule. * 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 6858105..f0da0e0 100755 --- a/debian/rules +++ b/debian/rules @@ -140,9 +140,6 @@ stamps/build-palemoon:: stamps/configure-check-palemoon override_dh_auto_build override_dh_auto_build-arch: stamps/build-palemoon -#%: -# dh $@ --parallel - override_dh_auto_clean:: # FIXME: handle MPL (Mozilla Public License) file correctly. rm -f MPL -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit add4706a3118d3116476eaccedb7f50478dd7013 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:10:59 2018 +0200 debian/rules: whitespace fixup only. --- debian/changelog | 1 + debian/rules | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7c2adda..7cba873 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add general dh-calling rule. - Remove old and commented-out dh-calling rule. - Make some targets phony. + - Whitespace fixup only. * 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 b6c44ce..7198c6c 100755 --- a/debian/rules +++ b/debian/rules @@ -269,7 +269,6 @@ binary binary-arch binary-indep build build-arch build-indep clean install: override_dh_builddeb: dh_builddeb -- -Z xz - .NOTPARALLEL: $(shell awk -F:: '$$1 ~ /^stamps\// && !/%/ { print $$1 }' debian/rules) stamps/dummy:: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit e28c72e71def1cd4ce1b86d4a99c2423a06af4b9 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:13:08 2018 +0200 debian/rules: remove FIXME entry for MPL, downstream seems to do it wrongly, but it's not causing harm, so just keep it. --- debian/changelog | 2 ++ debian/rules | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7cba873..2ceeff9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Remove old and commented-out dh-calling rule. - Make some targets phony. - Whitespace fixup only. + - Remove FIXME entry for MPL, downstream seems to do it wrongly, but it's + not causing harm, so just keep it. * 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 7198c6c..232749a 100755 --- a/debian/rules +++ b/debian/rules @@ -141,7 +141,6 @@ stamps/build-palemoon:: stamps/configure-check-palemoon override_dh_auto_build override_dh_auto_build-arch: stamps/build-palemoon override_dh_auto_clean:: - # FIXME: handle MPL (Mozilla Public License) file correctly. rm -f MPL # FIXME: handle potentially generated files, once we have them. rm -f configure js/src/configure -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit a8fc976880c56b157ef78b5faba490745e18c640 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 30 06:10:14 2018 +0200 debian/rules: make some targets phony. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9b40fc5..7c2adda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Remove old dh_shlibdeps override. - Add general dh-calling rule. - Remove old and commented-out dh-calling rule. + - Make some targets phony. * 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 f0da0e0..b6c44ce 100755 --- a/debian/rules +++ b/debian/rules @@ -262,6 +262,8 @@ override_dh_shlibdeps: binary binary-arch binary-indep build build-arch build-indep clean install: dh $@ +.PHONY: build clean binary-indep binary-arch binary install + # For releases that don't use xz compression by default, such as Wheezy. # It's OK to leave this in for those that do. override_dh_builddeb: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
-
git-admin＠x2go.org