diff -Nru 9menu-1.8/debian/changelog 9menu-1.8/debian/changelog --- 9menu-1.8/debian/changelog 2010-12-19 21:58:12.000000000 +0000 +++ 9menu-1.8/debian/changelog 2012-08-25 23:56:29.000000000 +0000 @@ -1,3 +1,17 @@ +9menu (1.8-6) unstable; urgency=low + + * debian/control + + Bump standard versions 3.9.3 + + Update to DEP5 copyright format 1.0 + + Change debhelper to 9 in B-D + + Order Depends and Build-Depends + * debian/compat + + Switch compat level 7 to 9 + * debian/rules + + Use Hardening flags + + -- Daniel Echeverry Wed, 22 Aug 2012 18:52:13 -0500 + 9menu (1.8-5) unstable; urgency=low * Fix resource leak:fp LP: #479042 diff -Nru 9menu-1.8/debian/compat 9menu-1.8/debian/compat --- 9menu-1.8/debian/compat 2010-10-31 18:33:37.000000000 +0000 +++ 9menu-1.8/debian/compat 2012-08-22 23:53:50.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru 9menu-1.8/debian/control 9menu-1.8/debian/control --- 9menu-1.8/debian/control 2010-11-06 19:32:54.000000000 +0000 +++ 9menu-1.8/debian/control 2012-08-23 01:53:24.000000000 +0000 @@ -2,14 +2,13 @@ Section: x11 Priority: optional Maintainer: Daniel Echeverry -Build-Depends: libx11-dev, x11proto-core-dev, debhelper (>= 7.0.50), xutils-dev -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9.0), libx11-dev, x11proto-core-dev, xutils-dev +Standards-Version: 3.9.3 Package: 9menu Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Creates X menus from the shell This is a simple program that allows you to create X menus from the shell, where each menu item will run a command. 9menu is intended for use with 9wm, but can be used with any other window manager. - diff -Nru 9menu-1.8/debian/copyright 9menu-1.8/debian/copyright --- 9menu-1.8/debian/copyright 2010-09-27 00:07:54.000000000 +0000 +++ 9menu-1.8/debian/copyright 2012-08-23 01:57:31.000000000 +0000 @@ -1,24 +1,46 @@ -This is the Debian GNU/Linux prepackaged version of 9menu. - -This package was put together by Stephen Frost , -from sources obtained from: - - ftp://freefriends.org/arnold/Source/9menu-1.6.shar.gz - -Licence: - - 9menu is free software, and is Copyright (c) 1994 by David Hogan and - Arnold Robbins. Permission is granted to all sentient beings to use - this software, to make copies of it, and to distribute those copies, - provided that: - - (1) the copyright and licence notices are left intact - (2) the recipients are aware that it is free software - (3) any unapproved changes in functionality are either - (i) only distributed as patches - or (ii) distributed as a new program which is not called 9menu - and whose documentation gives credit where it is due - (4) the authors are not held responsible for any defects - or shortcomings in the software, or damages caused by it. - - There is no warranty for this software. Have a nice day. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: 9menu +Source: ftp://ftp.freefriends.org/arnold/Source/ + +Files: * +Copyright: Copyright 2004 Arnold Robbins +License: + 9menu is free software, and is Copyright (c) 1994 by David Hogan and + Arnold Robbins. Permission is granted to all sentient beings to use + this software, to make copies of it, and to distribute those copies, + provided that: + . + (1) the copyright and licence notices are left intact + (2) the recipients are aware that it is free software + (3) any unapproved changes in functionality are either + (i) only distributed as patches or (ii) distributed + as a new program which is not called 9menu and whose + documentation gives credit where it is due + (4) the authors are not held responsible for any defects + or shortcomings in the software, or damages caused by it. + . + There is no warranty for this software. Have a nice day. + +Files: debian/* +Copyright: 2011-2012 Daniel Echeverry + 2003-2005 Andrew Stribblehill + 2000-2003 Stephen Frost + 1996-2000 Karl Sackett +License: GPL-3.0+ + +License: GPL-3.0+ + 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 + the Free Software Foundation, either version 3 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 version 3 can be found in "/usr/share/common-licenses/GPL-3". diff -Nru 9menu-1.8/debian/rules 9menu-1.8/debian/rules --- 9menu-1.8/debian/rules 2010-11-15 05:31:04.000000000 +0000 +++ 9menu-1.8/debian/rules 2012-08-26 00:37:11.000000000 +0000 @@ -1,22 +1,16 @@ #!/usr/bin/make -f -CC = gcc -CFLAGS = -g -Wall - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - +CC := gcc +CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS := $(shell dpkg-buildflags --get CFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) %: dh $@ - override_dh_auto_build: xmkmf - dh_auto_build -- CC="$(CC)" CCOPTIONS+="$(CFLAGS)" 9menu + dh_auto_build -- CC="$(CC)" CCOPTIONS+="$(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" 9menu override_dh_installchangelogs: sed -n '1,/\*\// {s/^.*\*[ /]\?//; s/9menu.c/Taken from &/; p}' 9menu.c > changelog