Package: eancheck
Version: 1.0-1.1
Followup-For: Bug #830462
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/rules: Convert to dh sequencer.
* debian/compat: Indicate compatibility level of 9.
* debian/control: Build-depend on debhelper (>= 9).
* Makefile:
- Add ${DESTDIR} to ${PREFIX}.
- Pass *FLAGS to compiler.
* debian/dirs: Add usr/bin.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: stretch/sid
APT prefers xenial-updates
APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500,
'xenial'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-21-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.utf8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u eancheck-1.0/debian/rules eancheck-1.0/debian/rules
--- eancheck-1.0/debian/rules
+++ eancheck-1.0/debian/rules
@@ -2,60 +2,2 @@
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-#This is the debhelper compatibility version to use.
-export DH_COMPAT=5
-
-CFLAGS = -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-build: build-stamp
-
-build-stamp:
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install PREFIX=$(CURDIR)/debian/eancheck/usr
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs
- 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
+%:
+ dh $@
diff -u eancheck-1.0/debian/control eancheck-1.0/debian/control
--- eancheck-1.0/debian/control
+++ eancheck-1.0/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Joe Baldwin <j...@joe-baldwin.net>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 9)
Package: eancheck
Architecture: any
only in patch2:
unchanged:
--- eancheck-1.0.orig/Makefile
+++ eancheck-1.0/Makefile
@@ -1,12 +1,12 @@
-PREFIX=/usr
+PREFIX=${DESTDIR}/usr
all: eancheck
eancheck: eancheck.o
- g++ -o $@ $<
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $<
eancheck.o: eancheck.cpp
- g++ -Wno-deprecated -c -o $@ $<
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wno-deprecated -c -o $@ $<
eancheck.1.gz:
gzip -c -9 eancheck.1 > eancheck.1.gz
only in patch2:
unchanged:
--- eancheck-1.0.orig/debian/compat
+++ eancheck-1.0/debian/compat
@@ -0,0 +1 @@
+9
only in patch2:
unchanged:
--- eancheck-1.0.orig/debian/dirs
+++ eancheck-1.0/debian/dirs
@@ -0,0 +1 @@
+usr/bin
