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

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-04-01 13:20:47 +0000 (Sat, 01 Apr 2006)
New Revision: 773

Removed:
   packages/unstable/dhcdbd/debian/patches/03.dhcdbd.service.patch
Modified:
   packages/unstable/dhcdbd/debian/patches/02_makefile.patch
Log:
Merge 03.dhcdbd.service.patch into 02_makefile.patch


Modified: packages/unstable/dhcdbd/debian/patches/02_makefile.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/02_makefile.patch	2006-04-01 12:55:22 UTC (rev 772)
+++ packages/unstable/dhcdbd/debian/patches/02_makefile.patch	2006-04-01 13:20:47 UTC (rev 773)
@@ -14,7 +14,14 @@
 -		chown root:root $(DESTDIR)/sbin/dhcdbd;	\
 -	        chmod 6755      $(DESTDIR)/sbin/dhcdbd;	\
 +		chown root:root $(DESTDIR)/usr/sbin/dhcdbd;	\
-+	        chmod 6755      $(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/03.dhcdbd.service.patch
===================================================================
--- packages/unstable/dhcdbd/debian/patches/03.dhcdbd.service.patch	2006-04-01 12:55:22 UTC (rev 772)
+++ packages/unstable/dhcdbd/debian/patches/03.dhcdbd.service.patch	2006-04-01 13:20:47 UTC (rev 773)
@@ -1,7 +0,0 @@
---- 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