diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/debian/changelog xsettingsd-0.0.20171105+1+ge4cf9969/debian/changelog --- xsettingsd-0.0.20150615+2+gb4999f5e/debian/changelog 2016-08-14 17:05:41.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/debian/changelog 2018-01-02 08:17:37.000000000 +0000 @@ -1,3 +1,18 @@ +xsettingsd (0.0.20171105+1+ge4cf9969-1) unstable; urgency=low + + * New upstream snapshot + + Drop all patches, applied upstream. + * Switch to debhelper compatibility level 11. + + Drop now implicit --parallel + + Bump versioned debhelper build dependency accordingly. + * Declare compliance with Debian Policy 4.1.3. (No changes needed.) + * Set "Rules-Requires-Root: no". + * Optimize debian/rules by running scons in the dh_auto_configure + override instead as part of the dh_auto_build override. + * Update Vcs-* headers for the switch to salsa.debian.org. + + -- Axel Beckert Tue, 02 Jan 2018 09:17:37 +0100 + xsettingsd (0.0.20150615+2+gb4999f5e-1) unstable; urgency=low * Adopt the package. (Closes: #763987) diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/debian/compat xsettingsd-0.0.20171105+1+ge4cf9969/debian/compat --- xsettingsd-0.0.20150615+2+gb4999f5e/debian/compat 2016-08-14 15:35:10.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/debian/compat 2018-01-02 07:57:27.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/debian/control xsettingsd-0.0.20171105+1+ge4cf9969/debian/control --- xsettingsd-0.0.20150615+2+gb4999f5e/debian/control 2016-08-14 15:35:10.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/debian/control 2018-01-02 08:02:53.000000000 +0000 @@ -2,14 +2,15 @@ Section: x11 Priority: optional Maintainer: Axel Beckert -Build-Depends: debhelper (>= 9~), +Build-Depends: debhelper (>= 11~), libx11-dev, pkg-config, scons -Standards-Version: 3.9.8 +Standards-Version: 4.1.3 Homepage: https://github.com/derat/xsettingsd -Vcs-Git: https://anonscm.debian.org/git/collab-maint/xsettingsd.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xsettingsd.git +Vcs-Git: https://salsa.debian.org/debian/xsettingsd.git +Vcs-Browser: https://salsa.debian.org/debian/xsettingsd +Rules-Requires-Root: no Package: xsettingsd Architecture: any diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/debian/patches/LDFLAGS.patch xsettingsd-0.0.20171105+1+ge4cf9969/debian/patches/LDFLAGS.patch --- xsettingsd-0.0.20150615+2+gb4999f5e/debian/patches/LDFLAGS.patch 2016-08-14 16:42:50.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/debian/patches/LDFLAGS.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Origin: https://anonscm.debian.org/git/collab-maint/xsettingsd.git/commit/?id=796a1464 -Author: David Bremner -Description: SConstruct: s/LDFLAGS/LINKFLAGS/ - It turns out that scons uses its own name for this. Because they can, - I guess. Propagating LDFLAGS is needed for hardening flags on Debian, - and in any case the current code does not make too much sense, since - LDFLAGS is ignored. -Last-Updated: 2016-08-14 - ---- a/SConstruct -+++ b/SConstruct -@@ -44,7 +44,7 @@ - env.Append(CPPFLAGS=os.environ.get('CPPFLAGS', ''), - CFLAGS=os.environ.get('CFLAGS', ''), - CXXFLAGS=os.environ.get('CXXFLAGS', ''), -- LDFLAGS=os.environ.get('LDFLAGS', '')) -+ LINKFLAGS=os.environ.get('LDFLAGS', '')) - - env.Append(CCFLAGS='-Wall -Werror -Wno-narrowing') - diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/debian/patches/series xsettingsd-0.0.20171105+1+ge4cf9969/debian/patches/series --- xsettingsd-0.0.20150615+2+gb4999f5e/debian/patches/series 2016-08-14 15:35:10.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -LDFLAGS.patch diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/debian/rules xsettingsd-0.0.20171105+1+ge4cf9969/debian/rules --- xsettingsd-0.0.20150615+2+gb4999f5e/debian/rules 2016-08-14 16:32:17.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/debian/rules 2017-12-18 03:00:11.000000000 +0000 @@ -3,11 +3,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ --parallel + dh $@ -override_dh_auto_build: +override_dh_auto_configure: scons - dh_auto_build override_dh_auto_clean: scons -c diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/dump_xsettings.1 xsettingsd-0.0.20171105+1+ge4cf9969/dump_xsettings.1 --- xsettingsd-0.0.20150615+2+gb4999f5e/dump_xsettings.1 2015-06-15 01:02:00.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/dump_xsettings.1 2017-11-05 15:25:41.000000000 +0000 @@ -17,7 +17,7 @@ \fB\-s\fR, \fB\-\-screen\fR=\fISCREEN\fR Use the X screen numbered \fISCREEN\fR (default is 0). .SH BUGS -\fIhttp://code.google.com/p/xsettingsd/issues/list\fR +\fIhttps://github.com/derat/xsettingsd/issues\fR .SH SEE ALSO \fIxsettingsd\fR(1) .SH AUTHOR diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/SConstruct xsettingsd-0.0.20171105+1+ge4cf9969/SConstruct --- xsettingsd-0.0.20150615+2+gb4999f5e/SConstruct 2015-06-15 01:02:00.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/SConstruct 2017-11-05 15:25:41.000000000 +0000 @@ -28,10 +28,10 @@ [stdout, stderr] = proc.communicate() proc.wait() if proc.returncode == 0: - print '%s OK' % padded_name + print('%s OK' % padded_name) else: - print "%s FAILED\n" % padded_name - print stdout + print("%s FAILED\n" % padded_name) + print(stdout) run_tests_builder = Builder(action=run_tests) @@ -44,7 +44,7 @@ env.Append(CPPFLAGS=os.environ.get('CPPFLAGS', ''), CFLAGS=os.environ.get('CFLAGS', ''), CXXFLAGS=os.environ.get('CXXFLAGS', ''), - LDFLAGS=os.environ.get('LDFLAGS', '')) + LINKFLAGS=os.environ.get('LDFLAGS', '')) env.Append(CCFLAGS='-Wall -Werror -Wno-narrowing') diff -Nru xsettingsd-0.0.20150615+2+gb4999f5e/xsettingsd.1 xsettingsd-0.0.20171105+1+ge4cf9969/xsettingsd.1 --- xsettingsd-0.0.20150615+2+gb4999f5e/xsettingsd.1 2015-06-15 01:02:00.000000000 +0000 +++ xsettingsd-0.0.20171105+1+ge4cf9969/xsettingsd.1 2017-11-05 15:25:41.000000000 +0000 @@ -15,7 +15,7 @@ antialiasing/hinting, and UI sound effects. .PP Additional documentation is available at the project's website: -\fIhttp://code.google.com/p/xsettingsd/\fR +\fIhttps://github.com/derat/xsettingsd\fR .SH OPTIONS .TP \fB\-c\fR, \fB\-\-config\fR=\fIFILE\fR @@ -27,7 +27,7 @@ \fB\-s\fR, \fB\-\-screen\fR=\fISCREEN\fR Use the X screen numbered \fISCREEN\fR (default of -1 means all screens). .SH BUGS -\fIhttp://code.google.com/p/xsettingsd/issues/list\fR +\fIhttps://github.com/derat/xsettingsd/issues\fR .SH EXAMPLE Running \fIdump_xsettings\fR(1) while another XSETTINGS daemon, such as \fBgnome-settings-daemon\fR, is already running will print your current