[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.84-4-20-ge91a68e
Hilko Bengen
bengen at debian.org
Sat Jul 30 10:25:59 UTC 2011
The following commit has been merged in the master branch:
commit fea9a4ae295e58f9e52ba2b0e36a75e5ad047395
Author: Hilko Bengen <bengen at debian.org>
Date: Wed Jul 20 20:04:15 2011 +0200
remove generated debhelper logfile and old patch queue
diff --git a/debian/libguestfs1.debhelper.log b/debian/libguestfs1.debhelper.log
deleted file mode 100644
index fad8bc2..0000000
--- a/debian/libguestfs1.debhelper.log
+++ /dev/null
@@ -1,12 +0,0 @@
-dh_prep
-dh_installdirs
-dh_installchangelogs
-dh_installdocs
-dh_installexamples
-dh_install
-dh_installman
-dh_link
-dh_strip
-dh_compress
-dh_fixperms
-dh_installdeb
diff --git a/debian/patches/0001-Run-debirf-as-root.patch b/debian/patches/0001-Run-debirf-as-root.patch
deleted file mode 100644
index 69b8c47..0000000
--- a/debian/patches/0001-Run-debirf-as-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 20 Feb 2010 14:07:41 +0100
-Subject: [PATCH] Run debirf as root
-
-to work around #561991
----
- appliance/make.sh.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/appliance/make.sh.in b/appliance/make.sh.in
-index 515df34..84afee4 100755
---- a/appliance/make.sh.in
-+++ b/appliance/make.sh.in
-@@ -165,7 +165,7 @@ __EOF__
-
- elif [ "@DIST@" = "DEBIAN" ]; then
- cd @top_builddir@/appliance
-- debirf make -n debian
-+ debirf make -r -w -n debian
- mkdir -p @top_builddir@/initramfs
- touch @top_builddir@/initramfs/fakeroot.log
- fi
---
diff --git a/debian/patches/0002-scrub-now-available-on-Debian.patch b/debian/patches/0002-scrub-now-available-on-Debian.patch
deleted file mode 100644
index 63e71e0..0000000
--- a/debian/patches/0002-scrub-now-available-on-Debian.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sat, 20 Feb 2010 19:06:21 +0100
-Subject: [PATCH] scrub now available on Debian
-
----
- appliance/packagelist.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 7d790f0..8d9522f 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -23,7 +23,6 @@
- nilfs-utils
- ntfsprogs
- reiserfs-utils
-- scrub
- libselinux
- udev
- util-linux-ng
-@@ -62,6 +61,7 @@ ocfs2-tools
- */
- parted
- procps
-+scrub
- strace
- xfsprogs
- zerofree
---
diff --git a/debian/patches/0003-Adjust-error-output-for-regressions-rhbz557655.patch b/debian/patches/0003-Adjust-error-output-for-regressions-rhbz557655.patch
deleted file mode 100644
index 3b592c7..0000000
--- a/debian/patches/0003-Adjust-error-output-for-regressions-rhbz557655.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sun, 21 Feb 2010 11:52:44 +0100
-Subject: [PATCH] Adjust error output for regressions/rhbz557655
-
-to make the testsuite pass.
----
- regressions/rhbz557655-expected.stderr | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/regressions/rhbz557655-expected.stderr b/regressions/rhbz557655-expected.stderr
-index ea560e8..bc62baa 100644
---- a/regressions/rhbz557655-expected.stderr
-+++ b/regressions/rhbz557655-expected.stderr
-@@ -1,7 +1,7 @@
--set-memsize: memsize: integer out of range
--set-memsize: memsize: integer out of range
--set-memsize: memsize: integer out of range
--set-memsize: memsize: integer out of range
-+set-memsize: memsize: invalid integer parameter (xstrtol returned 1)
-+set-memsize: memsize: invalid integer parameter (xstrtol returned 1)
-+set-memsize: memsize: invalid integer parameter (xstrtol returned 1)
-+set-memsize: memsize: invalid integer parameter (xstrtol returned 1)
- set-memsize: memsize: invalid integer parameter (xstrtol returned 4)
- set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
- set-memsize: memsize: invalid integer parameter (xstrtol returned 2)
---
diff --git a/debian/patches/0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch b/debian/patches/0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
deleted file mode 100644
index fc5beab..0000000
--- a/debian/patches/0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sun, 21 Feb 2010 19:29:30 +0100
-Subject: [PATCH] Disable fuser tests if /dev/fuse doesn't exist
-
-e.g. when running in a chroot.
----
- fuse/test-fuse.sh | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
-index 2b4d0d7..b0b4a1e 100755
---- a/fuse/test-fuse.sh
-+++ b/fuse/test-fuse.sh
-@@ -45,6 +45,11 @@ if [ ! -x "$guestfish" -o ! -x "$guestmount" ]; then
- exit 1
- fi
-
-+if [ ! -c /dev/fuser ]; then
-+ echo "/dev/fuse does not exist skipping tests."
-+ exit 0
-+fi
-+
- # Ensure everything is cleaned up on exit.
- rm -f "$image"
- mkdir -p "$mp"
---
diff --git a/debian/patches/0005-Check-for-service-and-use-it-if-it-s-there.patch b/debian/patches/0005-Check-for-service-and-use-it-if-it-s-there.patch
deleted file mode 100644
index 70ab1d1..0000000
--- a/debian/patches/0005-Check-for-service-and-use-it-if-it-s-there.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 23 Feb 2010 18:49:34 +0100
-Subject: [PATCH] Check for service and use it if it's there
-
-Based on Richard's two patches for the Ubuntu build.
----
- appliance/init | 11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/appliance/init b/appliance/init
-index b741a49..84ee96e 100755
---- a/appliance/init
-+++ b/appliance/init
-@@ -8,9 +8,18 @@ mount -t proc /proc /proc
- mount -t sysfs /sys /sys
-
- if [ -x /etc/init.d/udev ]; then
-- /etc/init.d/udev start
-+ if type service >/dev/null 2>&1; then
-+ service udev start
-+ else
-+ /etc/init.d/udev start
-+ fi
- elif [ -x /sbin/start_udev ] && /sbin/start_udev; then
- :
-+elif [ -x /sbin/udevd ]; then
-+ echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-+ /sbin/udevd --daemon
-+ /sbin/udevadm trigger
-+ /sbin/udevadm settle --timeout=10
- else
- echo No udev, creating /dev manually
- mount -t tmpfs none /dev
---
diff --git a/debian/patches/0006-Check-for-grub-menu.lst-if-etc-grub.conf-can-t-be-fo.patch b/debian/patches/0006-Check-for-grub-menu.lst-if-etc-grub.conf-can-t-be-fo.patch
deleted file mode 100644
index 7cde055..0000000
--- a/debian/patches/0006-Check-for-grub-menu.lst-if-etc-grub.conf-can-t-be-fo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 23 Feb 2010 19:50:40 +0100
-Subject: [PATCH] Check for grub/menu.lst if /etc/grub.conf can't be found
-
----
- perl/lib/Sys/Guestfs/Lib.pm | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
-index e17728d..2864bfa 100644
---- a/perl/lib/Sys/Guestfs/Lib.pm
-+++ b/perl/lib/Sys/Guestfs/Lib.pm
-@@ -1525,6 +1525,12 @@ sub _check_for_kernels
- # For every kernel we find, inspect it and add to $os->{kernels}
-
- my $grub = _find_grub_prefix($g, $os);
-+ my $grub_conf = "/etc/grub.conf";
-+
-+ # Debian and other's have no /etc/grub.conf:
-+ if ( ! -f "$grub_conf" ) {
-+ $grub_conf = "$grub/grub/menu.lst";
-+ }
-
- my @boot_configs;
-
-@@ -1544,7 +1550,7 @@ sub _check_for_kernels
- my @configs = ();
- # Get all configurations from grub
- foreach my $bootable
-- ($g->aug_match("/files/etc/grub.conf/title"))
-+ ($g->aug_match("/files/$grub_conf/title"))
- {
- my %config = ();
- $config{title} = $g->aug_get($bootable);
-@@ -1617,7 +1623,7 @@ sub _check_for_kernels
-
- # Add the default configuration
- eval {
-- $boot{default} = $g->aug_get("/files/etc/grub.conf/default");
-+ $boot{default} = $g->aug_get("/files/$grub_conf/default");
- };
- if($@) {
- warn __"No grub default specified";
---
diff --git a/debian/patches/0007-Debina-package-format-is-called-deb-not-dpkg.patch b/debian/patches/0007-Debina-package-format-is-called-deb-not-dpkg.patch
deleted file mode 100644
index c4a235a..0000000
--- a/debian/patches/0007-Debina-package-format-is-called-deb-not-dpkg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 23 Feb 2010 21:04:37 +0100
-Subject: [PATCH] Debina package format is called 'deb' not 'dpkg'
-
----
- perl/lib/Sys/Guestfs/Lib.pm | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
-index 2864bfa..c7b5e7e 100644
---- a/perl/lib/Sys/Guestfs/Lib.pm
-+++ b/perl/lib/Sys/Guestfs/Lib.pm
-@@ -665,7 +665,7 @@ Operating system distribution. One of: "fedora", "rhel", "centos",
- =item package_format
-
- (For Linux root partitions only)
--The package format used by the guest distribution. One of: "rpm", "dpkg".
-+The package format used by the guest distribution. One of: "rpm", "deb".
-
- =item package_management
-
-@@ -869,7 +869,7 @@ sub _check_linux_root
- $r->{osdistro} = "redhat-based";
- }
- } elsif ($g->is_file ("/etc/debian_version")) {
-- $r->{package_format} = "dpkg";
-+ $r->{package_format} = "deb";
- $r->{package_management} = "apt";
-
- $_ = $g->cat ("/etc/debian_version");
---
diff --git a/debian/patches/0008-Add-application-listing-for-Debian.patch b/debian/patches/0008-Add-application-listing-for-Debian.patch
deleted file mode 100644
index 81ea293..0000000
--- a/debian/patches/0008-Add-application-listing-for-Debian.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 23 Feb 2010 21:05:02 +0100
-Subject: [PATCH] Add application listing for Debian
-
----
- perl/lib/Sys/Guestfs/Lib.pm | 17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
-index c7b5e7e..e8796ad 100644
---- a/perl/lib/Sys/Guestfs/Lib.pm
-+++ b/perl/lib/Sys/Guestfs/Lib.pm
-@@ -1453,6 +1453,23 @@ sub _check_for_applications
- push @apps, $app
- }
- }
-+ } elsif (defined $package_format && $package_format eq "deb") {
-+ my @lines = $g->command_lines
-+ (["dpkg-query",
-+ "-f", '${Package} ${Version} ${Architecture} ${Status}\n',
-+ "-W"]);
-+ foreach (@lines) {
-+ if (m/^(.*) (.*) (.*) (.*) (.*) (.*)$/) {
-+ if ( $6 eq "installed" ) {
-+ my $app = {
-+ name => $1,
-+ version => $2,
-+ arch => $3
-+ };
-+ push @apps, $app
-+ }
-+ }
-+ }
- }
- } elsif ($osn eq "windows") {
- # XXX
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a3b3927..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,8 +0,0 @@
-0001-Run-debirf-as-root.patch
-0002-scrub-now-available-on-Debian.patch
-0003-Adjust-error-output-for-regressions-rhbz557655.patch
-0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
-0005-Check-for-service-and-use-it-if-it-s-there.patch
-0006-Check-for-grub-menu.lst-if-etc-grub.conf-can-t-be-fo.patch
-0007-Debina-package-format-is-called-deb-not-dpkg.patch
-0008-Add-application-listing-for-Debian.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list