[Debian-olpc-commits] r7 - in trunk/debian: . patches

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-06-24 19:47:33 +0000 (Tue, 24 Jun 2008)
New Revision: 7

Added:
   trunk/debian/patches/
   trunk/debian/patches/00list
   trunk/debian/patches/correct_initd_dir.dpatch
   trunk/debian/patches/correct_initscript_arguments.dpatch
Modified:
   trunk/debian/control
   trunk/debian/rules
Log:
use dpatch to patch the source


Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2008-06-24 19:33:56 UTC (rev 6)
+++ trunk/debian/control	2008-06-24 19:47:33 UTC (rev 7)
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Holger Levsen <holger at debian.org>
-Build-Depends: debhelper (>= 5), autoconf, libpam0g-dev
+Build-Depends: debhelper (>= 5), autoconf, libpam0g-dev, dpatch
 Standards-Version: 3.8.0
 
 Package: olpc-utils

Added: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	                        (rev 0)
+++ trunk/debian/patches/00list	2008-06-24 19:47:33 UTC (rev 7)
@@ -0,0 +1,2 @@
+correct_initd_dir.dpatch
+correct_initscript_arguments.dpatch

Added: trunk/debian/patches/correct_initd_dir.dpatch
===================================================================
--- trunk/debian/patches/correct_initd_dir.dpatch	                        (rev 0)
+++ trunk/debian/patches/correct_initd_dir.dpatch	2008-06-24 19:47:33 UTC (rev 7)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## correct_initd_dir.dpatch by Patrick Winnertz <winnie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad olpc-utils-20080624~/Makefile.am olpc-utils-20080624/Makefile.am
+--- olpc-utils-20080624~/Makefile.am	2008-06-24 21:17:49.000000000 +0200
++++ olpc-utils-20080624/Makefile.am	2008-06-24 21:42:55.000000000 +0200
+@@ -16,7 +16,7 @@
+ #
+ 
+ x11dir = ${sysconfdir}/X11
+-initdir = ${sysconfdir}/rc.d/init.d
++initdir = ${sysconfdir}/init.d
+ profiledir = ${sysconfdir}/profile.d
+ crondir = ${sysconfdir}/cron.d
+ udevrulesdir = ${sysconfdir}/udev/rules.d

Added: trunk/debian/patches/correct_initscript_arguments.dpatch
===================================================================
--- trunk/debian/patches/correct_initscript_arguments.dpatch	                        (rev 0)
+++ trunk/debian/patches/correct_initscript_arguments.dpatch	2008-06-24 19:47:33 UTC (rev 7)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## correct_initscript_arguments.dpatch by Patrick Winnertz <winnie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad olpc-utils-20080624~/olpc-configure olpc-utils-20080624/olpc-configure
+--- olpc-utils-20080624~/olpc-configure	2008-06-24 21:17:49.000000000 +0200
++++ olpc-utils-20080624/olpc-configure	2008-06-24 21:43:25.000000000 +0200
+@@ -261,9 +261,9 @@
+ 		rm -rf "$OLPC_HOME/.usb-customizations"
+ 	fi
+ 	;;
+-  stop|status)
++  stop|status|force-reload)
+   	;;
+   *)
+-        echo $"Usage: $0 {start|stop|restart|status}"
++        echo $"Usage: $0 {start|stop|restart|status|force-reload}"
+   	;;
+ esac


Property changes on: trunk/debian/patches/correct_initscript_arguments.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-06-24 19:33:56 UTC (rev 6)
+++ trunk/debian/rules	2008-06-24 19:47:33 UTC (rev 7)
@@ -9,6 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
 
 
 
@@ -21,15 +22,10 @@
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	# Add here commands to configure the package.
 	
-	# use quilt for this one!!!!!!!!!111111111
-	# this misses unpatch
-	sed -i "s/rc\.d//" Makefile.am
-	sed -i -e "s/status)/status|force-reload)/" -e "s/status}/status|force-reload}/" olpc-configure
-	# from here its fine
 	sh autogen.sh
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/
 
@@ -47,7 +43,7 @@
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp