diff -Nru scrot-0.8/debian/changelog scrot-0.8/debian/changelog --- scrot-0.8/debian/changelog 2015-09-21 22:35:56.000000000 +0000 +++ scrot-0.8/debian/changelog 2016-11-20 15:04:53.000000000 +0000 @@ -1,3 +1,27 @@ +scrot (0.8-18) unstable; urgency=medium + + * Bumped DH level to 10. + * debian/control: + - Bumped Standards-Version to 3.9.8. + - Removed the Homepage field. It is offline. + - Removed unnecessary dependency autotools-dev. + - Updated the Vcs-* fields to use https instead of http and git. + * debian/copyright: updated the packaging copyright years. + * debian/patches/: + - 10_improve-hardening.patch: created to fix the GCC hardening. + - 11_fix-spelling-manpage.patch: created to fix some spelling + errors in manpage. + - fix-makefile: renamed to 09_fix-makefile.patch. + - Deleted the useless and duplicate 003_descmanpage.patch file. + * debian/rules: added the DEB_LDFLAGS_MAINT_APPEND variable to avoid an + unnecessary linking against a library. + * debian/watch: + - Bumped to version 4. + - Removed the extra source to avoid conflicts with uscan. + - Using NoSite instead of NoTracking. + + -- Joao Eriberto Mota Filho Sun, 20 Nov 2016 13:04:53 -0200 + scrot (0.8-17) unstable; urgency=medium * debian/README.Debian: added to explain about the use with cron. @@ -96,7 +120,7 @@ * New maintainer (Closes: #492502). * Updated Standards Version to 3.8.0 - * Added autotool-dev as Build-Depend. + * Added autotools-dev as Build-Depend. * Added watch file. * Added a patch to fix a minor error on manpage. * Set auto update libtool at debian/rules. diff -Nru scrot-0.8/debian/compat scrot-0.8/debian/compat --- scrot-0.8/debian/compat 2015-04-10 00:35:55.000000000 +0000 +++ scrot-0.8/debian/compat 2016-11-20 15:04:53.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru scrot-0.8/debian/control scrot-0.8/debian/control --- scrot-0.8/debian/control 2015-04-15 12:43:49.000000000 +0000 +++ scrot-0.8/debian/control 2016-11-20 15:04:53.000000000 +0000 @@ -2,20 +2,18 @@ Section: graphics Priority: optional Maintainer: Joao Eriberto Mota Filho -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), - autotools-dev, +Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10), dh-autoreconf, giblib-dev, libimlib2-dev, libtool -Homepage: http://linuxbrit.co.uk/scrot -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/scrot.git -Vcs-Git: git://anonscm.debian.org/collab-maint/scrot.git +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/scrot.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/scrot.git Package: scrot Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: command line screen capture utility scrot (SCReen shOT) is a simple command line screen capture utility that uses imlib2 to grab and save images. Multiple diff -Nru scrot-0.8/debian/copyright scrot-0.8/debian/copyright --- scrot-0.8/debian/copyright 2015-04-12 03:56:53.000000000 +0000 +++ scrot-0.8/debian/copyright 2016-11-20 15:04:53.000000000 +0000 @@ -3,7 +3,9 @@ Source: http://linuxbrit.co.uk/scrot Files: * -Copyright: 1999-2000 Tom Gilbert +Copyright: 1999-2000 Tom Gilbert License: MIT-advertising Files: src/getopt.c @@ -16,7 +18,7 @@ Files: debian/* Copyright: 2000-2006 Laurence J. Lane 2008-2010 William Vera - 2015 Joao Eriberto Mota Filho + 2015-2016 Joao Eriberto Mota Filho License: BSD-3-Clause License: MIT-advertising diff -Nru scrot-0.8/debian/patches/003_descmanpage.patch scrot-0.8/debian/patches/003_descmanpage.patch --- scrot-0.8/debian/patches/003_descmanpage.patch 2015-04-12 03:25:42.000000000 +0000 +++ scrot-0.8/debian/patches/003_descmanpage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Index: scrot-0.8/scrot.1 -=================================================================== ---- scrot-0.8.orig/scrot.1 -+++ scrot-0.8/scrot.1 -@@ -1,6 +1,6 @@ - .TH scrot 1 "Oct 26, 2000" - .SH NAME --scrot - Screen capture using imlib2 -+scrot - capture a screenshot using imlib2 - .SH SYNOPSIS - scrot [options] [file] - .SH DESCRIPTION diff -Nru scrot-0.8/debian/patches/09_fix-makefile.patch scrot-0.8/debian/patches/09_fix-makefile.patch --- scrot-0.8/debian/patches/09_fix-makefile.patch 1970-01-01 00:00:00.000000000 +0000 +++ scrot-0.8/debian/patches/09_fix-makefile.patch 2015-04-10 01:28:45.000000000 +0000 @@ -0,0 +1,21 @@ +Description: fix LDFLAGS and ignore docs. +Author: Joao Eriberto Mota Filho +Last-Update: 2015-04-09 +Index: scrot-0.8/Makefile.am +=================================================================== +--- scrot-0.8.orig/Makefile.am ++++ scrot-0.8/Makefile.am +@@ -11,10 +11,10 @@ $(X_CFLAGS) -I$(prefix)/include -I$(incl + + man_MANS = scrot.1 + +-docs_DATA = README AUTHORS ChangeLog TODO +-docsdir = $(prefix)/doc/scrot ++#docs_DATA = README AUTHORS ChangeLog TODO ++#docsdir = $(prefix)/doc/scrot + + EXTRA_DIST = \ +-scrot.spec scrot.1 $(docs_DATA) ++scrot.spec scrot.1 + + SUBDIRS = src diff -Nru scrot-0.8/debian/patches/10_improve-hardening.patch scrot-0.8/debian/patches/10_improve-hardening.patch --- scrot-0.8/debian/patches/10_improve-hardening.patch 1970-01-01 00:00:00.000000000 +0000 +++ scrot-0.8/debian/patches/10_improve-hardening.patch 2016-11-20 15:04:53.000000000 +0000 @@ -0,0 +1,30 @@ +Description: improve the GCC hardening, fixing Makefile.am. +Author: Joao Eriberto Mota Filho +Last-Update: 2016-11-20 +Index: scrot-0.8/Makefile.am +=================================================================== +--- scrot-0.8.orig/Makefile.am ++++ scrot-0.8/Makefile.am +@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign + # A list of all the files in the current directory which can be regenerated + MAINTAINERCLEANFILES = Makefile.in scrot.spec + +-LDFLAGS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib ++AM_LDFLAGS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib + INCLUDES = -I/usr/X11R6/include \ + $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. + +Index: scrot-0.8/src/Makefile.am +=================================================================== +--- scrot-0.8.orig/src/Makefile.am ++++ scrot-0.8/src/Makefile.am +@@ -1,7 +1,7 @@ + # A list of all the files in the current directory which can be regenerated +-MAINTAINERCLEANFILES = Makefile.in ++MAINTAINERCLEANFILES = Makefile.in + +-LDFLAGS = -L/usr/X11R6/lib ++AM_LDFLAGS = -L/usr/X11R6/lib + INCLUDES = -g -O3 -Wall -I/usr/X11R6/include \ + $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \ + -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@ diff -Nru scrot-0.8/debian/patches/11_fix-spelling-manpage.patch scrot-0.8/debian/patches/11_fix-spelling-manpage.patch --- scrot-0.8/debian/patches/11_fix-spelling-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ scrot-0.8/debian/patches/11_fix-spelling-manpage.patch 2016-11-20 15:04:53.000000000 +0000 @@ -0,0 +1,25 @@ +Description: fix spelling errors in manpage. +Author: Joao Eriberto Mota Filho +Last-Update: 2016-11-20 +Index: scrot-0.8/scrot.1 +=================================================================== +--- scrot-0.8.orig/scrot.1 ++++ scrot-0.8/scrot.1 +@@ -7,7 +7,7 @@ scrot [options] [file] + .B scrot + is a screen capture utility using the + .B imlib2 +-library to aquire and save images. ++library to acquire and save images. + .B scrot + has a few options, detailed below. Specify [file] as the filename to save + the screenshot to. +@@ -60,7 +60,7 @@ and + parameters can take format specifiers + that are expanded by scrot when encountered. + There are two types of format specifier. Characters preceded by a '%' +-are interpretted by strftime(2). See man strftime for examples. ++are interpreted by strftime(2). See man strftime for examples. + These options may be used to refer to the current date and time. + The second kind are internal to scrot and are prefixed by '$' + The following specifiers are recognised: diff -Nru scrot-0.8/debian/patches/fix-makefile scrot-0.8/debian/patches/fix-makefile --- scrot-0.8/debian/patches/fix-makefile 2015-04-10 01:28:45.000000000 +0000 +++ scrot-0.8/debian/patches/fix-makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Description: fix LDFLAGS and ignore docs. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-04-09 -Index: scrot-0.8/Makefile.am -=================================================================== ---- scrot-0.8.orig/Makefile.am -+++ scrot-0.8/Makefile.am -@@ -11,10 +11,10 @@ $(X_CFLAGS) -I$(prefix)/include -I$(incl - - man_MANS = scrot.1 - --docs_DATA = README AUTHORS ChangeLog TODO --docsdir = $(prefix)/doc/scrot -+#docs_DATA = README AUTHORS ChangeLog TODO -+#docsdir = $(prefix)/doc/scrot - - EXTRA_DIST = \ --scrot.spec scrot.1 $(docs_DATA) -+scrot.spec scrot.1 - - SUBDIRS = src diff -Nru scrot-0.8/debian/patches/series scrot-0.8/debian/patches/series --- scrot-0.8/debian/patches/series 2015-04-12 02:48:34.000000000 +0000 +++ scrot-0.8/debian/patches/series 2016-11-20 15:04:53.000000000 +0000 @@ -1,4 +1,3 @@ -fix-makefile 01_manpagefix.patch 02_options.c.patch 03_descmanpage.patch @@ -7,3 +6,6 @@ 06_manpagespace.patch 07_fix-formatstring.patch 08_fix-beeping.patch +09_fix-makefile.patch +10_improve-hardening.patch +11_fix-spelling-manpage.patch diff -Nru scrot-0.8/debian/README.Debian scrot-0.8/debian/README.Debian --- scrot-0.8/debian/README.Debian 2015-09-21 23:23:21.000000000 +0000 +++ scrot-0.8/debian/README.Debian 2016-11-20 15:04:53.000000000 +0000 @@ -4,10 +4,10 @@ To use scrot with cron, you need to set the DISPLAY variable. See the following example: -DISPLAY=:0 scrot -z -q 20 -e 'mv $f /var/backups/scrot/' + DISPLAY=:0 scrot -z -q 20 -e 'mv $f /var/backups/scrot/' To discover the current DISPLAY, use this command: -$ echo $DISPLAY + $ echo $DISPLAY -- Joao Eriberto Mota Filho Mon, 21 Sep 2015 17:09:45 -0300 diff -Nru scrot-0.8/debian/rules scrot-0.8/debian/rules --- scrot-0.8/debian/rules 2015-05-04 02:36:43.000000000 +0000 +++ scrot-0.8/debian/rules 2016-11-20 15:04:53.000000000 +0000 @@ -2,6 +2,7 @@ #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --with autoreconf diff -Nru scrot-0.8/debian/source/include-binaries scrot-0.8/debian/source/include-binaries --- scrot-0.8/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ scrot-0.8/debian/source/include-binaries 2016-11-20 15:04:53.000000000 +0000 @@ -0,0 +1,6 @@ +src/getopt.o +src/getopt1.o +src/imlib.o +src/main.o +src/options.o +src/scrot diff -Nru scrot-0.8/debian/watch scrot-0.8/debian/watch --- scrot-0.8/debian/watch 2015-09-21 20:22:21.000000000 +0000 +++ scrot-0.8/debian/watch 2016-11-20 15:04:53.000000000 +0000 @@ -1,5 +1,3 @@ -version=3 -http://linuxbrit.co.uk/downloads/scrot-(\d\S+)\.tar\.(?:bz2|gz|xz) - -opts=dversionmangle=s/.*/0.No-Track/ \ -https://people.debian.org/~eriberto/ FakeWatchNoUpstreamTrackingForThisPackage-(\d\S+)\.gz +version=4 +opts=dversionmangle=s/.*/0.No-Site/ \ +https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz