[Pkg-uml-commit] r49 - in trunk/src/uml-utilities/debian: . patches

[Mattia Dongili]

Author: malattia
Date: 2006-04-09 20:21:04 +0000 (Sun, 09 Apr 2006)
New Revision: 49

Added:
   trunk/src/uml-utilities/debian/patches/
   trunk/src/uml-utilities/debian/patches/00list
   trunk/src/uml-utilities/debian/patches/01_fix_moo_conflicting_types_for_read_cow_header.dpatch
Modified:
   trunk/src/uml-utilities/debian/rules
Log:
prepare a new upload because FTBFS on ia64 and alpha

Added: trunk/src/uml-utilities/debian/patches/00list
===================================================================
--- trunk/src/uml-utilities/debian/patches/00list	2006-04-09 16:06:53 UTC (rev 48)
+++ trunk/src/uml-utilities/debian/patches/00list	2006-04-09 20:21:04 UTC (rev 49)
@@ -0,0 +1 @@
+01_fix_moo_conflicting_types_for_read_cow_header.dpatch

Added: trunk/src/uml-utilities/debian/patches/01_fix_moo_conflicting_types_for_read_cow_header.dpatch
===================================================================
--- trunk/src/uml-utilities/debian/patches/01_fix_moo_conflicting_types_for_read_cow_header.dpatch	2006-04-09 16:06:53 UTC (rev 48)
+++ trunk/src/uml-utilities/debian/patches/01_fix_moo_conflicting_types_for_read_cow_header.dpatch	2006-04-09 20:21:04 UTC (rev 49)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_moo_conlicting_types - Mattia Dongili <malattia at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Debian's standard location for uml_net helper
+
+ at DPATCH@
+
+# Author: malattia
+# Status: none
+
+--- ./moo/cow.c~clean	2006-04-09 19:10:15.324384228 +0200
++++ ./moo/cow.c	2006-04-09 19:10:27.433140978 +0200
+@@ -265,7 +265,7 @@
+ 
+ int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg,
+ 		    __u32 *version_out, char **backing_file_out,
+-		    time_t *mtime_out, unsigned long long *size_out,
++		    time_t *mtime_out, __u64 *size_out,
+ 		    int *sectorsize_out, __u32 *align_out,
+ 		    int *bitmap_offset_out)
+ {

Modified: trunk/src/uml-utilities/debian/rules
===================================================================
--- trunk/src/uml-utilities/debian/rules	2006-04-09 16:06:53 UTC (rev 48)
+++ trunk/src/uml-utilities/debian/rules	2006-04-09 20:21:04 UTC (rev 49)
@@ -10,8 +10,17 @@
 
 tmp:=$(CURDIR)/debian/uml-utilities
 
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	touch $@
+
+unpatch:
+	dpatch deapply-all
+	rm -f patch-stamp
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
 	touch configure-stamp
 
@@ -30,7 +39,8 @@
 
 	touch build-stamp
 
-clean:
+clean: clean-unpatched
+clean-unpatched: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp