Package: aide
Version: 0.10-6.1
Severity: wishlist
Tags: patch

Hi,

the attached patch cleans up the dependency generation code:

  * debconf dependency is now generated by dh_installdebconf
    * this automatically adds "debconf | debconf-2.0" to the Depends
      line, no longer blocking cdebconf migration.
    * otoh, it creates an unclear debconf dependency which might break
      woody systems (but this is not a big issue any more after sarge's
      release)
 * the call to dpkg-gencontrol has been replaced again by dh_gencontrol,
   making the build process cleaner. The issue with dh_gencontrol
   insisting on mangling the args to dpkg-gencontrol has been worked
   around.

Please consider applying the patch.

Greetings
Marc

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12.2-zgsrv
Locale: LANG=C, LC_CTYPE=de_DE (charmap=ISO-8859-1)

Versions of packages aide depends on:
ii  debconf          1.4.52                  Debian configuration management sy
ii  libc6            2.3.2.ds1-22            GNU C Library: Shared libraries an
ii  mailx            1:8.1.2-0.20050715cvs-1 A simple mail user agent

Versions of packages aide recommends:
ii  cron                          3.0pl1-87  management of regular background p

-- debconf information:
* aide/aideinit: false
* aide/mustaideinit:
  aideinit/copynew: false
  aideinit/overwritenew: true
  aide/newlibdir: false
* aide/setmailaddress:
  aideinit/warnnew:
diff -u aide-0.10/debian/changelog aide-0.10/debian/changelog
--- aide-0.10/debian/changelog
+++ aide-0.10/debian/changelog
@@ -1,3 +1,9 @@
+aide (0.10-6.2) unstable; urgency=low
+
+  * re-work dependency generation stuff
+
+ -- Marc Haber <[EMAIL PROTECTED]>  Sun,  7 Aug 2005 14:14:56 +0000
+
 aide (0.10-6.1) unstable; urgency=low
 
   * Non-maintainer upload
diff -u aide-0.10/debian/control aide-0.10/debian/control
--- aide-0.10/debian/control
+++ aide-0.10/debian/control
@@ -8,7 +8,7 @@
 
 Package: aide
 Architecture: any
-Depends: ${Depends}, ${debconf-depends}, mailx
+Depends: ${libc-depends}, ${shlibs:Depends}, ${misc:Depends}, mailx
 Recommends: cron
 Description: Advanced Intrusion Detection Environment
  AIDE is an intrusion detection system that detects changes to files on
diff -u aide-0.10/debian/rules aide-0.10/debian/rules
--- aide-0.10/debian/rules
+++ aide-0.10/debian/rules
@@ -9,10 +9,8 @@
 # Figure out the po-debconf situation (thanks to Colin Watson)
 ifeq (,$(wildcard /usr/bin/po2debconf))
 PO2DEBCONF := no
-MINDEBCONFVER := 0.5
 else
 PO2DEBCONF := yes
-MINDEBCONFVER := 1.2.0
 endif
 
 build: build-stamp
@@ -84,11 +82,11 @@
        dh_compress
        dh_fixperms
        dh_installdeb
-       #dh_shlibdeps usr/bin/aide
-       # The above doesn't work as aide is statically-linked
-       # and here, debhelper insists on mangling the args to dpkg-gencontrol...
-       #dh_gencontrol -- -VDepends=$(LIBC)
-       dpkg-gencontrol -ldebian/changelog -isp -paide -Tdebian/substvars 
-Pdebian/aide -VDepends="$(LIBC)" -V'debconf-depends=debconf (>= 
$(MINDEBCONFVER))'
+       dh_shlibdeps usr/bin/aide
+       # aide is statically-linked, so dh_shlibdeps will always output the
+       # empty string. So we need to generate our library dependencies
+       # manually.
+       dh_gencontrol -- -V'libc-depends=$(LIBC)'
        dh_md5sums
        dh_builddeb
 

Reply via email to