[Forensics-changes] [SCM] debian-forensics/rsakeyfind branch, debian, updated. debian/1.0.0-1-12-g3227f66

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 46a92261d181527bb15022e39c3d7e1756a6ec60
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Jul 22 21:48:38 2011 +0200

    Add patch and fix rules to avoid direct modifications of upstream sources

diff --git a/Makefile b/Makefile
index 85c1152..e68c0c7 100644
--- a/Makefile
+++ b/Makefile
@@ -9,5 +9,3 @@ rsakeyfind: $(OBJS)
 clean:
 	@rm -f rsakeyfind *~ \#* $(OBJS)
 
-install:
-	install -m655 rsakeyfind $(DESTDIR)/usr/bin/rsakeyfind
diff --git a/debian/changelog b/debian/changelog
index 820bf99..6772a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ rsakeyfind (1.0.0-2) unstable; urgency=low
   * Bump debhelper compat to 8
   * Bump standards version to 3.9.2 (no changes needed) 
   * Switch to 3.0 (quilt) source package format
+  * Add patch and fix rules to avoid direct modifications of upstream sources 
 
- -- Julien Valroff <julien at debian.org>  Fri, 22 Jul 2011 21:21:45 +0200
+ -- Julien Valroff <julien at debian.org>  Fri, 22 Jul 2011 21:46:44 +0200
 
 rsakeyfind (1.0.0-1) unstable; urgency=low
 
diff --git a/debian/patches/001_include.diff b/debian/patches/001_include.diff
new file mode 100644
index 0000000..e2e7cd4
--- /dev/null
+++ b/debian/patches/001_include.diff
@@ -0,0 +1,17 @@
+Description: Fix include
+Author: Jacob Appelbaum <jacob at appelbaum.net>
+Last-Update: 2011-07-22
+
+diff --git a/rsakeyfind.cpp b/rsakeyfind.cpp
+index 8e45686..c875c4d 100644
+--- a/rsakeyfind.cpp
++++ b/rsakeyfind.cpp
+@@ -8,7 +8,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+-#include <string>
++#include <string.h>
+ #include <iostream>
+ 
+ #ifdef __FreeBSD__
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c701d91
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_include.diff
diff --git a/debian/rules b/debian/rules
index cbe925d..54fd546 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,7 @@
 #!/usr/bin/make -f
 %:
 	dh $@
+
+override_dh_auto_install:
+	install rsakeyfind usr/bin
+	dh_auto_install
diff --git a/rsakeyfind.cpp b/rsakeyfind.cpp
index c875c4d..8e45686 100644
--- a/rsakeyfind.cpp
+++ b/rsakeyfind.cpp
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <string.h>
+#include <string>
 #include <iostream>
 
 #ifdef __FreeBSD__

-- 
debian-forensics/rsakeyfind