This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 05507c939d5475b5175b40ea54f55c27818ab14a Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 31 05:45:38 2018 +0200 debian/patches: refresh. --- debian/changelog | 2 ++ .../Add-debian-extra-stuff-to-upstream-build-system-dire.patch | 8 +++----- .../Make-upstream-build-system-create-debian-installer-M.patch | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab9843e..f7b8a07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium the first one, like it was previously). * debian/source/local-options: - Ignore autogenerated ChangeLog.gitlog file. + * debian/patches: + - Refresh. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 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 index 7a98fa4..da84ac3 100644 --- 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 @@ -6,13 +6,11 @@ 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'] +@@ -70,4 +70,7 @@ if not CONFIG['JS_STANDALONE']: + # Bring in the configuration for the configured application. + include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild') +if not CONFIG['LIBXUL_SDK']: + DIRS += ['debian/extra-stuff'] 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 index 0377a8f..7307c4c 100644 --- 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 @@ -6,11 +6,9 @@ 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'] +@@ -73,4 +73,6 @@ if not CONFIG['JS_STANDALONE']: if not CONFIG['LIBXUL_SDK']: DIRS += ['debian/extra-stuff'] -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git