This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit c578990b34aa8911d6b46491d0175f624262a63b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 31 05:41:30 2018 +0200 debian/: new directory "patches" populated with Debian-specific copied patches. --- debian/changelog | 1 + ...n-extra-stuff-to-upstream-build-system-dire.patch | 20 ++++++++++++++++++++ ...ream-build-system-create-debian-installer-M.patch | 19 +++++++++++++++++++ debian/patches/series | 3 +++ 4 files changed, 43 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2a373ec..ab9843e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium installation files. - New directory "extra-stuff" containing Debian-specific additions (currently only addonsInfo). + - New directory "patches" populated with Debian-specific copied patches. * debian/changelog: - Change repack-1 in version string to repack1 because a dash denotes the start of a downstream change. diff --git a/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch new file mode 100644 index 0000000..7a98fa4 --- /dev/null +++ b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch @@ -0,0 +1,20 @@ +From: Mike Hommey <mh@glandium.org> +Date: Mon, 16 Dec 2013 10:53:58 +0900 +Subject: Add debian/extra-stuff to upstream build system directory traversal + +--- + moz.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/moz.build b/moz.build +index fee89428deea..0eff8b810f05 100644 +--- a/moz.build ++++ b/moz.build +@@ -86,4 +86,7 @@ if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']: + + CONFIGURE_SUBST_FILES += ['.cargo/config'] + ++if not CONFIG['LIBXUL_SDK']: ++ DIRS += ['debian/extra-stuff'] ++ + include('build/templates.mozbuild') 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 new file mode 100644 index 0000000..0377a8f --- /dev/null +++ b/debian/patches/debian-hacks/Make-upstream-build-system-create-debian-installer-M.patch @@ -0,0 +1,19 @@ +From: Mike Hommey <mh@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(+) + +diff --git a/moz.build b/moz.build +index 0eff8b810f05..0d6658691925 100644 +--- a/moz.build ++++ b/moz.build +@@ -89,4 +89,6 @@ CONFIGURE_SUBST_FILES += ['.cargo/config'] + 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 new file mode 100644 index 0000000..0c0ca9f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +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