[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-31-g0319be4

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 0319be471fc5eb257c9c5c830d4290fa2a6b9629
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Aug 27 13:44:07 2011 -0700

    Fix compatibility links
    
    Patch from Peter Marschall
    
    * rename isc-dhcp-client.links to dhcp3-client.links
      Move the compatibility links for dhclient3 to package dhcp3-client;
      they are not needed in package isc-dhcp-client.
    * reverse source & destination of the links in dhcp3-client.links
      Necessary because of the changed setup of the packages.
    * add dh_link -a in debian/rules to generate the links
    
    This should fix bug #614992

diff --git a/debian/changelog b/debian/changelog
index 8d20f4a..08cc45e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,11 @@ isc-dhcp (4.2.2-1) unstable; urgency=low
     - allow passing additional options to dhcpd (closes: #613734)
     - read PID from config file
   * Add Catalan debconf template translation (closes: #628372)
+  * debian/isc-dhcp-client,dhcp3-client}.links: apply patch from Peter
+    Marschall to move old compatibility links to the old compatibility package
+    (closes: #614992)
 
- -- Andrew Pollock <apollock at debian.org>  Sat, 27 Aug 2011 13:37:22 -0700
+ -- Andrew Pollock <apollock at debian.org>  Sat, 27 Aug 2011 13:41:23 -0700
 
 isc-dhcp (4.1.1-P1-18) unstable; urgency=low
 
diff --git a/debian/dhcp3-client.links b/debian/dhcp3-client.links
new file mode 100644
index 0000000..637399d
--- /dev/null
+++ b/debian/dhcp3-client.links
@@ -0,0 +1,2 @@
+sbin/dhclient sbin/dhclient3
+usr/share/man/man8/dhclient.8.gz usr/share/man/man8/dhclient3.8.gz
diff --git a/debian/isc-dhcp-client.links b/debian/isc-dhcp-client.links
deleted file mode 100644
index 61c7ef6..0000000
--- a/debian/isc-dhcp-client.links
+++ /dev/null
@@ -1,2 +0,0 @@
-sbin/dhclient3 sbin/dhclient
-usr/share/man/man8/dhclient3.8.gz usr/share/man/man8/dhclient.8.gz

-- 
ISC DHCP packaging for Debian