[Debootloaders-devel] r173 - in trunk/emile/debian: . patches

[Aurélien GÉRÔME]

Author: ag-guest
Date: 2006-11-04 19:28:22 +0100 (Sat, 04 Nov 2006)
New Revision: 173

Added:
   trunk/emile/debian/patches/
   trunk/emile/debian/patches/00list
   trunk/emile/debian/patches/396446_remove_non-existent_option.dpatch
Modified:
   trunk/emile/debian/control
   trunk/emile/debian/rules
Log:
Apply fix for #396446.


Modified: trunk/emile/debian/control
===================================================================
--- trunk/emile/debian/control	2006-10-30 19:21:41 UTC (rev 172)
+++ trunk/emile/debian/control	2006-11-04 18:28:22 UTC (rev 173)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debootloaders EMILE Maintainers Team <debootloaders-emile at lists.alioth.debian.org>
 Uploaders: Wouter Verhelst <wouter at debian.org>, Stephen R. Marenka <smarenka at debian.org>, Aurélien GÉRÔME <ag at roxor.cx>
-Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc-3.3
+Build-Depends: debhelper (>> 4.1.16), dpatch, docbook-to-man, gcc-3.3
 Build-Depends-Indep: m68k-linux-gcc [!m68k]
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/debootloaders/trunk/emile/

Added: trunk/emile/debian/patches/00list
===================================================================
--- trunk/emile/debian/patches/00list	2006-10-30 19:21:41 UTC (rev 172)
+++ trunk/emile/debian/patches/00list	2006-11-04 18:28:22 UTC (rev 173)
@@ -0,0 +1 @@
+396446_remove_non-existent_option

Added: trunk/emile/debian/patches/396446_remove_non-existent_option.dpatch
===================================================================
--- trunk/emile/debian/patches/396446_remove_non-existent_option.dpatch	2006-10-30 19:21:41 UTC (rev 172)
+++ trunk/emile/debian/patches/396446_remove_non-existent_option.dpatch	2006-11-04 18:28:22 UTC (rev 173)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 396446_remove_non-existent_option.dpatch by Carsten Luedtke <acid_man at gmx.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove non-existent option -b.
+
+ at DPATCH@
+diff -urNad emile~/docs/emile-install.sgml emile/docs/emile-install.sgml
+--- emile~/docs/emile-install.sgml	2006-10-30 20:02:07.000000000 +0100
++++ emile/docs/emile-install.sgml	2006-11-04 19:18:46.474729734 +0100
+@@ -121,14 +121,6 @@
+       </varlistentry>
+ 
+       <varlistentry>
+-        <term><option>-b</option>
+-          <option>--buffer SIZE</option></term>
+-        <listitem>
+-          <para>Uncompressed size of kernel.</para>
+-        </listitem>
+-      </varlistentry>
+-
+-      <varlistentry>
+         <term><option>-g</option>
+           <option>--get-info</option></term>
+         <listitem>


Property changes on: trunk/emile/debian/patches/396446_remove_non-existent_option.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/emile/debian/rules
===================================================================
--- trunk/emile/debian/rules	2006-10-30 19:21:41 UTC (rev 172)
+++ trunk/emile/debian/rules	2006-11-04 18:28:22 UTC (rev 173)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 # Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess. 
+# This file is public domain software, originally written by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
+include /usr/share/dpatch/dpatch.make
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(DEB_BUILD_ARCH),m68k)
@@ -11,7 +11,7 @@
 M68K_CC=m68k-linux-gcc
 endif
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 
@@ -24,7 +24,8 @@
 
 	touch build-stamp
 
-clean:
+clean: clean1 unpatch
+clean1:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -89,4 +90,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean clean1 binary-indep binary-arch binary install