Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/compat: Bump to 9.
* debian/control:
- Build-depend on debhelper (>= 9).
- Depend on ${misc:Depends}.
- Remove dead homepage URL from description.
* debian/rules: Convert to dh sequencer.
* makefile:
- Add -f to rm command in clean target.
- Add variables to pass in hardening flags.
* fontdump.c: Include <strings.h> for the bcmp function.
* ree.c: Include <string.h> for the strncmp function.
Thanks for considering the patch.
Logan Rosen
diff -u ree-1.3/makefile ree-1.3/makefile
--- ree-1.3/makefile
+++ ree-1.3/makefile
@@ -1,9 +1,9 @@
all:
- gcc ree.c -o ree
- gcc fontdump.c -o fontdump
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) ree.c -o ree
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) fontdump.c -o fontdump
clean:
- rm fontdump ree
+ rm -f fontdump ree
install:
cp fontdump $(DESTDIR)/usr/bin
diff -u ree-1.3/fontdump.c ree-1.3/fontdump.c
--- ree-1.3/fontdump.c
+++ ree-1.3/fontdump.c
@@ -12,6 +12,7 @@
*/
#include <stdio.h>
+#include <strings.h>
#define CHARA 65
diff -u ree-1.3/ree.c ree-1.3/ree.c
--- ree-1.3/ree.c
+++ ree-1.3/ree.c
@@ -17,6 +17,7 @@
*/
#include <stdio.h>
+#include <string.h>
char* ID_ROMEXT="Uª"; /* 0x55aa */
diff -u ree-1.3/debian/compat ree-1.3/debian/compat
--- ree-1.3/debian/compat
+++ ree-1.3/debian/compat
@@ -1 +1 @@
-4
+9
diff -u ree-1.3/debian/rules ree-1.3/debian/rules
--- ree-1.3/debian/rules
+++ ree-1.3/debian/rules
@@ -2,68 +2,2 @@
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/ree
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+ dh $@
diff -u ree-1.3/debian/control ree-1.3/debian/control
--- ree-1.3/debian/control
+++ ree-1.3/debian/control
@@ -5,13 +5,11 @@
-Build-Depends: debhelper (>= 4.0.0)
+Build-Depends: debhelper (>= 9)
Standards-Version: 3.6.2
Package: ree
Architecture: i386 amd64 ia64 kfreebsd-i386 hurd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: file, nasm, bc
Description: Extract ROM extensions
ROM extension extractor (ree) is a tool which extracts ROM extensions
from the firmware of a PC computer. It can also extract font data from
video card ROMs.
- .
- Homepage: http://gnu.ethz.ch/linuks.mine.nu/ree/
