[Pkg-libvirt-commits] [libguestfs] 18/19: Rebased patch-queue; added patch to remove cruft from appliance
Hilko Bengen
bengen at moszumanska.debian.org
Wed Feb 26 08:45:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch experimental
in repository libguestfs.
commit 02bf897f8cd40490483b355ee0ecc495a286e532
Author: Hilko Bengen <bengen at debian.org>
Date: Sun Feb 23 11:22:36 2014 +0100
Rebased patch-queue; added patch to remove cruft from appliance
---
...0001-Fix-for-systemd-based-Debian-systems.patch | 4 ++--
.../0002-Fix-guestfs-supermin-appliance-path.patch | 6 +++---
.../0003-remove-last-trace-of-ntfsprogs.patch | 6 +++---
...-failed-attempt-at-building-out-of-tree-s.patch | 4 ++--
.../0005-Disable-gnulib-tests-by-default.patch | 10 +++++-----
.../0006-golang-Fix-for-out-of-tree-builds.patch | 4 ++--
...p-Lintian-overrides-initramfs-related-stu.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
8 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch b/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
index a6516b3..423f14a 100644
--- a/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
+++ b/debian/patches/0001-Fix-for-systemd-based-Debian-systems.patch
@@ -7,10 +7,10 @@ Subject: Fix for systemd-based Debian systems
1 file changed, 3 insertions(+)
diff --git a/appliance/make.sh.in b/appliance/make.sh.in
-index 8ba1fa4..81ba395 100755
+index 7fa494e..5907b01 100755
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
-@@ -64,4 +64,7 @@ if grep -q /usr/share/augeas/lenses supermin.d/hostfiles-t; then
+@@ -58,4 +58,7 @@ if grep -q /usr/share/augeas/lenses supermin.d/hostfiles-t; then
echo "/usr/share/augeas/lenses/*.aug" >> supermin.d/hostfiles-t
fi
diff --git a/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0002-Fix-guestfs-supermin-appliance-path.patch
index 6e3fd20..7ef7be1 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 a9cc9fe..85f3b91 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -27,8 +27,8 @@ EXTRA_DIST = \
@@ -24,10 +24,10 @@ index 54d3379..13a9f6c 100644
fs_DATA =
superminfs_DATA = \
diff --git a/src/Makefile.am b/src/Makefile.am
-index 57cdf34..f066bee 100644
+index 10f5203..6d217b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -120,7 +120,7 @@ libguestfs_la_SOURCES = \
+@@ -130,7 +130,7 @@ libguestfs_la_SOURCES = \
libguestfs.syms
libguestfs_la_CPPFLAGS = \
diff --git a/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch b/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
index 6b21df0..cb1efc5 100644
--- a/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
+++ b/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
Date: Fri, 17 May 2013 10:11:37 +0200
Subject: remove last trace of ntfsprogs
@@ -7,10 +7,10 @@ Subject: remove last trace of ntfsprogs
1 file changed, 1 deletion(-)
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 8a4a5ea..54895b8 100644
+index 2963033..19dd291 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
-@@ -79,7 +79,6 @@
+@@ -78,7 +78,6 @@
mtools
nilfs-tools
ntfs-3g
diff --git a/debian/patches/0004-perl-revert-failed-attempt-at-building-out-of-tree-s.patch b/debian/patches/0004-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/0004-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/0005-Disable-gnulib-tests-by-default.patch b/debian/patches/0005-Disable-gnulib-tests-by-default.patch
index 7e8e582..6874ab7 100644
--- a/debian/patches/0005-Disable-gnulib-tests-by-default.patch
+++ b/debian/patches/0005-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 e34e10c..f76e1e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@ include $(top_srcdir)/common-rules.mk
@@ -24,12 +24,12 @@ 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 96ae786..88dbbb9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1531,6 +1531,15 @@ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
- ])
- AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
+@@ -1578,6 +1578,15 @@ dnl For search paths.
+ AC_DEFINE_UNQUOTED([PATH_SEPARATOR],["$PATH_SEPARATOR"],
+ [Character that separates path elements in search paths])
+AC_ARG_ENABLE([gnulib-tests],
+ [AS_HELP_STRING([--disable-gnulib-tests],
diff --git a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
index c71b8ec..3bd7c5a 100644
--- a/debian/patches/0006-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0006-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 874f3ad..e367eff 100644
+index 88dbbb9..95d8513 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1541,7 +1541,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
+@@ -1470,7 +1470,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-Debian-Strip-Lintian-overrides-initramfs-related-stu.patch b/debian/patches/0007-Debian-Strip-Lintian-overrides-initramfs-related-stu.patch
new file mode 100644
index 0000000..3357deb
--- /dev/null
+++ b/debian/patches/0007-Debian-Strip-Lintian-overrides-initramfs-related-stu.patch
@@ -0,0 +1,22 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 22 Feb 2014 12:26:40 +0100
+Subject: Debian: Strip Lintian overrides,
+ initramfs-related stuff from appliance
+
+---
+ appliance/make.sh.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/appliance/make.sh.in b/appliance/make.sh.in
+index 5907b01..abfef14 100755
+--- a/appliance/make.sh.in
++++ b/appliance/make.sh.in
+@@ -51,6 +51,8 @@ grep -v '^/usr/share/doc/' |
+ grep -v '^/usr/share/info/' |
+ grep -v '^/usr/share/gnome/help/' |
+ grep -v '^/usr/share/cracklib/' |
++grep -v '^/usr/share/lintian/' |
++grep -v '^/\(usr/share\|etc\)/initramfs-tools/' |
+ grep -v '^/usr/share/i18n/' > supermin.d/hostfiles-t
+
+ # Include any Augeas lenses from the host.
diff --git a/debian/patches/series b/debian/patches/series
index bf8e6cf..20acac0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
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-Debian-Strip-Lintian-overrides-initramfs-related-stu.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