diff -Nru gkrellmitime-1.0.1/ChangeLog gkrellmitime-1.0.1/ChangeLog --- gkrellmitime-1.0.1/ChangeLog 2016-11-21 00:07:24.000000000 +0000 +++ gkrellmitime-1.0.1/ChangeLog 2003-12-05 13:06:43.000000000 +0000 @@ -5,7 +5,7 @@ Panther. You need fink to compile gkrellmitime. 2002-08-14 Eric Bianchi - * gkrellm_itime.c (create_itime_tab) : patch from Juan Manuel Garcia + * gkrellm_itime.c (create_itime_tab) : patch from Juan Manuel Garca Molina which fixes some gtk problems and add internationalization support. Thanks a lot ! diff -Nru gkrellmitime-1.0.1/debian/changelog gkrellmitime-1.0.1/debian/changelog --- gkrellmitime-1.0.1/debian/changelog 2016-11-21 00:07:24.000000000 +0000 +++ gkrellmitime-1.0.1/debian/changelog 2016-11-20 15:04:02.000000000 +0000 @@ -1,3 +1,17 @@ +gkrellmitime (1.0.1-6) unstable; urgency=low + + * QA upload. + * Convert to source format 3.0 (quilt). + * Convert to dh-style packaging and bump compatibility level to 10. + - also enable all hardening options + * Bump Standards-Version to 3.9.8. + * Convert debian/copyright to DEP5. + * Fix another spelling error found by lintian. + * Add lintian overrides for no-homepage-field and + debian-watch-file-is-missing, as upstream homepage is dead. + + -- Reiner Herrmann Sun, 20 Nov 2016 16:04:02 +0100 + gkrellmitime (1.0.1-5) unstable; urgency=low * QA upload. diff -Nru gkrellmitime-1.0.1/debian/compat gkrellmitime-1.0.1/debian/compat --- gkrellmitime-1.0.1/debian/compat 2016-11-21 00:07:24.000000000 +0000 +++ gkrellmitime-1.0.1/debian/compat 2016-11-20 14:07:39.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru gkrellmitime-1.0.1/debian/control gkrellmitime-1.0.1/debian/control --- gkrellmitime-1.0.1/debian/control 2016-11-21 00:07:24.000000000 +0000 +++ gkrellmitime-1.0.1/debian/control 2016-11-20 14:08:29.000000000 +0000 @@ -2,8 +2,8 @@ Section: misc Priority: optional Maintainer: Debian QA Group -Build-Depends: debhelper (>= 7), gkrellm (>= 2), pkg-config, libgtk2.0-dev -Standards-Version: 3.8.0.1 +Build-Depends: debhelper (>= 10), gkrellm (>= 2), pkg-config, libgtk2.0-dev +Standards-Version: 3.9.8 Package: gkrellmitime Architecture: any diff -Nru gkrellmitime-1.0.1/debian/copyright gkrellmitime-1.0.1/debian/copyright --- gkrellmitime-1.0.1/debian/copyright 2016-11-21 00:07:24.000000000 +0000 +++ gkrellmitime-1.0.1/debian/copyright 2016-11-20 14:42:07.000000000 +0000 @@ -1,28 +1,26 @@ -This package was debianized by Juan Manuel Garcia Molina on -Sun, 23 Jun 2002 16:14:48 +0200. - -It was downloaded from http://eric.bianchi.free.fr/gkrellm/ - -Upstream Author: Eric Bianchi - -Copyright: - - Copyright (C) 2003-2008 Eric Bianchi - - 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; version 2 dated June, 1991. - - 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301, USA. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: gkrellmitime +Upstream-Contact: Eric Bianchi +Source: http://eric.bianchi.free.fr/gkrellm/ + +Files: * +Copyright: 2001-2008 Eric Bianchi +License: GPL-2+ + +Files: debian/* +Copyright: 2002-2008 Juan Manuel Garcia Molina +License: GPL-2+ + +License: GPL-2+ + 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 2 + of the License, or (at your option) any later version. + . + This program 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. + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru gkrellmitime-1.0.1/debian/patches/fix-gcc-4.7-ftbfs-667180.patch gkrellmitime-1.0.1/debian/patches/fix-gcc-4.7-ftbfs-667180.patch --- gkrellmitime-1.0.1/debian/patches/fix-gcc-4.7-ftbfs-667180.patch 1970-01-01 00:00:00.000000000 +0000 +++ gkrellmitime-1.0.1/debian/patches/fix-gcc-4.7-ftbfs-667180.patch 2016-11-20 14:45:29.000000000 +0000 @@ -0,0 +1,15 @@ +Author: Paul Tagliamonte +Description: Fix FTBFS with gcc 4.7 +Bug-Debian: https://bugs.debian.org/667180 + +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ + + + $(TARGET).so: $(TARGET).o +- $(CC) $(LDFLAGS) -shared -Wl `pkg-config gtk+-2.0 --libs` $< -o $@ ++ $(CC) $(LDFLAGS) -shared `pkg-config gtk+-2.0 --libs` $< -o $@ + + $(TARGET).o: $(TARGET).c + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< diff -Nru gkrellmitime-1.0.1/debian/patches/fix_typos.patch gkrellmitime-1.0.1/debian/patches/fix_typos.patch --- gkrellmitime-1.0.1/debian/patches/fix_typos.patch 1970-01-01 00:00:00.000000000 +0000 +++ gkrellmitime-1.0.1/debian/patches/fix_typos.patch 2016-11-20 14:36:50.000000000 +0000 @@ -0,0 +1,27 @@ +Author: Juan Manuel Garcia Molina +Description: Fix typos + - Name in upstream changelog + - Correct unabbreviated name of the GPL + +--- a/ChangeLog ++++ b/ChangeLog +@@ -5,7 +5,7 @@ + Panther. You need fink to compile gkrellmitime. + + 2002-08-14 Eric Bianchi +- * gkrellm_itime.c (create_itime_tab) : patch from Juan Manuel Garca ++ * gkrellm_itime.c (create_itime_tab) : patch from Juan Manuel Garcia + Molina which fixes some gtk problems + and add internationalization support. Thanks a lot ! + +--- a/gkrellm_itime.c ++++ b/gkrellm_itime.c +@@ -271,7 +271,7 @@ + "Copyright (C) 2001-2002 by Eric Bianchi\n" \ + "eric.bianchi@dim.hcuge.ch\n" \ + "\n" \ +- "Released under the GNU Public License\n" \ ++ "Released under the GNU General Public License\n" \ + "GkrellM Internet Time comes with ABSOLUTELY NO WARRANTY\n" \ + , GKRELLM_ITIME_VERSION + ); diff -Nru gkrellmitime-1.0.1/debian/patches/makefile-improvements.patch gkrellmitime-1.0.1/debian/patches/makefile-improvements.patch --- gkrellmitime-1.0.1/debian/patches/makefile-improvements.patch 1970-01-01 00:00:00.000000000 +0000 +++ gkrellmitime-1.0.1/debian/patches/makefile-improvements.patch 2016-11-20 14:44:55.000000000 +0000 @@ -0,0 +1,65 @@ +Author: Juan Manuel Garcia Molina +Description: Improve Makefile to allow external CFLAGS + +--- a/Makefile ++++ b/Makefile +@@ -1,43 +1,33 @@ + # Modify INCLUDE to point to gkrellm.h (if it's not in /usr/local/include) +-INCLUDE = /usr/local/include ++# INCLUDE = /usr/local/include ++ ++PREFIX ?= /usr/local ++PLUGINDIR ?= $(PREFIX)/lib/gkrellm2/plugins ++INCLUDEDIR ?= $(PREFIX)/include ++ ++# Support for Debian policy ++CFLAGS += -I$(INCLUDEDIR) `pkg-config gtk+-2.0 --cflags` ++INSTALL = install ++INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 ++INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + + CC = gcc +-CFLAGS = -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch \ +- -Wcomment-Wparentheses -Wtraditional -Wpointer-arith \ +- -Wmissing-prototypes -O2 -fPIC -I$(INCLUDE) \ +- `pkg-config gtk+-2.0 --cflags` +-LDFLAGS = + TARGET = gkrellm_itime + + + + $(TARGET).so: $(TARGET).o +- $(CC) -shared -Wl `pkg-config gtk+-2.0 --libs` $< -o $@ ++ $(CC) $(LDFLAGS) -shared -Wl `pkg-config gtk+-2.0 --libs` $< -o $@ + + $(TARGET).o: $(TARGET).c +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< + + $(TARGET): $(TARGET).c +- $(CC) $(CFLAGS) $< -o $@ ++ $(CC) $(LDFLAGS) $< -o $@ + + install: +- if [ -d /usr/lib/gkrellm/plugins/ ] ; then \ +- install -c -s -m 644 gkrellm_itime.so /usr/lib/gkrellm/plugins/ ; \ +- elif [ -d /usr/share/gkrellm/plugins/ ] ; then \ +- install -c -s -m 644 gkrellm_itime.so /usr/share/gkrellm/plugins/ ; \ +- elif [ -d /usr/local/lib/gkrellm/plugins/ ] ; then \ +- install -c -s -m 644 gkrellm_itime.so /usr/local/lib/gkrellm/plugins/ ; \ +- elif [ -d /usr/lib/gkrellm/plugins/ ] ; then \ +- install -c -s -m 644 gkrellm_itime.so /usr/lib/gkrellm/plugins/ ; \ +- else \ +- install -D -c -s -m 644 gkrellm_itime.so /usr/lib/gkrellm/plugins/gkrellm_itime.so; \ +- fi +- +-uninstall: +- rm -f /usr/lib/gkrellm/plugins/gkrellm_itime.so +- rm -f /usr/share/gkrellm/plugins/gkrellm_itime.so +- rm -f /usr/local/lib/gkrellm/plugins/gkrellm_itime.so +- rm -f /usr/lib/gkrellm/plugins/gkrellm_itime.so ++ $(INSTALL_DIR) $(PLUGINDIR) ++ $(INSTALL_FILE) gkrellm_itime.so $(PLUGINDIR) + + clean: + rm -f *.o *~ *.so core diff -Nru gkrellmitime-1.0.1/debian/patches/series gkrellmitime-1.0.1/debian/patches/series --- gkrellmitime-1.0.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gkrellmitime-1.0.1/debian/patches/series 2016-11-20 14:35:13.000000000 +0000 @@ -0,0 +1,3 @@ +makefile-improvements.patch +fix_typos.patch +fix-gcc-4.7-ftbfs-667180.patch diff -Nru gkrellmitime-1.0.1/debian/rules gkrellmitime-1.0.1/debian/rules --- gkrellmitime-1.0.1/debian/rules 2016-11-21 00:07:24.000000000 +0000 +++ gkrellmitime-1.0.1/debian/rules 2016-11-20 14:47:56.000000000 +0000 @@ -1,54 +1,12 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -CFLAGS = -Wall -g -fPIC +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +%: + dh $@ -export CFLAGS +override_dh_auto_build: + dh_auto_build -- INCLUDEDIR=/usr/include:/usr/include/gkrellm PREFIX=/usr -build: build-arch build-indep -build-indep: build-stamp -build-arch: build-stamp -build-stamp: - dh_testdir - $(MAKE) INCLUDEDIR=/usr/include:/usr/include/gkrellm PREFIX=/usr - touch build-stamp - -clean: - dh_testdir - dh_testroot - [ ! -f Makefile ] || $(MAKE) clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) PREFIX=$(CURDIR)/debian/gkrellmitime/usr install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-arch binary install +override_dh_auto_install: + dh_auto_install -- PREFIX=$(CURDIR)/debian/gkrellmitime/usr diff -Nru gkrellmitime-1.0.1/debian/source/format gkrellmitime-1.0.1/debian/source/format --- gkrellmitime-1.0.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ gkrellmitime-1.0.1/debian/source/format 2016-11-20 14:10:48.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru gkrellmitime-1.0.1/debian/source/lintian-overrides gkrellmitime-1.0.1/debian/source/lintian-overrides --- gkrellmitime-1.0.1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ gkrellmitime-1.0.1/debian/source/lintian-overrides 2016-11-20 15:02:12.000000000 +0000 @@ -0,0 +1,3 @@ +# Upstream homepage and download location is dead +gkrellmitime source: no-homepage-field +gkrellmitime source: debian-watch-file-is-missing diff -Nru gkrellmitime-1.0.1/Makefile gkrellmitime-1.0.1/Makefile --- gkrellmitime-1.0.1/Makefile 2016-11-21 00:07:24.000000000 +0000 +++ gkrellmitime-1.0.1/Makefile 2003-11-04 18:02:30.000000000 +0000 @@ -1,23 +1,18 @@ # Modify INCLUDE to point to gkrellm.h (if it's not in /usr/local/include) -# INCLUDE = /usr/local/include - -PREFIX ?= /usr/local -PLUGINDIR ?= $(PREFIX)/lib/gkrellm2/plugins -INCLUDEDIR ?= $(PREFIX)/include - -# Support for Debian policy -CFLAGS += -I$(INCLUDEDIR) `pkg-config gtk+-2.0 --cflags` -INSTALL = install -INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 -INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 +INCLUDE = /usr/local/include CC = gcc +CFLAGS = -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch \ + -Wcomment-Wparentheses -Wtraditional -Wpointer-arith \ + -Wmissing-prototypes -O2 -fPIC -I$(INCLUDE) \ + `pkg-config gtk+-2.0 --cflags` +LDFLAGS = TARGET = gkrellm_itime $(TARGET).so: $(TARGET).o - $(CC) -shared `pkg-config gtk+-2.0 --libs` $< -o $@ + $(CC) -shared -Wl `pkg-config gtk+-2.0 --libs` $< -o $@ $(TARGET).o: $(TARGET).c $(CC) $(CFLAGS) -c $< @@ -26,8 +21,23 @@ $(CC) $(CFLAGS) $< -o $@ install: - $(INSTALL_DIR) $(PLUGINDIR) - $(INSTALL_FILE) gkrellm_itime.so $(PLUGINDIR) + if [ -d /usr/lib/gkrellm/plugins/ ] ; then \ + install -c -s -m 644 gkrellm_itime.so /usr/lib/gkrellm/plugins/ ; \ + elif [ -d /usr/share/gkrellm/plugins/ ] ; then \ + install -c -s -m 644 gkrellm_itime.so /usr/share/gkrellm/plugins/ ; \ + elif [ -d /usr/local/lib/gkrellm/plugins/ ] ; then \ + install -c -s -m 644 gkrellm_itime.so /usr/local/lib/gkrellm/plugins/ ; \ + elif [ -d /usr/lib/gkrellm/plugins/ ] ; then \ + install -c -s -m 644 gkrellm_itime.so /usr/lib/gkrellm/plugins/ ; \ + else \ + install -D -c -s -m 644 gkrellm_itime.so /usr/lib/gkrellm/plugins/gkrellm_itime.so; \ + fi + +uninstall: + rm -f /usr/lib/gkrellm/plugins/gkrellm_itime.so + rm -f /usr/share/gkrellm/plugins/gkrellm_itime.so + rm -f /usr/local/lib/gkrellm/plugins/gkrellm_itime.so + rm -f /usr/lib/gkrellm/plugins/gkrellm_itime.so clean: rm -f *.o *~ *.so core