This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch stretch in repository wine.
commit 4ec4e747d52250bb4f10de533ddd5245d4741637 Author: Jens Reyer <[email protected]> Date: Tue Aug 30 02:08:44 2016 +0200 Split off disable/rerun-configure.patch from makefile.patch. # Conflicts: # debian/patches/makefile.patch --- debian/patches/disable/rerun-configure.patch | 21 +++++++++++++++++++++ debian/patches/makefile.patch | 16 ---------------- debian/patches/series | 1 + 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/debian/patches/disable/rerun-configure.patch b/debian/patches/disable/rerun-configure.patch new file mode 100644 index 0000000..4ffabd0 --- /dev/null +++ b/debian/patches/disable/rerun-configure.patch @@ -0,0 +1,21 @@ +description: drop rules for re-running configure. +author: Michael Gilbert <[email protected]> + +--- a/Makefile.in ++++ b/Makefile.in +@@ -108,15 +108,6 @@ ALL_TEST_RESOURCES = @ALL_TEST_RESOURCE + all: wine + @echo "Wine build complete." + +-# Rules for re-running configure +- +-config.status: $(srcdir)/configure +- @./config.status --recheck +- +-include/config.h: include/stamp-h +-include/stamp-h: $(srcdir)/include/config.h.in config.status +- @./config.status include/config.h include/stamp-h +- + # Rules for cleaning + + .PHONY: clean distclean __clean__ diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch index 64e502c..8367402 100644 --- a/debian/patches/makefile.patch +++ b/debian/patches/makefile.patch @@ -25,22 +25,6 @@ author: Michael Gilbert <[email protected]> dlldir = @dlldir@ fakedlldir = ${dlldir}/fakedlls top_srcdir = @top_srcdir@ -@@ -108,15 +108,6 @@ ALL_TEST_RESOURCES = @ALL_TEST_RESOURCE - all: wine - @echo "Wine build complete." - --# Rules for re-running configure -- --config.status: $(srcdir)/configure -- @./config.status --recheck -- --include/config.h: include/stamp-h --include/stamp-h: $(srcdir)/include/config.h.in config.status -- @./config.status include/config.h include/stamp-h -- - # Rules for cleaning - - .PHONY: clean distclean __clean__ --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -4,7 +4,6 @@ EXTRAIDLFLAGS = --prefix-server=s_ diff --git a/debian/patches/series b/debian/patches/series index 2b68b9a..52cb828 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,6 +8,7 @@ version-string.patch manpages-wineserver-persistence.patch disable/addons-download.patch +disable/rerun-configure.patch disable/shlib-exit-calls.patch generate/opengl.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
