diff -Nru xzgv-0.9.2/debian/changelog xzgv-0.9.2/debian/changelog --- xzgv-0.9.2/debian/changelog 2019-03-06 04:06:18.000000000 +0000 +++ xzgv-0.9.2/debian/changelog 2019-08-04 15:59:17.000000000 +0000 @@ -1,3 +1,11 @@ +xzgv (0.9.2-2) unstable; urgency=medium + + * Convert debian/rules file to use dh + * Update the debhelper compatibility level to 12 + * Update Debian policy compliance to 4.4.0 + + -- Theodore Y. Ts'o Sun, 04 Aug 2019 11:59:17 -0400 + xzgv (0.9.2-1) unstable; urgency=medium * New upstream version diff -Nru xzgv-0.9.2/debian/compat xzgv-0.9.2/debian/compat --- xzgv-0.9.2/debian/compat 2019-03-06 04:06:18.000000000 +0000 +++ xzgv-0.9.2/debian/compat 2019-08-04 15:59:17.000000000 +0000 @@ -1 +1 @@ -10 +12 diff -Nru xzgv-0.9.2/debian/control xzgv-0.9.2/debian/control --- xzgv-0.9.2/debian/control 2019-03-06 04:06:18.000000000 +0000 +++ xzgv-0.9.2/debian/control 2019-08-04 15:59:17.000000000 +0000 @@ -2,8 +2,8 @@ Section: graphics Priority: optional Maintainer: Theodore Y. Ts'o -Build-Depends: debhelper (>= 10), gawk, libexif-dev, libgtk2.0-dev, texinfo, install-info -Standards-Version: 4.3.0 +Build-Depends: debhelper (>= 12), gawk, libexif-dev, libgtk2.0-dev, texinfo, install-info +Standards-Version: 4.4.0 Package: xzgv Architecture: any diff -Nru xzgv-0.9.2/debian/rules xzgv-0.9.2/debian/rules --- xzgv-0.9.2/debian/rules 2019-03-06 04:06:18.000000000 +0000 +++ xzgv-0.9.2/debian/rules 2019-08-04 15:59:17.000000000 +0000 @@ -1,70 +1,27 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. +#! /usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 -PATH=/bin:/usr/bin:/usr/sbin +export DEB_BUILD_MAINT_OPTIONS ?= hardening=+all + +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +PATH=/bin:/usr/bin:/usr/sbin -CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \ - `pkg-config --cflags x11` +CFLAGS += $(shell pkg-config --cflags gtk+-2.0) \ + $(shell pkg-config --cflags gdk-pixbuf-2.0) \ + $(shell pkg-config --cflags x11) LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 \ -lglib-2.0 -lgio-2.0 -lX11 -lexif -configure: debian/configure-stamp -debian/configure-stamp: - dh_testdir - - # xzgv doesn't use configure - - touch debian/configure-stamp - - -build: build-arch build-indep - -build-arch: debian/build-arch-stamp -debian/build-arch-stamp: debian/configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" GZIP=-9n all info +%: + dh $@ - touch $@ +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" GZIP=-9n all info -build-indep: debian/build-indep-stamp -debian/build-indep-stamp: debian/configure-stamp - #docbook-to-man debian/xzgv.sgml > xzgv.1 - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f debian/*-stamp - - # Add here commands to clean up after the build process. - $(MAKE) realclean - rm -rf `find . -type d -name .xvpics` - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/xzgv. +override_dh_auto_install: $(MAKE) install PREFIX=$(CURDIR)/debian/xzgv/usr INFODIR=$(CURDIR)/debian/xzgv/usr/share/info MANDIR=$(CURDIR)/debian/xzgv/usr/share/man/man1 INFO_DIR_UPDATE=no cp $(CURDIR)/debian/xzgv.xpm $(CURDIR)/debian/xzgv/usr/share/pixmaps mkdir -p $(CURDIR)/debian/xzgv/usr/share/applications @@ -80,42 +37,3 @@ chmod 644 $$d/xzgv.png ; \ done rm -f $(CURDIR)/debian/xzgv/usr/share/info/dir* - - -# 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 ChangeLog - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam - dh_installmime -# dh_python -# dh_installinit -# dh_installcron - dh_installinfo $(CURDIR)/doc/xzgv.info.gz - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - 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