[Pkg-utopia-commits] r774 - packages/unstable/dhcdbd/debian/patches

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-04-01 13:23:13 +0000 (Sat, 01 Apr 2006)
New Revision: 774

Added:
   packages/unstable/dhcdbd/debian/patches/01-debian_specific_paths.patch
   packages/unstable/dhcdbd/debian/patches/02-dhcdbd_location.patch
   packages/unstable/dhcdbd/debian/patches/03-remove_extended_options_from_dhcdbd.patch
   packages/unstable/dhcdbd/debian/patches/04-dhcdbd_conf_netdev_group.patch
Removed:
   packages/unstable/dhcdbd/debian/patches/01_fix_some_debian_path.patch
   packages/unstable/dhcdbd/debian/patches/02_makefile.patch
   packages/unstable/dhcdbd/debian/patches/02_remove_exetended_options_from_dhcdbd.patch
   packages/unstable/dhcdbd/debian/patches/03_dhcdbd.conf.patch
Log:
Choose better names for the patches and make the naming more consistent.


Copied: packages/unstable/dhcdbd/debian/patches/01-debian_specific_paths.patch (from rev 772, packages/unstable/dhcdbd/debian/patches/01_fix_some_debian_path.patch)

Deleted: packages/unstable/dhcdbd/debian/patches/01_fix_some_debian_path.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/01_fix_some_debian_path.patch	2006-04-01 13:20:47 UTC (rev 773)
+++ packages/unstable/dhcdbd/debian/patches/01_fix_some_debian_path.patch	2006-04-01 13:23:13 UTC (rev 774)
@@ -1,24 +0,0 @@
---- dhcdbd.new	2006-01-11 21:44:38.000000000 +0100
-+++ dhcdbd.h	2005-11-17 03:36:00.000000000 +0100
-@@ -31,10 +31,10 @@
- #define DHCDBD_DHCLIENT_BIN     "/sbin/dhclient"
- #endif
- #ifndef DHCDBD_DHCLIENT_LEASE_DIR
-+#define DHCDBD_DHCLIENT_LEASE_DIR "/var/lib/dhcp3/"
--#define DHCDBD_DHCLIENT_LEASE_DIR "/var/lib/dhclient/"
- #endif
- #ifndef DHCDBD_DHCLIENT_LEASE_PFX
-+#define DHCDBD_DHCLIENT_LEASE_PFX "dhclient."
--#define DHCDBD_DHCLIENT_LEASE_PFX "dhclient-"
- #endif
- #ifndef DHCDBD_DHCLIENT_LEASE_SFX
- #define DHCDBD_DHCLIENT_LEASE_SFX ".leases"
-@@ -43,7 +43,7 @@
- #define DHCDBD_PID_FILE           "/var/run/dhcdbd.pid"
- #endif
- #ifndef DHCDBD_DHCLIENT_PID_PFX
-+#define DHCDBD_DHCLIENT_PID_PFX   "/var/run/dhclient."
--#define DHCDBD_DHCLIENT_PID_PFX   "/var/run/dhclient-"
- #endif
- #ifndef DHCDBD_DHCLIENT_PID_SFX
- #define DHCDBD_DHCLIENT_PID_SFX   ".pid"

Copied: packages/unstable/dhcdbd/debian/patches/02-dhcdbd_location.patch (from rev 773, packages/unstable/dhcdbd/debian/patches/02_makefile.patch)

