Hi,

My AM wants me to do some NMU for my T&S, here is one.


Thanks,

Arthur.
diff -Nru fakeroot-ng-0.09/debian/changelog fakeroot-ng-0.09/debian/changelog
--- fakeroot-ng-0.09/debian/changelog   2008-04-02 22:52:44.000000000 +0000
+++ fakeroot-ng-0.09/debian/changelog   2008-04-02 22:52:44.000000000 +0000
@@ -1,3 +1,10 @@
+fakeroot-ng (0.09-1.1) unstable; urgency=low
+
+  * Non-maintainer Upload.
+  * fix_gcc-4.3_headers.patch: Add.  Closes: #472564
+
+ -- Arthur Loiret <[EMAIL PROTECTED]>  Wed, 02 Apr 2008 22:50:26 +0000
+
 fakeroot-ng (0.09-1) unstable; urgency=low
 
   * New upstream release
diff -Nru 
/tmp/T1qYhagMrs/fakeroot-ng-0.09/debian/patches/fix_gcc-4.3_headers.patch 
/tmp/vXH4H2SBPS/fakeroot-ng-0.09/debian/patches/fix_gcc-4.3_headers.patch
--- fakeroot-ng-0.09/debian/patches/fix_gcc-4.3_headers.patch   1970-01-01 
00:00:00.000000000 +0000
+++ fakeroot-ng-0.09/debian/patches/fix_gcc-4.3_headers.patch   2008-04-02 
22:52:44.000000000 +0000
@@ -0,0 +1,76 @@
+--- file.cpp   2008-04-02 22:40:03.970376238 +0000
++++ file.cpp   2008-04-02 22:41:06.181376257 +0000
+@@ -21,10 +21,12 @@
+ 
+ #include <sys/stat.h>
+ #include <sys/syscall.h>
+-#include <errno.h>
+ #include <fcntl.h>
++#include <cerrno>
++#include <cstring>
++#include <climits>
+ 
+-#include <assert.h>
++#include <cassert>
+ 
+ #include "syscalls.h"
+ #include "file_lie.h"
+--- main.cpp   2008-04-02 22:35:39.418373502 +0000
++++ main.cpp   2008-04-02 22:37:40.655906389 +0000
+@@ -24,10 +24,12 @@
+ #include <sys/ptrace.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <errno.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstdarg>
++#include <cerrno>
++#include <cstring>
++#include <climits>
+ 
+ #include "arch/platform.h"
+ #include "parent.h"
+--- parent.cpp 2008-04-02 22:38:08.341374616 +0000
++++ parent.cpp 2008-04-02 22:38:37.702371376 +0000
+@@ -32,8 +32,9 @@
+ 
+ #include <ext/hash_map>
+ 
+-#include <stdio.h>
+-#include <assert.h>
++#include <cstdio>
++#include <cassert>
++#include <cstring>
+ 
+ #include "arch/platform.h"
+ 
+--- process.cpp        2008-04-02 22:38:55.349373736 +0000
++++ process.cpp        2008-04-02 22:39:51.273371173 +0000
+@@ -20,7 +20,10 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
+-#include <errno.h>
++#include <sys/wait.h>
++#include <cerrno>
++#include <cstring>
++#include <climits>
+ 
+ #include "syscalls.h"
+ #include "arch/platform.h"
+--- ptrace.cpp 2008-04-02 22:41:15.870009051 +0000
++++ ptrace.cpp 2008-04-02 22:41:28.801371627 +0000
+@@ -20,7 +20,8 @@
+ #include "config.h"
+ 
+ #include <sys/ptrace.h>
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ #include "syscalls.h"
+ #include "arch/platform.h"
diff -Nru /tmp/T1qYhagMrs/fakeroot-ng-0.09/debian/rules 
/tmp/vXH4H2SBPS/fakeroot-ng-0.09/debian/rules
--- fakeroot-ng-0.09/debian/rules       2008-04-02 22:52:44.000000000 +0000
+++ fakeroot-ng-0.09/debian/rules       2008-04-02 22:52:44.000000000 +0000
@@ -16,7 +16,18 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-config.status: configure
+patch: patch-stamp
+patch-stamp:
+       set -e; test -e $@ || \
+         for i in `ls -1 debian/patches/*.patch || :`; do patch -p0 <$$i > 
/dev/null; done
+       touch $@
+
+unpatch:
+       set -e; ! test -e patch-stamp || \
+         for i in `ls -1r debian/patches/*.patch || :`; do patch -p0 -R <$$i > 
/dev/null; done
+       rm -f patch-stamp
+
+config.status: configure patch
        dh_testdir
        # Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -38,7 +49,7 @@
 
        touch $@
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-stamp 
@@ -80,4 +91,4 @@
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch

Attachment: signature.asc
Description: Digital signature

Reply via email to