patch for control and discover.postinst

[Gaudenz Steinlin <gaudenz@soziologie.ch>]

Hi

Here are two more patches for the discover packaging:

postinst.patch
- redirect output of update-rc.d to /dev/null as suggested by lintian

control.patch
- remove unneeded libdiscover2-pic
- rename discover-udeb to discover2-udeb
- change maintainer to discover-workers
- add myself to uploaders (you can probably change this if you do the 
  upload yourself)
- some minor changes to the package descriptions
- priority of discover2-udeb should be optional until it is the standard
  (please keep this setting!)

Gaudenz

--- discover-progeny/discover-2.0.2/debian/control	2004-01-31 20:36:19.000000000 +0100
+++ discover-2.0.2/debian/control	2004-02-02 20:28:19.925899536 +0100
@@ -1,16 +1,16 @@
 Source: discover
 Section: admin
 Priority: optional
-Maintainer: Progeny Debian Packaging Team <debian-packages@progeny.com>
-Uploaders: Branden Robinson <branden@progeny.com>
-Build-Depends: debhelper (>> 3.0), libcurl2-dev | libcurl-dev, libexpat1-dev, kernel-headers-2.4.20-386 | kernel-headers, autoconf, libtool, doxygen, opensp, sgml-data, docbook-xml, xsltproc, ldp-docbook-xsl, links, docbook-to-man, libxml2 (<< 2.5.7-1) | libxml2-utils (>= 2.5.7-1)
+Maintainer: Discover Workers <discover-workers@lists.progeny.com>
+Uploaders: Gaudenz Steinlin <gaudenz@soziologie.ch>
+Build-Depends: debhelper (>> 3.0), libcurl2-dev | libcurl-dev, libexpat1-dev, autoconf, libtool, doxygen, opensp, sgml-data, docbook-xml, xsltproc, ldp-docbook-xsl, links, docbook-to-man, libxml2-utils (>= 2.5.7-1) | libxml2 (<< 2.5.7-1) 
 Standards-Version: 3.5.8
 
 Package: discover
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: hardware identification system
- Discover is a hardware identification system based on the libdiscover
+ Discover is a hardware identification system based on the libdiscover2
  library.  Discover provides a flexible interface that programs can
  use to report a wide range of information about the hardware that is
  installed on a Linux system.  In addition to reporting information,
@@ -38,35 +38,19 @@
  This package contains the header files and static libraries needed for
  development.
 
-Package: libdiscover2-pic
-Section: libs
-Priority: extra
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libdiscover1-pic
-Description: hardware identification library - static PIC version
- libdiscover is a library enabling identification of various PCI,
- PCMCIA, and USB devices.
- .
- This package contains a static version of the library containing
- position-independent code, used to develop subsets of the discover shared
- library for use on custom installation disks and in embedded systems.
- Unless you're making one of those, you won't need this package.
-
-Package: discover-udeb
+Package: discover2-udeb
 Section: debian-installer
-Priority: standard
+Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, discover-data-udeb
+Depends: ${shlibs:Depends}, discover2-data-udeb
+Provides: discover-udeb
+Conflicts: discover-udeb
 Description: hardware identification system (udeb)
- Discover is a hardware identification system based on the libdiscover1
+ Discover is a hardware identification system based on the libdiscover2
  library.  Discover provides a flexible interface that programs can use to
  report a wide range of information about the hardware that is installed on a
  Linux system.  In addition to reporting information, discover includes
- support for doing hardware detection at boot time.  Detection occurs in two
- stages: The first stage, which runs from an initial ramdisk (initrd), loads
- just the drivers needed to mount the root file system, and the second stage
- loads the rest (ethernet cards, sound cards, etc.).
+ support for doing hardware detection at boot time. 
  .
  This contains the udeb, which is used for the debian-installer
  installation system.  It won't work well on a normal debian system.

--- discover-progeny/discover-2.0.2/debian/discover.postinst	2004-01-31 20:36:20.000000000 +0100
+++ discover-2.0.2/debian/discover.postinst	2004-01-31 18:41:06.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Progeny: discover.postinst 3839 2003-11-17 04:25:01Z dsp $
+# $Progeny$
 
 # Copyright 2000, 2001, 2002 Progeny Linux Systems, Inc.
 #
@@ -52,11 +52,11 @@
   if [ -n "$2" ]; then
     if dpkg --compare-versions "$2" le "1.5"; then
       # get rid of symlinks at wrong, old priority
-      update-rc.d -f discover remove
+      update-rc.d -f discover remove > /dev/null
     fi
   fi
   # register the init script
-  update-rc.d discover start 36 S .
+  update-rc.d discover start 36 S . > /dev/null
   # run the init script (failure is not harmful to package configuration)
   /etc/init.d/discover start || true
 fi