Imported Debian patch 0.67-1debian/0.67-1

8 files changed, 81 insertions, 59 deletions

diff --git a/debian/changelog b/debian/changelog
index 1b8d218..aadb39c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+dhex (0.67-1) unstable; urgency=low
+
+  [ Gürkan Sengün ]
+  * New upstream version. (Closes: #674782)
+  * Bump standards version to 3.9.3.
+
+  [ Axel Beckert ]
+  * Enable hardening build flags
+    + Bump debhelper compatibility to 9
+    + Patch Makefile slightly by doing some s/=/+=/
+  * Bump debian/copyright format to 1.0
+
+ -- Gürkan Sengün <gurkan@phys.ethz.ch>  Fri, 22 Jun 2012 14:52:55 +0200
+
 dhex (0.65-1) unstable; urgency=low
 
   * Initial release. (Closes: #613929)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 18ece7e..5a44207 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: dhex
 Section: editors
 Priority: optional
 Maintainer: Gürkan Sengün <gurkan@phys.ethz.ch>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9~), libncurses5-dev
+Standards-Version: 3.9.3
 Homepage: http://www.dettus.net/dhex/
 
 Package: dhex
diff --git a/debian/copyright b/debian/copyright
index 6859f82..ccacd3f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: dhex
 Source: http://www.dettus.net/dhex/
 
diff --git a/debian/patches/debian-changes-0.65-1 b/debian/patches/debian-changes-0.65-1
deleted file mode 100644
index 614629d..0000000
--- a/debian/patches/debian-changes-0.65-1
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Upstream changes introduced in version 0.65-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- dhex (0.65-1) unstable; urgency=low
- .
-   * Initial release. (Closes: #613929)
- .
- The person named in the Author field signed this changelog entry.
-Author: Gürkan Sengün <gurkan@phys.ethz.ch>
-Bug-Debian: http://bugs.debian.org/613929
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- dhex-0.65.orig/Makefile
-+++ dhex-0.65/Makefile
-@@ -5,7 +5,7 @@ CFLAGS=		-O3 -Wall -std=c99
- #CFLAGS+= -ffunction-sections -fdata-sections
- #LDFLAGS+= --gc-sections 
- LIBS=		-lncurses
--DESTDIR=	/usr/local/
-+#DESTDIR=	/usr/
- 
- OFILES=buffers.o \
- 	configfile.o \
-@@ -28,11 +28,11 @@ dhex:	$(OFILES)
- 
- install:all
- 	strip dhex
--	cp dhex $(DESTDIR)/bin
--	cp dhex.1 $(DESTDIR)/share/man/man1
--	cp dhexrc.5 $(DESTDIR)/share/man/man5
--	cp dhex_markers.5 $(DESTDIR)/share/man/man5
--	cp dhex_searchlog.5 $(DESTDIR)/share/man/man5
-+	cp dhex $(DESTDIR)/usr/bin/
-+	cp dhex.1 $(DESTDIR)/usr/share/man/man1
-+	cp dhexrc.5 $(DESTDIR)/usr/share/man/man5
-+	cp dhex_markers.5 $(DESTDIR)/usr/share/man/man5
-+	cp dhex_searchlog.5 $(DESTDIR)/usr/share/man/man5
- 
- 	
- 
diff --git a/debian/patches/fix-install-target b/debian/patches/fix-install-target
new file mode 100644
index 0000000..8728604
--- /dev/null
+++ b/debian/patches/fix-install-target
@@ -0,0 +1,34 @@
+Description: Fix installation paths in Makefile
+Author: Gürkan Sengün <gurkan@phys.ethz.ch>
+Reviewed-By: Axel Beckert <abe@debian.org>
+
+--- dhex-0.67.orig/Makefile
++++ dhex-0.67/Makefile
+@@ -5,7 +5,7 @@ CFLAGS=		-O3 -Wall -std=c99
+ #CFLAGS+= -ffunction-sections -fdata-sections
+ #LDFLAGS+= --gc-sections 
+ LIBS=		-lncurses
+-DESTDIR=	/usr/local/
++DESTDIR=	/usr/
+ 
+ OFILES=buffers.o \
+ 	configfile.o \
+@@ -28,11 +28,13 @@ dhex:	$(OFILES)
+ 
+ install:all
+ 	strip dhex
+-	cp dhex $(DESTDIR)/bin
+-	cp dhex.1 $(DESTDIR)/man/man1
+-	cp dhexrc.5 $(DESTDIR)/man/man5
+-	cp dhex_markers.5 $(DESTDIR)/man/man5
+-	cp dhex_searchlog.5 $(DESTDIR)/man/man5
++	cp dhex_markers.5 $(DESTDIR)/usr/share/man/man5
++	cp dhex_searchlog.5 $(DESTDIR)/usr/share/man/man5
++	cp dhex $(DESTDIR)/usr/bin/
++	cp dhex.1 $(DESTDIR)/usr/share/man/man1
++	cp dhexrc.5 $(DESTDIR)/usr/share/man/man5
++	cp dhex_markers.5 $(DESTDIR)/usr/share/man/man5
++	cp dhex_searchlog.5 $(DESTDIR)/usr/share/man/man5
+ 
+ 	
+ 
diff --git a/debian/patches/hardening b/debian/patches/hardening
new file mode 100644
index 0000000..c8d107e
--- /dev/null
+++ b/debian/patches/hardening
@@ -0,0 +1,27 @@
+Description: Fix passing of hardening build flags in Makefile
+Author: Axel Beckert <abe@debian.org>
+
+Index: dhex-0.67/Makefile
+===================================================================
+--- dhex-0.67.orig/Makefile	2012-06-22 15:04:57.000000000 +0200
++++ dhex-0.67/Makefile	2012-06-22 15:05:09.000000000 +0200
+@@ -1,7 +1,7 @@
+ CC=		gcc
+-LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
+-CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
+-CFLAGS=		-O3 -Wall -std=c99 
++LDFLAGS+=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
++CPPFLAGS+=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
++CFLAGS+=	-Wall -std=c99 
+ #CFLAGS+= -ffunction-sections -fdata-sections
+ #LDFLAGS+= --gc-sections 
+ LIBS=		-lncurses
+@@ -24,7 +24,7 @@
+ all:	dhex
+ 
+ dhex:	$(OFILES)
+-	$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
+ 
+ install:all
+ 	strip dhex
diff --git a/debian/patches/series b/debian/patches/series
index 35f6449..174addd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-debian-changes-0.65-1
+fix-install-target
+hardening