Here it is

-- 


diff -Nru pciutils-2.1.11/debian/changelog pciutils-2.1.11.new/debian/changelog
--- pciutils-2.1.11/debian/changelog    2005-12-03 12:16:39.348856813 +0100
+++ pciutils-2.1.11.new/debian/changelog        2005-12-03 12:05:46.471895831 
+0100
@@ -1,3 +1,21 @@
+pciutils (1:2.1.11-15.2) unstable; urgency=low
+
+  [ Christian Perrier ]
+  * Non-maintainer upload to add a udeb providing lspci for d-i purposes
+    Closes: #284110
+
+  [ Colin Watson ]
+  * Changes merged from Ubuntu patches:
+    - Add pciutils-udeb, for use in the installer. Contains only lspci,
+      libpci.so.2, and pci.ids.
+    - Reduce pciutils-udeb's copy of pci.ids by over 100KB by removing
+      subsystem ids, which I don't think we need in the installer, and
+      comments.
+    - Move pciutils-udeb's copy of libpci.so.2 to /lib; it seems to confuse
+      mklibs less that way.
+
+ -- Christian Perrier <[EMAIL PROTECTED]>  Sat,  3 Dec 2005 08:16:54 +0100
+
 pciutils (1:2.1.11-15.1) unstable; urgency=low
 
   * NMU durring BSP
diff -Nru pciutils-2.1.11/debian/control pciutils-2.1.11.new/debian/control
--- pciutils-2.1.11/debian/control      2005-12-03 12:16:39.352856005 +0100
+++ pciutils-2.1.11.new/debian/control  2005-12-03 08:18:08.926539234 +0100
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Remco van de Meent <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 2.0.0), bzip2
+Build-Depends: debhelper (>> 4.2.0), bzip2
 Standards-Version: 3.6.1
 
 Package: pciutils
@@ -24,3 +24,13 @@
  This package contains the <pci/pci.h>, <pci/config.h> and <pci/header.h>
  header files, as well as the /usr/lib/libpci.a library.
 
+Package: pciutils-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Linux PCI Utilities (udeb)
+ This package contains various utilities for inspecting and setting of
+ devices connected to the PCI bus. 
+ .
+ This is a minimal version for use in debian-installer.
diff -Nru pciutils-2.1.11/debian/pciutils-udeb.dirs 
pciutils-2.1.11.new/debian/pciutils-udeb.dirs
--- pciutils-2.1.11/debian/pciutils-udeb.dirs   1970-01-01 01:00:00.000000000 
+0100
+++ pciutils-2.1.11.new/debian/pciutils-udeb.dirs       2005-12-03 
08:14:36.965505659 +0100
@@ -0,0 +1,3 @@
+usr/share/misc
+usr/bin
+lib
diff -Nru pciutils-2.1.11/debian/pciutils-udeb.shlibs.local 
pciutils-2.1.11.new/debian/pciutils-udeb.shlibs.local
--- pciutils-2.1.11/debian/pciutils-udeb.shlibs.local   1970-01-01 
01:00:00.000000000 +0100
+++ pciutils-2.1.11.new/debian/pciutils-udeb.shlibs.local       2005-12-03 
08:14:36.966505456 +0100
@@ -0,0 +1 @@
+libpci 2
diff -Nru pciutils-2.1.11/debian/rules pciutils-2.1.11.new/debian/rules
--- pciutils-2.1.11/debian/rules        2005-12-03 12:16:39.352856005 +0100
+++ pciutils-2.1.11.new/debian/rules    2005-12-03 08:14:36.965505659 +0100
@@ -32,7 +32,7 @@
        dh_testdir
        dh_testroot
        dh_clean -k
-       dh_installdirs
+       dh_installdirs -a
 
        # get pci.ids
        # make update-ids  only by maintainer
@@ -57,6 +57,13 @@
        #mv `pwd`/debian/tmp/usr/lib/libpci.so.2 `pwd`/debian/libpci2/usr/lib/
        (cd `pwd`/debian/tmp/usr/lib; ln -s libpci.so.2 libpci.so)
 
+       # pciutils-udeb
+       install -m 755 lspci debian/pciutils-udeb/usr/bin/
+       install -m 644 lib/libpci.so.2 debian/pciutils-udeb/lib/
+       # Reduce by removing subsystem ids and comments.
+       perl -ne 'print unless /^(#|\t\t)/' < pci.ids > 
debian/pciutils-udeb/usr/share/misc/pci.ids
+       chmod 644 debian/pciutils-udeb/usr/share/misc/pci.ids
+
        dh_installdocs
        dh_installexamples lib/example.c
        dh_installmenu
@@ -64,14 +71,15 @@
        dh_installchangelogs -a ChangeLog
        (cd debian/pciutils-dev/usr/share/doc && rm -rf pciutils-dev && ln -sf 
pciutils pciutils-dev)
        cp debian/lintian debian/tmp/usr/share/lintian/overrides/pciutils
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps debian/tmp/usr/bin/lspci debian/tmp/usr/bin/setpci
-       dh_gencontrol
-       dh_md5sums
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_makeshlibs -a
+       dh_installdeb -a
+       dh_shlibdeps -Npciutils-udeb
+       dh_shlibdeps -ppciutils-udeb -ldebian/pciutils-udeb/usr/lib -- 
-Ldebian/pciutils-udeb.shlibs.local
+       dh_gencontrol -a
+       dh_md5sums -a
        dh_builddeb -a
 
 source diff:                                                                  

Reply via email to