[Pkg-libvirt-commits] [libguestfs] 51/54: Rebased patch queue, dropping a few patches that have been integrated upstream
Hilko Bengen
bengen at moszumanska.debian.org
Sun Mar 9 11:21:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch debian
in repository libguestfs.
commit 4a5a37e27a5ab15fa9bf905b9db03ce30fa73215
Author: Hilko Bengen <bengen at debian.org>
Date: Sat Mar 8 23:01:30 2014 +0100
Rebased patch queue, dropping a few patches that have been integrated upstream
---
.../0002-Fix-guestfs-supermin-appliance-path.patch | 10 +++----
...failed-attempt-at-building-out-of-tree-s.patch} | 4 +--
.../0003-remove-last-trace-of-ntfsprogs.patch | 20 --------------
... => 0004-Disable-gnulib-tests-by-default.patch} | 6 ++--
...> 0005-golang-Fix-for-out-of-tree-builds.patch} | 4 +--
...dule-init-tools-which-has-been-a-metapac.patch} | 0
...er-Recognize-git-style-dates-in-ChangeLog.patch | 32 ----------------------
debian/patches/series | 10 +++----
8 files changed, 16 insertions(+), 70 deletions(-)
diff --git a/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
index 6e3fd20..fb8b085 100644
--- a/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
@@ -9,7 +9,7 @@ The supermin appliance files are not installed to the multiarch lib directory.
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 54d3379..13a9f6c 100644
+index 0e3436e..c343a91 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -27,8 +27,8 @@ EXTRA_DIST = \
@@ -21,13 +21,13 @@ index 54d3379..13a9f6c 100644
+fsdir = $(prefix)/lib/guestfs
+superminfsdir = $(prefix)/lib/guestfs/supermin.d
- fs_DATA =
- superminfs_DATA = \
+ if SUPERMIN_HELPER_COMPRESSED_CPIO
+ GZ = .gz
diff --git a/src/Makefile.am b/src/Makefile.am
-index 57cdf34..f066bee 100644
+index 1452194..b94bfb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -120,7 +120,7 @@ libguestfs_la_SOURCES = \
+@@ -123,7 +123,7 @@ libguestfs_la_SOURCES = \
libguestfs.syms
libguestfs_la_CPPFLAGS = \
diff --git a/debian/patches/0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch b/debian/patches/0003-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
similarity index 83%
rename from debian/patches/0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
rename to debian/patches/0003-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
index 146b94d..818e31d 100644
--- a/debian/patches/0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
+++ b/debian/patches/0003-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
@@ -1,7 +1,7 @@
From: Hilko Bengen <bengen at debian.org>
Date: Thu, 23 May 2013 19:20:17 +0200
-Subject: perl: revert failed attempt at building out-of-tree, set PERL5LIB
- correctly for bindtests
+Subject: perl: revert failed attempt at building out-of-tree,
+ set PERL5LIB correctly for bindtests
---
perl/Makefile.am | 3 +--
diff --git a/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch b/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
deleted file mode 100644
index 6b21df0..0000000
--- a/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
-Date: Fri, 17 May 2013 10:11:37 +0200
-Subject: remove last trace of ntfsprogs
-
----
- appliance/packagelist.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 8a4a5ea..54895b8 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -79,7 +79,6 @@
- mtools
- nilfs-tools
- ntfs-3g
-- ntfsprogs
- openssh-client
- reiserfsprogs
- sysvinit /* for /sbin/reboot */
diff --git a/debian/patches/0005-Disable-gnulib-tests-by-default.patch b/debian/patches/0004-Disable-gnulib-tests-by-default.patch
similarity index 91%
rename from debian/patches/0005-Disable-gnulib-tests-by-default.patch
rename to debian/patches/0004-Disable-gnulib-tests-by-default.patch
index 7e8e582..e359bb3 100644
--- a/debian/patches/0005-Disable-gnulib-tests-by-default.patch
+++ b/debian/patches/0004-Disable-gnulib-tests-by-default.patch
@@ -8,7 +8,7 @@ Subject: Disable gnulib tests by default
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index 34ca59d..79a4b05 100644
+index 09296e5..eb3f899 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@ include $(top_srcdir)/common-rules.mk
@@ -24,10 +24,10 @@ index 34ca59d..79a4b05 100644
# Basic source for the library.
SUBDIRS += tests/data generator src examples po
diff --git a/configure.ac b/configure.ac
-index eca0e25..b558d77 100644
+index 57d0ca3..072d7f4 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1531,6 +1531,15 @@ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
+@@ -1541,6 +1541,15 @@ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
])
AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
diff --git a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0005-golang-Fix-for-out-of-tree-builds.patch
similarity index 92%
rename from debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
rename to debian/patches/0005-golang-Fix-for-out-of-tree-builds.patch
index ffa03a1..9073bf0 100644
--- a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0005-golang-Fix-for-out-of-tree-builds.patch
@@ -8,10 +8,10 @@ Subject: golang: Fix for out-of-tree builds
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 2bd7079..3919470 100644
+index 072d7f4..d1410ef 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1502,7 +1502,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
+@@ -1437,7 +1437,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
AC_CHECK_PROG([GOLANG],[go],[go],[no])
AS_IF([test "x$GOLANG" != "xno"],[
AC_MSG_CHECKING([if $GOLANG is usable])
diff --git a/debian/patches/0007-Don-t-use-module-init-tools-which-has-been-a-metapac.patch b/debian/patches/0006-Don-t-use-module-init-tools-which-has-been-a-metapac.patch
similarity index 100%
rename from debian/patches/0007-Don-t-use-module-init-tools-which-has-been-a-metapac.patch
rename to debian/patches/0006-Don-t-use-module-init-tools-which-has-been-a-metapac.patch
diff --git a/debian/patches/0008-podwrapper-Recognize-git-style-dates-in-ChangeLog.patch b/debian/patches/0008-podwrapper-Recognize-git-style-dates-in-ChangeLog.patch
deleted file mode 100644
index c88963d..0000000
--- a/debian/patches/0008-podwrapper-Recognize-git-style-dates-in-ChangeLog.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 13 Feb 2014 23:57:53 +0100
-Subject: podwrapper: Recognize git-style dates in ChangeLog
-
----
- podwrapper.pl.in | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/podwrapper.pl.in b/podwrapper.pl.in
-index 9bceec3..61d5e12 100755
---- a/podwrapper.pl.in
-+++ b/podwrapper.pl.in
-@@ -235,9 +235,17 @@ my $date;
- my $filename = "$abs_top_srcdir/ChangeLog";
- if (-r $filename) {
- open FILE, $filename or die "$progname: $filename: $!";
-- $_ = <FILE>;
-+ while (<FILE>) {
-+ if (/^Date:\s+...\s+(...)\s+(\d+)\s+..:..:..\s+(\d{4})\s+.*$/) {
-+ my $i = 0;
-+ my %month =
-+ map { $_ => ++$i }
-+ (qw< Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec >);
-+ $date = sprintf '%04d-%02d-%02d', $3, $month{$1}, $2;
-+ last;
-+ }
-+ }
- close FILE;
-- $date = $1 if /^(\d+-\d+-\d+)\s/;
- }
- $filename = "$abs_top_srcdir/.git";
- if (!$date && -d $filename) {
diff --git a/debian/patches/series b/debian/patches/series
index 05e4744..c661c88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
0001-Fix-for-systemd-based-Debian-systems.patch
0002-Fix-guestfs-supermin-appliance-path.patch
-0003-remove-last-trace-of-ntfsprogs.patch
-0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
-0005-Disable-gnulib-tests-by-default.patch
-0006-golang-Fix-for-out-of-tree-builds.patch
-0007-Don-t-use-module-init-tools-which-has-been-a-metapac.patch
-0008-podwrapper-Recognize-git-style-dates-in-ChangeLog.patch
+0003-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
+0004-Disable-gnulib-tests-by-default.patch
+0005-golang-Fix-for-out-of-tree-builds.patch
+0006-Don-t-use-module-init-tools-which-has-been-a-metapac.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list