diff -Nru gsmartcontrol-0.8.7/debian/changelog gsmartcontrol-0.8.7/debian/changelog --- gsmartcontrol-0.8.7/debian/changelog 2015-08-07 18:19:12.000000000 +0000 +++ gsmartcontrol-0.8.7/debian/changelog 2016-09-12 11:42:12.000000000 +0000 @@ -1,15 +1,13 @@ -gsmartcontrol (0.8.7-1.1ubuntu2) wily; urgency=medium +gsmartcontrol (0.8.7-1.2) unstable; urgency=medium - * No-change rebuild against libatkmm-1.6-1v5 - - -- Steve Langasek Fri, 07 Aug 2015 18:19:12 +0000 - -gsmartcontrol (0.8.7-1.1ubuntu1) vivid; urgency=medium - - * Merge from debian. Remaining changes: - - Add 05_fix_ATA_version.patch. Correctly report the ATA/SATA version + * Non-maintainer upload. + * Use DEB_BUILD_MAINT_OPTIONS with short-form dh instead of + hardening-wrapper. Closes: #836628. + * Update the homepage. Closes: #769580. + * Pull in 05_fix_ATA_version.patch from Ubuntu (thanks to Bart P.). LP: + #1310282. - -- Jackson Doak Sun, 26 Oct 2014 15:41:58 +1100 + -- Stephen Kitt Mon, 12 Sep 2016 13:42:12 +0200 gsmartcontrol (0.8.7-1.1) unstable; urgency=medium @@ -19,15 +17,6 @@ -- Stephen Kitt Fri, 12 Sep 2014 08:40:12 +0200 -gsmartcontrol (0.8.7-1ubuntu1) utopic; urgency=medium - - * Add 04_compat_with_smartmontools_6.patch. Fixes a crash at - startup. LP: #1231229 - * Add 05_fix_ATA_version.patch. Correctly report the ATA/SATA version - LP: #1310282 - - -- Jackson Doak Mon, 09 Jun 2014 19:37:24 +1000 - gsmartcontrol (0.8.7-1) unstable; urgency=low * [314881d] Updated debian/watch diff -Nru gsmartcontrol-0.8.7/debian/compat gsmartcontrol-0.8.7/debian/compat --- gsmartcontrol-0.8.7/debian/compat 2014-10-27 07:05:43.000000000 +0000 +++ gsmartcontrol-0.8.7/debian/compat 2016-09-12 11:12:10.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru gsmartcontrol-0.8.7/debian/control gsmartcontrol-0.8.7/debian/control --- gsmartcontrol-0.8.7/debian/control 2014-10-27 07:05:43.000000000 +0000 +++ gsmartcontrol-0.8.7/debian/control 2016-09-12 11:35:57.000000000 +0000 @@ -1,11 +1,10 @@ Source: gsmartcontrol Section: utils Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Giuseppe Iuculano -Build-Depends: debhelper (>= 7), autotools-dev, libpcre3-dev, libgtkmm-2.4-dev (>= 2.6.0), libglademm-2.4-dev, hardening-wrapper +Maintainer: Giuseppe Iuculano +Build-Depends: debhelper (>= 9), autotools-dev, libpcre3-dev, libgtkmm-2.4-dev (>= 2.6.0), libglademm-2.4-dev Standards-Version: 3.9.4 -Homepage: http://gsmartcontrol.berlios.de +Homepage: http://gsmartcontrol.sourceforge.net/home/ Vcs-Git: git://git.debian.org/git/users/derevko-guest/gsmartcontrol.git Vcs-Browser: http://git.debian.org/?p=users/derevko-guest/gsmartcontrol.git diff -Nru gsmartcontrol-0.8.7/debian/patches/series gsmartcontrol-0.8.7/debian/patches/series --- gsmartcontrol-0.8.7/debian/patches/series 2014-10-27 07:05:43.000000000 +0000 +++ gsmartcontrol-0.8.7/debian/patches/series 2016-09-12 11:35:08.000000000 +0000 @@ -1,5 +1,5 @@ 01_use_su-to-root.patch 02_fix_doc_install.patch 03_gcc4.4.patch -05_fix_ATA_version.patch compat_with_smartmontools_6.patch +05_fix_ATA_version.patch diff -Nru gsmartcontrol-0.8.7/debian/rules gsmartcontrol-0.8.7/debian/rules --- gsmartcontrol-0.8.7/debian/rules 2014-10-27 07:05:43.000000000 +0000 +++ gsmartcontrol-0.8.7/debian/rules 2016-09-12 11:35:40.000000000 +0000 @@ -3,73 +3,7 @@ #export DH_VERBOSE=1 -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS=hardening=+all -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif - - -config.status: configure - dh_testdir -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - dh_auto_configure - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp - -build-stamp: config.status $(QUILT_STAMPFN) - dh_testdir - $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/gsmartcontrol install - - -binary-indep: install - -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs NEWS - dh_installdocs - dh_installmenu - dh_installman - dh_link - dh_install - dh_strip - dh_compress - dh_fixperms - 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 +%: + dh $@ --with autotools-dev