Deleted: packages/unstable/dhcdbd/debian/patches/02_makefile.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/02_makefile.patch	2006-04-01 13:20:47 UTC (rev 773)
+++ packages/unstable/dhcdbd/debian/patches/02_makefile.patch	2006-04-01 13:23:13 UTC (rev 774)
@@ -1,27 +0,0 @@
---- Makefile	2005-11-17 03:36:00.000000000 +0100
-+++ Makefile.new	2006-01-23 17:44:48.000000000 +0100
-@@ -42,13 +42,13 @@
- 	if [ -d RedHat ]; then  cd RedHat; make clean; fi;
- 
- install:
--	mkdir -p        $(DESTDIR)/sbin
-+	mkdir -p        $(DESTDIR)/usr/sbin
- 	mkdir -p        $(DESTDIR)/usr/share/dbus-1/services
- 	mkdir -p        $(DESTDIR)/etc/dbus-1/system.d
--	cp -fp dhcdbd   $(DESTDIR)/sbin
-+	cp -fp dhcdbd   $(DESTDIR)/usr/sbin
- 	if [ `whoami` = 'root' ]; then \
--		chown root:root $(DESTDIR)/sbin/dhcdbd;	\
--	        chmod 6755      $(DESTDIR)/sbin/dhcdbd;	\
-+		chown root:root $(DESTDIR)/usr/sbin/dhcdbd;	\
-+	        chmod 6755      $(DESTDIR)/usr/sbin/dhcdbd;	\
-         fi;
- 	cp -fp system.d/dhcdbd.conf   $(DESTDIR)/etc/dbus-1/system.d
- 	cp -fp service/dhcdbd.service $(DESTDIR)/usr/share/dbus-1/services
---- service/dhcdbd.service	2005-11-17 03:36:00.000000000 +0100
-+++ service/dhcdbd.service.new	2006-01-23 17:43:27.000000000 +0100
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=com.redhat.dhcp
--Exec=/sbin/dhcdbd
-+Exec=/usr/sbin/dhcdbd

Deleted: packages/unstable/dhcdbd/debian/patches/02_remove_exetended_options_from_dhcdbd.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/02_remove_exetended_options_from_dhcdbd.patch	2006-04-01 13:20:47 UTC (rev 773)
+++ packages/unstable/dhcdbd/debian/patches/02_remove_exetended_options_from_dhcdbd.patch	2006-04-01 13:23:13 UTC (rev 774)
@@ -1,11 +0,0 @@
---- dhcdbd.h	2006-01-13 21:25:33.000000000 +0100
-+++ dhcdbd.h.new	2006-01-13 21:25:16.000000000 +0100
-@@ -58,7 +58,7 @@
- #define DHCDBD_DHCLIENT_CONF_SFX  ".conf"
- #endif
- #ifndef DHCLIENT_EXTENDED_OPTION_ENVIRONMENT
--#define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 1
-+#define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 0
- #endif
- 
- #define DHCDBD_INTERFACE_TEXT   "text"   

Copied: packages/unstable/dhcdbd/debian/patches/03-remove_extended_options_from_dhcdbd.patch (from rev 772, packages/unstable/dhcdbd/debian/patches/02_remove_exetended_options_from_dhcdbd.patch)

Deleted: packages/unstable/dhcdbd/debian/patches/03_dhcdbd.conf.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/03_dhcdbd.conf.patch	2006-04-01 13:20:47 UTC (rev 773)
+++ packages/unstable/dhcdbd/debian/patches/03_dhcdbd.conf.patch	2006-04-01 13:23:13 UTC (rev 774)
@@ -1,11 +0,0 @@
---- system.d/dhcdbd.conf	2005-11-17 03:36:00.000000000 +0100
-+++ system.d/dhcdbd.conf.new	2006-02-09 20:29:22.000000000 +0100
-@@ -7,7 +7,7 @@
- 	    <allow send_interface="com.redhat.dhcp"/>
- 	    <allow send_destination="com.redhat.dhcp"/>
-     </policy>
--    <policy user="named">
-+    <policy group="netdev">
-             <allow send_interface="com.redhat.dhcp"/>
-             <allow send_destination="com.redhat.dhcp"/>
-     </policy>

Copied: packages/unstable/dhcdbd/debian/patches/04-dhcdbd_conf_netdev_group.patch (from rev 772, packages/unstable/dhcdbd/debian/patches/03_dhcdbd.conf.patch)