debian/changelog | 17 +++++++
debian/compat | 2
debian/control | 9 +++
debian/libpciaccess-dev.install | 6 +-
debian/libpciaccess0-udeb.install | 2
debian/libpciaccess0.install | 2
debian/rules | 86 ++++----------------------------------
debian/source.lintian-overrides | 1
src/linux_sysfs.c | 10 +++-
9 files changed, 49 insertions(+), 86 deletions(-)
New commits:
commit a812f8521fb5225b2d61c332af635c6166cfd24e
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Sep 22 21:53:27 2011 +0200
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index b79b5be..4e15262 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ libpciaccess (0.12.1-2) unstable; urgency=low
[ Christopher James Halse Rogers ]
* Switch to dh.
- * Switch to debhelper compat 9 and build multiarch libraries.
+ * Switch to debhelper compat 9 and build multiarch libraries (closes:
+ #635251).
* Add lintian override for not-yet-finalised debhelper compat level.
* Bump standards version to 3.9.2 (no changes).
commit 4f781e5dd9e3f13184cd3dcee0ff87f481816824
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Sep 22 21:45:42 2011 +0200
Don't pass --build=foo twice to configure
dh_auto_configure does it for us.
diff --git a/debian/rules b/debian/rules
index aa0298e..fd898e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,15 +13,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
%:
dh $@ --with autoreconf --builddirectory=build/
@@ -29,7 +20,6 @@ override_dh_auto_configure:
dh_auto_configure -- \
--with-pciids-path=\$${prefix}/share/misc \
--with-zlib \
- $(confflags) \
CFLAGS="$(CFLAGS)"
override_dh_install:
commit 950b6e49fbef68bd4537a8abaa2f768f9abb0581
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Sep 22 21:38:04 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5920cd9..b79b5be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libpciaccess (0.12.1-2) UNRELEASED; urgency=low
+libpciaccess (0.12.1-2) unstable; urgency=low
[ Christopher James Halse Rogers ]
* Switch to dh.
@@ -12,7 +12,7 @@ libpciaccess (0.12.1-2) UNRELEASED; urgency=low
- fix a crash in populate_entries if scandir(/sys/bus/pci) returns an
error
- -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 08 Aug 2011
12:41:42 +1000
+ -- Julien Cristau <jcris...@debian.org> Thu, 22 Sep 2011 21:37:55 +0200
libpciaccess (0.12.1-1) unstable; urgency=low
commit bce4a0ae3599d4bf6a332cf1b395555a1fae421d
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Sep 22 21:37:04 2011 +0200
Document cherry-picks
diff --git a/debian/changelog b/debian/changelog
index eec320e..5920cd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
libpciaccess (0.12.1-2) UNRELEASED; urgency=low
+ [ Christopher James Halse Rogers ]
* Switch to dh.
* Switch to debhelper compat 9 and build multiarch libraries.
* Add lintian override for not-yet-finalised debhelper compat level.
* Bump standards version to 3.9.2 (no changes).
+ [ Julien Cristau ]
+ * Cherry-pick a couple patches from upstream git to:
+ - not return garbage from read/write on eof
+ - fix a crash in populate_entries if scandir(/sys/bus/pci) returns an
+ error
+
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 08 Aug 2011
12:41:42 +1000
libpciaccess (0.12.1-1) unstable; urgency=low
commit ac2a4e4f3dc9ea1f1c4a75109f8101c449f382b4
Author: Adam Jackson <a...@redhat.com>
Date: Wed Aug 3 18:35:11 2011 -0400
linux: Fix a crash in populate_devices
If scandir returns -1, the 'devices' array won't be initialized, and
attempting to free() it will crash.
Signed-off-by: Adam Jackson <a...@redhat.com>
(cherry picked from commit 7bfc4f806d51b85e7ae069dd6deaf0b48326ed22)
diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
index bbd4dfa..2085ffb 100644
--- a/src/linux_sysfs.c
+++ b/src/linux_sysfs.c
@@ -122,7 +122,7 @@ scan_sys_pci_filter( const struct dirent * d )
int
populate_entries( struct pci_system * p )
{
- struct dirent ** devices;
+ struct dirent ** devices = NULL;
int n;
int i;
int err = 0;
commit d4cef3710e4fd998df3642631bb542dae2aa728c
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Sat Jun 4 12:30:06 2011 +0100
linux: Only set errno after an error
errno is only valid after an error, and was being filled with a garbage
value upon eof.
Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
(cherry picked from commit f9159b97834ba4b4e42a07953a33866e7ac90dbd)
diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
index 1832ee7..bbd4dfa 100644
--- a/src/linux_sysfs.c
+++ b/src/linux_sysfs.c
@@ -387,7 +387,9 @@ pci_device_linux_sysfs_read( struct pci_device * dev, void
* data,
/* If zero bytes were read, then we assume it's the end of the
* config file.
*/
- if ( bytes <= 0 ) {
+ if (bytes == 0)
+ break;
+ if ( bytes < 0 ) {
err = errno;
break;
}
@@ -445,7 +447,9 @@ pci_device_linux_sysfs_write( struct pci_device * dev,
const void * data,
/* If zero bytes were written, then we assume it's the end of the
* config file.
*/
- if ( bytes <= 0 ) {
+ if ( bytes == 0 )
+ break;
+ if ( bytes < 0 ) {
err = errno;
break;
}
commit 396f12467d2b6f9db6046109f654a6eb0ebf6a0f
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Mon Aug 29 18:16:13 2011 +1000
Mark libpciacces-dev as Multi-Arch: same also
diff --git a/debian/control b/debian/control
index 2a5367c..f9ae560 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,8 @@ Description: Generic PCI access library for X
Package: libpciaccess-dev
Section: libdevel
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Depends: libpciaccess0 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Description: Generic PCI access library for X - development files
Provides functionality for X to access the PCI bus and devices
commit 8d5d28a71feb352574a22598487ef47ba7906ebf
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Mon Aug 8 15:40:09 2011 +1000
Switch to compat 9 for easy multiarch
diff --git a/debian/changelog b/debian/changelog
index b00d1e9..eec320e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libpciaccess (0.12.1-2) UNRELEASED; urgency=low
- * Switch to dh and compat 7.
+ * Switch to dh.
+ * Switch to debhelper compat 9 and build multiarch libraries.
+ * Add lintian override for not-yet-finalised debhelper compat level.
* Bump standards version to 3.9.2 (no changes).
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 08 Aug 2011
12:41:42 +1000
diff --git a/debian/compat b/debian/compat
index c793025..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
\ No newline at end of file
+9
diff --git a/debian/control b/debian/control
index 7c30152..2a5367c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1.3),
libtool,
automake,
zlib1g-dev,
@@ -20,6 +20,8 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: pciutils
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Generic PCI access library for X
Provides functionality for X to access the PCI bus and devices
in a platform-independant way.
diff --git a/debian/libpciaccess-dev.install b/debian/libpciaccess-dev.install
index 4797855..304f643 100644
--- a/debian/libpciaccess-dev.install
+++ b/debian/libpciaccess-dev.install
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/pkgconfig
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
usr/include
diff --git a/debian/libpciaccess0-udeb.install
b/debian/libpciaccess0-udeb.install
index 413fe77..16d2f19 100644
--- a/debian/libpciaccess0-udeb.install
+++ b/debian/libpciaccess0-udeb.install
@@ -1 +1 @@
-usr/lib/libpciaccess.so.0*
+usr/lib/*/libpciaccess.so.0* usr/lib
diff --git a/debian/libpciaccess0.install b/debian/libpciaccess0.install
index 413fe77..782ff72 100644
--- a/debian/libpciaccess0.install
+++ b/debian/libpciaccess0.install
@@ -1 +1 @@
-usr/lib/libpciaccess.so.0*
+usr/lib/*/libpciaccess.so.0*
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..b27fbac
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1 @@
+source: package-needs-versioned-debhelper-build-depends 9
commit 0b100bef8fccb4ce362f6b1a29c2789b775c41a0
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Mon Aug 8 15:38:23 2011 +1000
Bump standards version; no changes needed
diff --git a/debian/changelog b/debian/changelog
index fa66c2c..b00d1e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libpciaccess (0.12.1-2) UNRELEASED; urgency=low
* Switch to dh and compat 7.
+ * Bump standards version to 3.9.2 (no changes).
-- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 08 Aug 2011
12:41:42 +1000
diff --git a/debian/control b/debian/control
index 19ee278..7c30152 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
xutils-dev (>= 1:7.5),
pkg-config,
dh-autoreconf,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libpciaccess
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libpciaccess.git
commit d7c5c5d8f6e11a2930518a80a76ec12645d4572d
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Mon Aug 8 13:15:54 2011 +1000
Switch to dh and compat 7.
Also kill the *.la files, and dh_install --fail-missing.
diff --git a/debian/changelog b/debian/changelog
index a9758b3..fa66c2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libpciaccess (0.12.1-2) UNRELEASED; urgency=low
+
+ * Switch to dh and compat 7.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 08 Aug 2011
12:41:42 +1000
+
libpciaccess (0.12.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..c793025 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 0ac632b..19ee278 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,13 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 7.0.50~),
libtool,
automake,
zlib1g-dev,
xutils-dev (>= 1:7.5),
pkg-config,
+ dh-autoreconf,
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libpciaccess
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libpciaccess.git
diff --git a/debian/rules b/debian/rules
index 9d64d5a..aa0298e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,73 +22,19 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-configure:
- autoreconf -vfi
+%:
+ dh $@ --with autoreconf --builddirectory=build/
-build/config.status: configure
- mkdir -p build
- cd build && \
- ../configure \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-pciids-path=\$${prefix}/share/misc \
- --with-zlib \
- $(confflags) \
- CFLAGS="$(CFLAGS)"
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --with-pciids-path=\$${prefix}/share/misc \
+ --with-zlib \
+ $(confflags) \
+ CFLAGS="$(CFLAGS)"
-build: build-stamp
-build-stamp: build/config.status
- dh_testdir
- cd build && $(MAKE)
- >$@
+override_dh_install:
+ find debian/tmp -type f -name *.la -delete
+ dh_install --fail-missing
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build
- find -name Makefile.in -delete
- rm -f compile config.guess config.sub configure depcomp install-sh
- rm -f ltmain.sh missing INSTALL aclocal.m4 mkinstalldirs config.h.in
- rm -f m4/libtool.m4 m4/lt*.m4
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Install architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-
- dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip #--dbg-package=$(PACKAGE)-dbg
- dh_compress
- dh_fixperms
+override_dh_makeshlibs:
dh_makeshlibs -V'libpciaccess0 (>= 0.11.0)' --add-udeb=$(PACKAGE)-udeb
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r6prh-0001oy...@vasks.debian.org
