Package: acpi-support
Version: 0.137-3
Severity: normal
Tags: patch
The binaries 0.137-3 in debian archive do not have the problem. The
source 0.137-3 does. It is because the orig tarball contains a debian
subdir, breaking policy for source format 1.0.
$ apt-get source acpi-support
$ tar tzf acpi-support_0.137.orig.tar.gz | grep debian
debian/
debian/copyright
debian/rules
debian/dirs
debian/control
debian/acpi_fakekey.1
(...)
The Debian VCS in git://git.debian.org/git/pkg-acpi/acpi-support.git
does contain neither debian/ in tag upstream/0.137, nor
debian/acpi-support.manpages in tag debian/0.137-3.
The binaries may have been built using the VCS workspace, not the
upstream tarball. The generated debian diff assumes that the tarball
contains a debian subdir. Source downloaders get this parasite subdir
and do not build the same binaries than those in the archive. I guess
that rebuilding and reuploading with a modified upstream tarball
should solve [1],
Upgrading to source/format to 3.0 (quilt) is a better solution. The
new format states that dpkg should remove the debian subdir, if any,
between orig tarball decompression and debian diff application.
Better, dpkg respects this policy :-) (since 1.15.8, see #590297).
The attached patches do no need modifying the upstream tarball.
Concerning [2], I cannot reproduce it. dpkg detects that a file is
installed twice, even if installing both package at once. Detecting
such cases at build time with dh_installman/lintian seems redundant
(maintainer will test dpkg -i/piuparts), and difficult (think to a
single source producing two binary flavors, each containing exe/man
with the same name).
From 13cd3a5f9c793025017a030cdfc2bd6a10cf5312 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez Nicolas Boulenguez nicolas.bouleng...@free.fr
Date: Sat, 7 Aug 2010 10:36:08 +0200
Subject: [PATCH 1/4] Switched to source format 3.0 (quilt).
---
debian/changelog |7 +++
debian/rules |8 +++-
debian/source/format |2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4950842..30051ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+acpi-support (0.137-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Switched to source format 3.0 (quilt). (See #591815).
+
+ -- Nicolas Boulenguez nicolas.bouleng...@free.fr Sat, 07 Aug 2010 10:29:59
+0200
+
acpi-support (0.137-3) unstable; urgency=low
* Re-added lost brace to policy-funcs. (Closes: #587599)
diff --git a/debian/rules b/debian/rules
index 1b9b5de..6ed1000 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,18 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
-
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq ($(DEB_HOST_ARCH),i386)
arch-depends := -V'arch:Suggests=toshset'
endif
-clean: unpatch
+clean:
dh_testdir
dh_testroot
make clean
-rm -f acpi_fakekeyd
dh_clean
-build: patch build-stamp
+build: build-stamp
build-stamp:
make
@@ -51,5 +49,5 @@ binary-arch: dhclean install
dh_gencontrol -- $(arch-depends)
dh_md5sums
dh_builddeb
-
+
binary: binary-arch binary-indep
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.1
From 15e973d996b9eb1fec8d1590e7d26e0e5135e3ac Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez Nicolas Boulenguez nicolas.bouleng...@free.fr
Date: Sat, 7 Aug 2010 11:37:33 +0200
Subject: [PATCH 2/4] Refreshed all quilt patches to make them dpkg-source
compatible.
---
debian/patches/ac.diff |6 --
debian/patches/acpi_fakekey.diff | 22 +-
debian/patches/asus-brightness-down.diff |6 --
debian/patches/asus-brn-up.sh.diff |6 --
debian/patches/asus-touchpad.sh-led.diff |6 --
debian/patches/asus-touchpad.sh.diff |6 --
debian/patches/asus-wireless.sh.diff |6 --
debian/patches/battery.diff |6 --
debian/patches/blank_no_user.diff|6 --
debian/patches/dmi.diff | 12
debian/patches/dpms.diff | 18 --
debian/patches/full-path.diff|8 +---
debian/patches/hibernate.sh.diff |7 ---
debian/patches/ibm.diff |6 --
debian/patches/lid.sh.diff |6 --
debian/patches/policy-funcs-grep.diff| 10 ++
debian/patches/policy-funcs.diff |6 --
debian/patches/power-funcs.diff | 13 +++--
debian/patches/screenblank.diff |6 --
debian/patches/sleep.sh.diff |7 ---
debian/patches/sleepbtn.sh.diff |6 --
debian/patches/state-funcs.diff |6 --
