diff options
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 17 | ||||
| -rw-r--r-- | debian/copyright | 39 | ||||
| -rw-r--r-- | debian/dirs | 3 | ||||
| -rw-r--r-- | debian/docs | 2 | ||||
| -rw-r--r-- | debian/menu | 2 | ||||
| -rw-r--r-- | debian/patches/fix-install-target | 34 | ||||
| -rw-r--r-- | debian/patches/hardening | 27 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 2 |
13 files changed, 155 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..aadb39c --- /dev/null +++ b/debian/changelog @@ -0,0 +1,19 @@ +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) + + -- Gürkan Sengün <gurkan@phys.ethz.ch> Thu, 27 Jan 2011 08:34:24 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..5a44207 --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: dhex +Section: editors +Priority: optional +Maintainer: Gürkan Sengün <gurkan@phys.ethz.ch> +Build-Depends: debhelper (>= 9~), libncurses5-dev +Standards-Version: 3.9.3 +Homepage: http://www.dettus.net/dhex/ + +Package: dhex +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: ncurses based hex editor with diff mode + This is more than just another hex editor: It includes a diff mode, which + can be used to easily and conveniently compare two binary files. Since it is + based on ncurses and is themeable, it can run on any number of systems and + scenarios. With its utilization of search logs, it is possible to track + changes in different iterations of files easily. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..ccacd3f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,39 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: dhex +Source: http://www.dettus.net/dhex/ + +Files: * +Copyright: 2011 Thomas Dettbarn <dettus@dettus.net> +License: GNU GPL 2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +Files: debian/* +Copyright: 2011 Gürkan Sengün <gurkan@phys.ethz.ch> +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..f693d65 --- /dev/null +++ b/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/man/man1 +usr/share/man/man5 diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..d27f763 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +README.txt +todo.txt diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..83f89fb --- /dev/null +++ b/debian/menu @@ -0,0 +1,2 @@ +?package(dhex):needs="text" section="Applications/Editors"\ + title="dhex" command="/usr/bin/dhex" 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 new file mode 100644 index 0000000..174addd --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +fix-install-target +hardening diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..f452b8f --- /dev/null +++ b/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..3279854 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.dettus.net/dhex/ dhex_([0-9].*)\.tar\.gz |