Hi Jonas,

Ok, the previous version of uw-imapd had a broken build-dependency line that
ftp-master is now rejecting at upload time, so here is an updated patch
fixing this line.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u uw-imap-2002edebian1/debian/control.in.in uw-imap-2002edebian1/debian/control.in.in
--- uw-imap-2002edebian1/debian/control.in.in
+++ uw-imap-2002edebian1/debian/control.in.in
@@ -8,7 +8,7 @@
 Package: uw-imapd
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), netbase
+Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), update-inetd, inet-superserver
 Recommends: exim4 | mail-transport-agent
 Suggests: mutt | imap-client, logcheck
 Provides: imap-server
@@ -30,7 +30,7 @@
 Package: ipopd
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), netbase
+Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), update-inetd, inet-superserver
 Recommends: exim4 | mail-transport-agent
 Conflicts: imap (<< 4.4-1), pop3-server, pop2-server, logcheck (<< 1.1.1-9)
 Provides: pop3-server, pop2-server
diff -u uw-imap-2002edebian1/debian/__PKG__.postrm._in uw-imap-2002edebian1/debian/__PKG__.postrm._in
--- uw-imap-2002edebian1/debian/__PKG__.postrm._in
+++ uw-imap-2002edebian1/debian/__PKG__.postrm._in
@@ -6,10 +6,6 @@
 cert="__CERT__"	# basename of certificate
 daemonsets="__DAEMONSETS__"	# space-seperated list of colon-seperated list of port and binary name (or path if not /usr/sbin)
 
-# Source debconf library.
-. /usr/share/debconf/confmodule
-db_version 2.0
-
 ##
 ## Remove imapd from inetd.conf
 ##
@@ -21,21 +17,27 @@
 	UPDATE_INETD_ARG='--disable'
 fi
 
-db_get "$pkg/protocol"
-for debconf_entry in `echo "$RET" | tr ',' ' '`; do
-	seen=""
-	for daemonset in $daemonsets; do
-		service="`echo "$daemonset" | awk -F: '{ print $1 }'`"
-		if [ "$debconf_entry" = "$service" ]; then
-			update-inetd $UPDATE_INETD_ARG "${service}"
-			seen="yes"
-			break
+# Source debconf library.
+if [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	db_version 2.0
+	db_get "$pkg/protocol"
+	for debconf_entry in `echo "$RET" | tr ',' ' '`; do
+		seen=""
+		for daemonset in $daemonsets; do
+			service="`echo "$daemonset" | awk -F: '{ print $1 }'`"
+			if [ "$debconf_entry" = "$service" ]; then
+				update-inetd $UPDATE_INETD_ARG "${service}"
+				seen="yes"
+				break
+			fi
+		done
+		if [ "$seen" != "yes" ]; then
+			echo "WARNING: Unsupported debconf value \"$debconf_entry\" in \"$pkg/protocol\"" >/dev/stderr
 		fi
 	done
-	if [ "$seen" != "yes" ]; then
-		echo "WARNING: Unsupported debconf value \"$debconf_entry\" in \"$pkg/protocol\"" >/dev/stderr
-	fi
-done
+
+fi
 
 if [ "$1" = "purge" ] && [ -f /etc/ssl/certs/$cert.pem ]; then
 	echo "SSL certificate /etc/ssl/certs/$cert.pem is NOT removed."
diff -u uw-imap-2002edebian1/debian/control.in uw-imap-2002edebian1/debian/control.in
--- uw-imap-2002edebian1/debian/control.in
+++ uw-imap-2002edebian1/debian/control.in
@@ -8,7 +8,7 @@
 Package: uw-imapd
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), netbase
+Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), update-inetd, inet-superserver
 Recommends: exim4 | mail-transport-agent
 Suggests: mutt | imap-client, logcheck
 Provides: imap-server
@@ -30,7 +30,7 @@
 Package: ipopd
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), netbase
+Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), update-inetd, inet-superserver
 Recommends: exim4 | mail-transport-agent
 Conflicts: imap (<< 4.4-1), pop3-server, pop2-server, logcheck (<< 1.1.1-9)
 Provides: pop3-server, pop2-server
diff -u uw-imap-2002edebian1/debian/changelog uw-imap-2002edebian1/debian/changelog
--- uw-imap-2002edebian1/debian/changelog
+++ uw-imap-2002edebian1/debian/changelog
@@ -1,3 +1,14 @@
+uw-imap (7:2002edebian1-13.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Guard calls to debconf in the postrm so that package removal doesn't fail
+    if debconf was removed first.  Closes: #417138, #416780.
+  * Depend on update-inetd and inet-superserver now instead of netbase,
+    for the package split.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sat, 19 May 2007 15:38:38 -0700
+
 uw-imap (7:2002edebian1-13.1) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
diff -u uw-imap-2002edebian1/debian/control uw-imap-2002edebian1/debian/control
--- uw-imap-2002edebian1/debian/control
+++ uw-imap-2002edebian1/debian/control
@@ -3,12 +3,12 @@
 Section: mail
 Maintainer: Jonas Smedegaard <[EMAIL PROTECTED]>
 Standards-Version: 3.6.2
-Build-Depends: cdbs (>= 0.4.23-1.1), , debhelper (>= 4.1.0), debhelper (>= 4.1.16), po-debconf, patchutils (>= 0.2.25), dh-buildinfo, libpam-dev, libkrb5-dev, comerr-dev, libssl-dev, d-shlibs (>> 0.13), perl
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.16), po-debconf, patchutils (>= 0.2.25), dh-buildinfo, libpam-dev, libkrb5-dev, comerr-dev, libssl-dev, d-shlibs (>> 0.13), perl
 
 Package: uw-imapd
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), netbase
+Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), update-inetd, inet-superserver
 Recommends: exim4 | mail-transport-agent
 Suggests: mutt | imap-client, logcheck
 Provides: imap-server
@@ -30,7 +30,7 @@
 Package: ipopd
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), netbase
+Depends: ${shlibs:Depends}, ${debconf-depends}, openssl, libpam-runtime (>= 0.76-13.1), update-inetd, inet-superserver
 Recommends: exim4 | mail-transport-agent
 Conflicts: imap (<< 4.4-1), pop3-server, pop2-server, logcheck (<< 1.1.1-9)
 Provides: pop3-server, pop2-server

Reply via email to