diff -Nru xautolock-2.2/debian/changelog xautolock-2.2/debian/changelog --- xautolock-2.2/debian/changelog 2011-08-15 20:14:32.000000000 +0000 +++ xautolock-2.2/debian/changelog 2013-05-09 12:46:41.000000000 +0000 @@ -1,3 +1,16 @@ +xautolock (1:2.2-4) unstable; urgency=low + + * debian/control: + - Removed xautolock from Recommends since it was removed from Debian + - Standards-Version: 3.9.4 + - Depends: debhelper (>= 9) + * debian/compat: 9 + * debian/rules: + - Use hardening flags + - Use dh style rules + + -- Roland Stigge Thu, 09 May 2013 14:20:14 +0200 + xautolock (1:2.2-3) unstable; urgency=low * Added debian/watch diff -Nru xautolock-2.2/debian/compat xautolock-2.2/debian/compat --- xautolock-2.2/debian/compat 2010-06-05 12:52:08.000000000 +0000 +++ xautolock-2.2/debian/compat 2013-05-09 12:20:04.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru xautolock-2.2/debian/control xautolock-2.2/debian/control --- xautolock-2.2/debian/control 2010-06-05 13:16:05.000000000 +0000 +++ xautolock-2.2/debian/control 2013-05-09 12:39:04.000000000 +0000 @@ -2,13 +2,13 @@ Section: x11 Priority: optional Maintainer: Roland Stigge -Build-Depends: debhelper (>= 7), xutils-dev (>= 1:1.0.2-2), libx11-dev, libxss-dev, x11proto-core-dev -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 9), xutils-dev (>= 1:1.0.2-2), libx11-dev, libxss-dev, x11proto-core-dev, dpkg-dev (>= 1.16.1~) +Standards-Version: 3.9.4 Package: xautolock Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: xlockmore | xtrlock | xscreensaver +Recommends: xtrlock | xscreensaver Description: Program launcher for idle X sessions Xautolock monitors input devices under the X Window System, and launches a program of your choice if there is no activity after a user-configurable diff -Nru xautolock-2.2/debian/dirs xautolock-2.2/debian/dirs --- xautolock-2.2/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ xautolock-2.2/debian/dirs 2013-05-09 12:55:59.000000000 +0000 @@ -0,0 +1 @@ +usr/share/man/man1 diff -Nru xautolock-2.2/debian/rules xautolock-2.2/debian/rules --- xautolock-2.2/debian/rules 2010-06-05 13:17:06.000000000 +0000 +++ xautolock-2.2/debian/rules 2013-05-09 13:09:12.000000000 +0000 @@ -5,94 +5,16 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -CFLAGS = -Wall -g +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif +%: + dh $@ -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. +override_dh_auto_build: xmkmf - $(MAKE) - #/usr/bin/docbook-to-man debian/xautolock.sgml > xautolock.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) clean - rm -f Makefile - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - install -D -m 644 xautolock.man \ - debian/xautolock/usr/share/man/man1/xautolock.1 - - # Add here commands to install the package into debian/xautolock. - $(MAKE) install DESTDIR=$(CURDIR)/debian/xautolock - - -# 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_installinit -# dh_installcron -# dh_installinfo -# dh_installman xautolock.1 - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + $(MAKE) EXTRA_LDOPTIONS="$(LDFLAGS)" CCOPTIONS="$(CFLAGS) $(CPPFLAGS)" -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_install: + dh_auto_install + cp xautolock.man $(CURDIR)/debian/xautolock/usr/share/man/man1/xautolock.1