[Pkg-wmaker-commits] [wmaker] 01/10: debian/patches/{56_ignore_runstatedir,57_ignore_with-aix-soname}.diff: Remove patches; applied upstream.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Mar 13 18:31:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch experimental
in repository wmaker.
commit fff6208049ff45d589d9b885bee758d9d5ba5e26
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Mon Mar 13 13:28:36 2017 -0400
debian/patches/{56_ignore_runstatedir,57_ignore_with-aix-soname}.diff:
Remove patches; applied upstream.
---
debian/patches/56_ignore_runstatedir.diff | 18 ------------------
debian/patches/57_ignore_with-aix-soname.diff | 18 ------------------
debian/patches/series | 2 --
3 files changed, 38 deletions(-)
diff --git a/debian/patches/56_ignore_runstatedir.diff b/debian/patches/56_ignore_runstatedir.diff
deleted file mode 100644
index 0d8d81c..0000000
--- a/debian/patches/56_ignore_runstatedir.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Ignore runstatedir in check-cmdline-options-doc.sh
- autoconf 2.70 will add a --runstatedir option, Debian has backported it.
- Ignore it when checking whether INSTALL is up to date.
-Author: Andreas Metzler <ametzler at debian.org>
-Origin: vendor
-Applied-Upstream: http://repo.or.cz/wmaker-crm.git/commit/4f18b3e
-Last-Update: 2016-02-09
-
---- wmaker-0.95.7.orig/Makefile.am
-+++ wmaker-0.95.7/Makefile.am
-@@ -106,6 +106,7 @@ configure-documentation:
- --ignore-prg 'enable-shared,enable-static # should be in INSTALL' \
- --ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \
- --ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
-+ --ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
- --ignore-prg 'with-x # no use, it would not work without X'
-
- .PHONY: configure-documentation
diff --git a/debian/patches/57_ignore_with-aix-soname.diff b/debian/patches/57_ignore_with-aix-soname.diff
deleted file mode 100644
index 70dd03b..0000000
--- a/debian/patches/57_ignore_with-aix-soname.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Ignore with-aix-soname in check-cmdline-options-doc.sh
- libtool 2.4.4 will add a --with-aix-soname option. Ignore it when checking
- whether INSTALL-WMAKER is up to date.
-Author: Doug Torrance <dtorrance at piedmont.edu>
-Bug-Debian: http://bugs.debian.org/814213
-Applied-Upstream: http://repo.or.cz/wmaker-crm.git/commit/67e9e7e
-Last-Update: 2016-02-09
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -107,6 +107,7 @@
- --ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \
- --ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
- --ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
-+ --ignore-prg 'with-aix-soname #new in libtool 2.4.4' \
- --ignore-prg 'with-x # no use, it would not work without X'
-
- .PHONY: configure-documentation
diff --git a/debian/patches/series b/debian/patches/series
index 1640f49..d74274f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,4 @@
53_Debian_WMState.diff
54_Debian_wmmacros.diff
55_ungif_problem.diff
-56_ignore_runstatedir.diff
-57_ignore_with-aix-soname.diff
60_fix_wraster_symbol_versioning.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git
More information about the Pkg-wmaker-commits
mailing list