diff -Nru wmshutdown-0.2/debian/changelog wmshutdown-0.2/debian/changelog --- wmshutdown-0.2/debian/changelog 2009-12-17 12:22:05.000000000 +0000 +++ wmshutdown-0.2/debian/changelog 2012-03-24 07:06:41.000000000 +0000 @@ -1,3 +1,49 @@ +wmshutdown (0.2-9) unstable; urgency=low + + * debian/copyright + - Update to format 1.0 + + -- Jari Aalto Sat, 24 Mar 2012 02:47:56 -0400 + +wmshutdown (0.2-8) unstable; urgency=low + + * debian/rules + - Enable all hardening flags with DEB_BUILD_MAINT_OPTIONS and + reading Debian specific CPPFLAGS. + + -- Jari Aalto Tue, 06 Mar 2012 10:55:18 -0500 + +wmshutdown (0.2-7) unstable; urgency=low + + * debian/control + - Build-Depends: rm dpkg-dev; buildflags.mk no longer used. + - (Standards-Version): Update to 3.9.3 + * debian/patches + - (10): Adjust patch to actually use LDFLAGS and CFLAGS to + enable hardened CFLAGS. Patch thanks to Simon Ruderich + (Closes: #662010). + * debian/rules + - Remove buildflags.mk which is unnecessary with compat 9. + Change to DEB_*_MAINT_APPEND variables. + Both changes thanks to Simon Ruderich . + + -- Jari Aalto Sun, 04 Mar 2012 12:00:34 -0500 + +wmshutdown (0.2-6) unstable; urgency=low + + * debian/compat + - Update to 9 + * debian/control + - (Build-Depends): update to debhelper 9, dpkg-dev 1.16.1. + * debian/copyright + - Update to DEP5. + * debian/rules + - Remove unused targets. + - Use hardened CFLAGS. + http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags + + -- Jari Aalto Wed, 15 Feb 2012 08:16:19 -0500 + wmshutdown (0.2-5) unstable; urgency=low * Move to format: 3.0 (quilt). diff -Nru wmshutdown-0.2/debian/compat wmshutdown-0.2/debian/compat --- wmshutdown-0.2/debian/compat 2009-12-17 12:22:05.000000000 +0000 +++ wmshutdown-0.2/debian/compat 2012-03-24 07:06:41.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru wmshutdown-0.2/debian/control wmshutdown-0.2/debian/control --- wmshutdown-0.2/debian/control 2009-12-17 12:22:05.000000000 +0000 +++ wmshutdown-0.2/debian/control 2012-03-24 07:06:41.000000000 +0000 @@ -2,8 +2,8 @@ Section: x11 Priority: optional Maintainer: Jari Aalto -Build-Depends: debhelper (>= 7), libgtk2.0-dev -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 9), libgtk2.0-dev +Standards-Version: 3.9.3.1 Vcs-Git: http://git.debian.org/collab-maint/wmshutdown.git Vcs-Browser: http://git.debian.org/?p=collab-maint/wmshutdown.git;a=summary Homepage: http://www.rafaelaroca.hpg.ig.com.br/bin diff -Nru wmshutdown-0.2/debian/copyright wmshutdown-0.2/debian/copyright --- wmshutdown-0.2/debian/copyright 2009-12-17 12:22:05.000000000 +0000 +++ wmshutdown-0.2/debian/copyright 2012-03-24 07:06:41.000000000 +0000 @@ -1,41 +1,37 @@ -This package was first debianized by: - - Rafal Zawadzki on 2002-12-23 21:34:11+02 Tue. - -It was downloaded from - - http://www.rafaelaroca.hpg.ig.com.br/bin - As of 2009-11-28 the package no longer exists there. - -Upstream Author: - - Rafael Vidal Aroca , - , , - , +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Upstream-Name: +Upstream-Contact: Rafael Vidal Aroca +Source: None +X-Upstream-Comment: + Dead upstream. + 2009-11-28 Sources no longer at . +Files: * Copyright: + 2002-2007 Rafael Vidal Aroca , + , , + , +License: GPL-2+ - Copyright (C) 2002-2007 Rafael Vidal Aroca - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -The Debian packaging is licensed under the GPL, see below, and is: - - Copyright (C) 2007-2009 Jari Aalto - Copyright (C) 2002 Rafal Zawadzki - -On Debian systems, the complete text of the GNU General -Public License can be found in "/usr/share/common-licenses/GPL-2". +Files: debian/* +Copyright: + 2007-2012 Jari Aalto + 2002 Rafal Zawadzki +License: GPL-2+ + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License can be found in "/usr/share/common-licenses/GPL-2". diff -Nru wmshutdown-0.2/debian/docs wmshutdown-0.2/debian/docs --- wmshutdown-0.2/debian/docs 2009-12-17 12:22:05.000000000 +0000 +++ wmshutdown-0.2/debian/docs 2012-03-24 07:06:41.000000000 +0000 @@ -1,2 +1 @@ README - diff -Nru wmshutdown-0.2/debian/patches/10-makefile.patch wmshutdown-0.2/debian/patches/10-makefile.patch --- wmshutdown-0.2/debian/patches/10-makefile.patch 2009-12-17 12:22:05.000000000 +0000 +++ wmshutdown-0.2/debian/patches/10-makefile.patch 2012-03-24 07:06:41.000000000 +0000 @@ -3,6 +3,9 @@ Date: Thu, 17 Dec 2009 14:20:10 +0200 Subject: [PATCH] Makefile: Change name. Fix linking with GTK+ +Also use CFLAGS, CPPFLAGS, LDFLAGS from the environment. Necessary to use +(hardening) compiler flags specified by dh. + Signed-off-by: Jari Aalto --- Makefile | 32 ++++++++++++++++++++------------ @@ -15,7 +18,7 @@ @@ -1,4 +1,15 @@ -all: + -+LDFLAGS = -Wl,--no-add-needed -Wl,--no-undefined ++LDFLAGS += -Wl,--no-add-needed -Wl,--no-undefined +INCFLAGS = -I/usr/include/gtk-2.0 +LIBS = -lX11 + @@ -54,12 +57,12 @@ dock: wmShutdown.c - $(CC) -c -o wmShutdown.o wmShutdown.c `gtk-config --cflags` - $(CC) -o wmShutdown wmShutdown.o `gtk-config --libs` -+ $(CC) $(INCFLAGS) $(GTKFLAGS) -c -o wmShutdown.o wmShutdown.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(INCFLAGS) $(GTKFLAGS) -c -o wmShutdown.o wmShutdown.c + $(CC) $(LDFLAGS) -o wmShutdown wmShutdown.o $(GTKLIBS) $(LIBS) shutdown: shutdown.c - $(CC) -o Shutdown shutdown.c -+ $(CC) $(LDFLAGS) $(INCFLAGS) -o Shutdown shutdown.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCFLAGS) -o Shutdown shutdown.c -- 1.6.5 diff -Nru wmshutdown-0.2/debian/rules wmshutdown-0.2/debian/rules --- wmshutdown-0.2/debian/rules 2009-12-17 12:22:05.000000000 +0000 +++ wmshutdown-0.2/debian/rules 2012-03-24 07:06:41.000000000 +0000 @@ -1,74 +1,22 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 +PACKAGE = wmshutdown +PACKAGE2 = wmshutdown-run -PACKAGE = wmshutdown -PACKAGE2 = wmshutdown-run -PKGDIR = $(CURDIR)/debian/$(PACKAGE) - -MANSECT = 1 -MANPAGE1 = debian/$(PACKAGE).$(MANSECT) -MANPAGE2 = debian/$(PACKAGE2).$(MANSECT) -MK_MAN = pod2man.mk +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed man: - # Commands to build manual pages - $(MAKE) -C debian -f $(MK_MAN) PACKAGE=$(PACKAGE) \ - MANSECT=$(MANSECT) makeman - - $(MAKE) -C debian -f $(MK_MAN) PACKAGE=$(PACKAGE2) \ - MANSECT=$(MANSECT) makeman - -install: build man - # target: install - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - $(MAKE) install DESTDIR=$(PKGDIR) - - # Won't make a difference: *.deb will not preserve this. - # chmod ug+s $(BINDIR)/$(PACKAGE2) - # Instructions recorded in README.Debian - -binary-arch: build install - # target: binary-arch -- Build architecture-dependent files - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs -# dh_installexamples - dh_installmenu -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit - dh_installcron - dh_installman - dh_installinfo -# dh_undocumented - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE) makeman + $(MAKE) -C debian -f pod2man.mk PACKAGE=$(PACKAGE2) makeman -binary: binary-arch +override_dh_auto_build: man + dh_auto_build %: dh $@ -.PHONY: man configure install -.PHONY: binary-indep binary-arch binary +.PHONY: man # End of file