diff -Nru wmanager-0.2.1/debian/changelog wmanager-0.2.1/debian/changelog --- wmanager-0.2.1/debian/changelog 2010-11-30 11:03:16.000000000 +0000 +++ wmanager-0.2.1/debian/changelog 2011-03-01 18:18:04.000000000 +0000 @@ -1,3 +1,22 @@ +wmanager (0.2.1-11) unstable; urgency=low + + * Update the copyright file to the latest DEP 5 candidate format. + * Upload to unstable. + + -- Peter Pentchev Tue, 01 Mar 2011 20:18:01 +0200 + +wmanager (0.2.1-10) experimental; urgency=low + + * Switch to Git and point the Vcs-* fields to Gitorious. + * Use bzip2 compression for the Debian tarball. + * Bump the debhelper compatibility level to 8 with no changes. + * Harden the build by default and use hardening-includes instead of + the hardening-wrapper. + * Use := instead of = to optimize some shell invocations in the rules file. + * Bump the year on my copyright notice. + + -- Peter Pentchev Thu, 06 Jan 2011 14:50:28 +0200 + wmanager (0.2.1-9) unstable; urgency=low * Bump Standards-Version to 3.9.1 with no changes. diff -Nru wmanager-0.2.1/debian/compat wmanager-0.2.1/debian/compat --- wmanager-0.2.1/debian/compat 2010-11-30 11:02:13.000000000 +0000 +++ wmanager-0.2.1/debian/compat 2011-01-06 12:43:21.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru wmanager-0.2.1/debian/control wmanager-0.2.1/debian/control --- wmanager-0.2.1/debian/control 2010-11-30 11:02:13.000000000 +0000 +++ wmanager-0.2.1/debian/control 2011-01-06 12:43:21.000000000 +0000 @@ -4,10 +4,11 @@ Maintainer: Peter Pentchev DM-Upload-Allowed: yes Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7~), libfltk1.1-dev +Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.15.7~), hardening-includes, + libfltk1.1-dev Homepage: http://www.daemogorgon.net/software/wmanager/ -Vcs-Svn: http://svn.ringlet.net/svn/ringlet/x11/wmanager/trunk/wmanager-pkg/debian/ -Vcs-Browser: http://svn.ringlet.net/v/ringlet/x11/wmanager/trunk/wmanager-pkg/debian/ +Vcs-Git: git://gitorious.org/wmanager/wmanager-pkg-debian/ +Vcs-Browser: http://gitorious.org/wmanager/wmanager-pkg-debian/ Package: wmanager Architecture: any diff -Nru wmanager-0.2.1/debian/copyright wmanager-0.2.1/debian/copyright --- wmanager-0.2.1/debian/copyright 2010-06-28 10:52:23.000000000 +0000 +++ wmanager-0.2.1/debian/copyright 2011-03-01 18:12:38.000000000 +0000 @@ -1,13 +1,13 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: wmanager -Maintainer: Meik Tessmer +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Upstream-Name: wmanager +Upstream-Contact: Meik Tessmer Files: * Copyright: Copyright (C) 1999 M. Tessmer License: GPL-2+ Files: debian/* -Copyright: Copyright (C) 2008-2010 Peter Pentchev +Copyright: Copyright (C) 2008-2011 Peter Pentchev Copyright (C) 1999-2005 Tommi Virtanen License: GPL-2+ diff -Nru wmanager-0.2.1/debian/rules wmanager-0.2.1/debian/rules --- wmanager-0.2.1/debian/rules 2010-06-28 10:49:23.000000000 +0000 +++ wmanager-0.2.1/debian/rules 2011-01-06 12:43:21.000000000 +0000 @@ -1,8 +1,8 @@ #!/usr/bin/make -f -CXXFLAGS= $(shell dpkg-buildflags --get CXXFLAGS) -CPPFLAGS= $(shell dpkg-buildflags --get CPPFLAGS) -LDFLAGS= $(shell dpkg-buildflags --get LDFLAGS) +CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) +CPPFLAGS:= $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS:= $(shell dpkg-buildflags --get LDFLAGS) CXX= g++ # Use this for QA tests with newer versions of GCC @@ -14,11 +14,13 @@ ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS))) CXXFLAGS_WARN+= -Werror endif -ifneq (,$(filter hardening,$(DEB_BUILD_OPTIONS))) -export DEB_BUILD_HARDENING=1 -else -export DEB_BUILD_HARDENING=0 + +include /usr/share/hardening-includes/hardening.make +ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS))) +CXXFLAGS+= $(HARDENING_CFLAGS) +LDFLAGS+= $(HARDENING_LDFLAGS) endif + export CXX CPPFLAGS CXXFLAGS CXXFLAGS_WARN LDFLAGS STRIP override_dh_auto_test: diff -Nru wmanager-0.2.1/debian/source/options wmanager-0.2.1/debian/source/options --- wmanager-0.2.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ wmanager-0.2.1/debian/source/options 2011-01-06 12:43:21.000000000 +0000 @@ -0,0 +1,2 @@ +compression = "bzip2" +compression-level = 9 diff -Nru wmanager-0.2.1/debian/wmanagerrc-update wmanager-0.2.1/debian/wmanagerrc-update --- wmanager-0.2.1/debian/wmanagerrc-update 2010-11-30 11:02:21.000000000 +0000 +++ wmanager-0.2.1/debian/wmanagerrc-update 2011-01-06 12:45:21.000000000 +0000 @@ -2,7 +2,7 @@ # wmanagerrc-update -- update your wmanager settings automatically # Copyright (C) 2000 Tommi Virtanen -# Copyright (C) 2008 Peter Pentchev +# Copyright (C) 2008, 2010 Peter Pentchev # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by