Do not split off packages introducing new recommendations or suggestions.

* Merge collectd-hddtemp into collectd.
* Add hddtemp and mbmon to suggested packages.

diff --git a/debian/README.Debian b/debian/README.Debian
index 121b9188dd096f87d2534d98527f50df16b89446..d998eec290f6250299d2166a5a00367bad0d29ee 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,8 +5,8 @@ General notes:
 --------------
 
 - This package is split up into several packages to prevent you from having to
-  install dependencies (or recommended packages) that you don't actually need.
-  Any plugin that has dependencies other than libc gets its own package.
+  install dependencies that you don't actually need. Any plugin that has 
+  dependencies other than libc gets its own package.
 
 Configuring collectd:
 ---------------------

diff --git a/debian/changelog b/debian/changelog
index 1c72b2fc8eca0b8ba6ce29328179ae3054b2c019..6c748fdf95582b71a74e460e364b9c89b51d1a5e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,10 +7,13 @@ collectd (3.11.0-1) experimental; urgency=low
     - Motherboard monitor: mbmon
     - Multimeter statistics: multimeter (beta version)
   * Upload to experimental because of Etch freeze.
-  * New binary package collectd-dns.
+  * New binary package collectd-dns (linking against libpcap).
     - Added collectd-dns to suggested packages.
+  * Do not split off packages introducing new recommendations or suggestions.
+    - Merge collectd-hddtemp into collectd.
+    - Add hddtemp and mbmon to suggested packages.
 
- -- Sebastian Harl <sh@tokkee.org>  Sat, 23 Dec 2006 00:22:39 +0000
+ -- Sebastian Harl <sh@tokkee.org>  Sat, 23 Dec 2006 10:26:04 +0000
 
 collectd (3.10.4-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 2b5d3f39f6955dad6828376aebf64f07f0ee265c..41d3f7d2280aace380e8c2843fd780f3432951b9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,9 @@ Package: collectd
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: collectd-apache, collectd-mysql, collectd-sensors, collectd-dev,
- collectd-hddtemp, collectd-ping, collectd-dns, librrds-perl
+ collectd-ping, collectd-dns, librrds-perl, hddtemp, mbmon
+Provides: collectd-hddtemp
+Replaces: collectd-hddtemp
 Description: statistics collection daemon
  collectd is a small daemon written in C for performance. It reads various
  system statistics and updates RRD files, creating them if necessary. Since
@@ -27,6 +29,7 @@ Description: statistics collection daemon
    * disk space usage: df
    * disk and partition throughput: disk
    * E-Mail statistics (count, traffic, spam scores and checks): email
+   * harddisk temperature: hddtemp
    * system load averages: load
    * motherboard monitor: mbmon
    * memory usage: memory
@@ -39,7 +42,7 @@ Description: statistics collection daemon
    * tape drive usage: tape (server mode only)
    * network traffic: traffic
    * number of users logged into the system: users
-   * system ressources used by Linux-VServers: vserver
+   * system resources used by Linux-VServers: vserver
    * wireless network stats: wireless
 
 Package: collectd-dbg
@@ -47,8 +50,8 @@ Section: devel
 Architecture: any
 Priority: extra
 Depends: collectd (= ${Source-Version}), collectd-apache (= ${Source-Version}),
- collectd-hddtemp (= ${Source-Version}), collectd-mysql (= ${Source-Version}),
- collectd-ping (= ${Source-Version}), collectd-sensors (= ${Source-Version})
+ collectd-mysql (= ${Source-Version}), collectd-ping (= ${Source-Version}), 
+ collectd-sensors (= ${Source-Version})
 Description: statistics collection daemon (debugging symbols)
  collectd is a small daemon written in C for performance. It reads various
  system statistics and updates RRD files, creating them if necessary. Since
@@ -86,16 +89,9 @@ Description: statistics collection daemon (DNS plugin)
 
 Package: collectd-hddtemp
 Architecture: any
-Depends: collectd (= ${Source-Version}), ${shlibs:Depends}
-Recommends: hddtemp
-Description: statistics collection daemon (hddtemp plugin)
- collectd is a small daemon written in C for performance. It reads various
- system statistics and updates RRD files, creating them if necessary. Since
- the daemon doesn't need to startup every time it wants to update the files
- it's very fast and easy on the system. Also, the statistics are very fine
- grained since the files are updated every 10 seconds.
- .
- This package contains the hddtemp plugin which collects harddisk temperatures.
+Depends: collectd (= ${Source-Version})
+Description: statistics collection daemon (hddtemp plugin transitional package)
+ Empty package to facilitate upgrades. It can be safely removed.
 
 Package: collectd-mysql
 Architecture: any

diff --git a/debian/rules b/debian/rules
index f63df80d5f38abc95a35e126f9d438c88c61cd0f..4169dfa6c67669a08309e5d0a0d5ddea9465b8f1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ install-arch: build
        install -D -m 0644 $(CURDIR)/debian/collectd.conf \
                $(CURDIR)/debian/collectd/etc/collectd/collectd.conf
        
-       for PLUGIN in apache dns hddtemp mysql ping sensors; do \
+       for PLUGIN in apache dns mysql ping sensors; do \
                plugin_dir=$(CURDIR)/debian/collectd-$$PLUGIN/usr/lib/collectd/; \
                mkdir -p $$plugin_dir; \
                mv $(CURDIR)/debian/collectd/usr/lib/collectd/$$PLUGIN.so \