diff -Nru g2-0.72/debian/changelog g2-0.72/debian/changelog --- g2-0.72/debian/changelog 2017-11-02 05:44:38.000000000 +0000 +++ g2-0.72/debian/changelog 2017-11-07 10:33:32.000000000 +0000 @@ -1,14 +1,15 @@ -g2 (0.72-6ubuntu1) bionic; urgency=medium +g2 (0.72-7) unstable; urgency=medium - * Build-depend on libgd-dev instead of obsolete libgd2-dev + * Moved packaging from SVN to Git + * Standards-Version: 4.1.1 + * build-depend on libgd-dev, not libgd2-dev + Closes: #880550 + * Drop explicit autoreconf which is default in debhelper 10 + * DEP5 + * hardening=+all + * DEP3 - -- Steve Langasek Wed, 01 Nov 2017 22:44:38 -0700 - -g2 (0.72-6build1) artful; urgency=medium - - * No-change rebuild for perl 5.26.0. - - -- Matthias Klose Wed, 26 Jul 2017 19:52:13 +0000 + -- Andreas Tille Tue, 07 Nov 2017 11:33:32 +0100 g2 (0.72-6) unstable; urgency=medium diff -Nru g2-0.72/debian/control g2-0.72/debian/control --- g2-0.72/debian/control 2017-11-02 05:44:38.000000000 +0000 +++ g2-0.72/debian/control 2017-11-07 10:33:32.000000000 +0000 @@ -1,21 +1,17 @@ Source: g2 -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team +Maintainer: Debian Med Packaging Team Uploaders: Andreas Tille Section: libs Priority: optional Build-Depends: debhelper (>= 10), - autotools-dev, - autoconf, - dh-autoreconf, libtool, libx11-dev, chrpath, libgd-dev, xutils-dev -Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/libg2/trunk/ -Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libg2/trunk/ +Standards-Version: 4.1.1 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/g2.git +Vcs-Git: https://anonscm.debian.org/git/debian-med/g2.git Homepage: https://github.com/danielrmeyer/g2/ Package: libg2-dev diff -Nru g2-0.72/debian/copyright g2-0.72/debian/copyright --- g2-0.72/debian/copyright 2017-01-14 13:52:05.000000000 +0000 +++ g2-0.72/debian/copyright 2017-11-07 10:33:32.000000000 +0000 @@ -7,15 +7,15 @@ © 1998-2001 Horst Wagner © 1999 Tijs Michels © 1999-2000 The University of Chicago -License: LGPLv2+ +License: LGPL-2+ Files: debian/* Copyright: © 1998-1999 John Lapeyre © 2001-2005 Eric Cain © 2011-2017 Andreas Tille -License: LGPLv2+ +License: LGPL-2+ -License: LGPLv2+ +License: LGPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -26,10 +26,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. . - You should have received a copy of the GNU Lesser 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 systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2'. diff -Nru g2-0.72/debian/debian/control g2-0.72/debian/debian/control --- g2-0.72/debian/debian/control 1970-01-01 00:00:00.000000000 +0000 +++ g2-0.72/debian/debian/control 2017-11-07 10:33:32.000000000 +0000 @@ -0,0 +1,5 @@ +Source: debian +Maintainer: Andreas Tille +Section: misc +Priority: optional +Standards-Version: 4.1.1 diff -Nru g2-0.72/debian/patches/020_makefile_pl_in.diff g2-0.72/debian/patches/020_makefile_pl_in.diff --- g2-0.72/debian/patches/020_makefile_pl_in.diff 2013-11-10 07:20:00.000000000 +0000 +++ g2-0.72/debian/patches/020_makefile_pl_in.diff 2017-11-07 10:33:32.000000000 +0000 @@ -1,3 +1,7 @@ +Author: Andreas Tille +Last-Update: 2011-02-23 13:11:43 +0000 +Description: Fix -L path and add missing include directives + --- a/g2_perl/Makefile.PL.in +++ b/g2_perl/Makefile.PL.in @@ -4,7 +4,7 @@ use ExtUtils::MakeMaker; diff -Nru g2-0.72/debian/patches/030_makefile_in.diff g2-0.72/debian/patches/030_makefile_in.diff --- g2-0.72/debian/patches/030_makefile_in.diff 2013-11-10 07:19:57.000000000 +0000 +++ g2-0.72/debian/patches/030_makefile_in.diff 2017-11-07 10:33:32.000000000 +0000 @@ -1,3 +1,7 @@ +Author: Andreas Tille +Last-Update: 2011-02-23 13:11:43 +0000 +Description: Fix clean, build and install targets + --- a/Makefile.in +++ b/Makefile.in @@ -32,7 +32,7 @@ ARFLAGS = -cr diff -Nru g2-0.72/debian/patches/fix_linker_libs.diff g2-0.72/debian/patches/fix_linker_libs.diff --- g2-0.72/debian/patches/fix_linker_libs.diff 2013-11-10 07:30:31.000000000 +0000 +++ g2-0.72/debian/patches/fix_linker_libs.diff 2017-11-07 10:33:32.000000000 +0000 @@ -1,3 +1,7 @@ +Author: Andreas Tille +Last-Update: 2013-11-10 07:26:19 +0000 +Description: Add missing libs for linker + --- a/configure.in +++ b/configure.in @@ -16,7 +16,7 @@ case "$host" in diff -Nru g2-0.72/debian/patches/fix_pod2man_errors.diff g2-0.72/debian/patches/fix_pod2man_errors.diff --- g2-0.72/debian/patches/fix_pod2man_errors.diff 2013-11-10 07:19:49.000000000 +0000 +++ g2-0.72/debian/patches/fix_pod2man_errors.diff 2017-11-07 10:33:32.000000000 +0000 @@ -1,3 +1,7 @@ +Author: Andreas Tille +Last-Update: 2013-11-10 07:26:19 +0000 +Description: Fix manpage + --- a/g2_perl/G2.pm +++ b/g2_perl/G2.pm @@ -148,8 +148,12 @@ a second window showing a zoom of a mor diff -Nru g2-0.72/debian/patches/stabelise_makefile.diff g2-0.72/debian/patches/stabelise_makefile.diff --- g2-0.72/debian/patches/stabelise_makefile.diff 2013-11-10 07:19:39.000000000 +0000 +++ g2-0.72/debian/patches/stabelise_makefile.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -9,8 +9,8 @@ G2_VERSION = 0.72 - # - # g2 installation directories - # --LIBDIR = /usr/local/lib --INCDIR = /usr/local/include -+LIBDIR = /usr/lib -+INCDIR = /usr/include - - - #LIBDIR = $(HOME)/local/lib -@@ -21,8 +21,8 @@ INCDIR = /usr/local/include - # - SHELL = /bin/sh - --CC = gcc --CFLAGS = -I./src -O2 -I/usr/local/include -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DLINUX=1 -DDO_PS=1 -DDO_FIG=1 -DDO_X11=1 -DDO_XDBE=1 -DDO_GD=1 -DDO_GIF=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -+CC = x86_64-linux-gnu-gcc -+CFLAGS = -I./src -Wall -g -O2 -Wl,-z,defs -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DLINUX=1 -DDO_PS=1 -DDO_FIG=1 -DDO_X11=1 -DDO_XDBE=1 -DDO_GD=1 -DDO_GIF=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 - INSTALL = /usr/bin/install -c - INSTALL_DATA = ${INSTALL} -m 644 - FIND = find -@@ -32,7 +32,7 @@ ARFLAGS = -cr - RANLIB = ranlib - LD = ld - LDFLAGS = -- -+LN_S = ln -s - - BASE_DIR = ./src - BASE_SRC = $(BASE_DIR)/g2_device.c $(BASE_DIR)/g2_ui_control.c \ -@@ -79,33 +79,40 @@ INS = $(BASE_INS) $(PS_INS) $(FIG_INS) - # major rule - # - .c.o: -- $(CC) $(CFLAGS) -c $< -o $@ -+ $(CC) $(CFLAGS) $(PICFLAG) -c $< -o $@ - - - all: libg2.a - test -d ./include || mkdir ./include - cp $(INS) ./include/ - --shared: libg2.so.0.$(G2_VERSION) -+shared: libg2.so.$(RVERSION) - @echo - - - libg2.a: $(OBJ) - $(AR) $(ARFLAGS) libg2.a $(OBJ) - test ! -n "$(RANLIB)" || $(RANLIB) $@ -+ $(LN_S) -f libg2.a libg2.$(RVERSION).a - --libg2.so.0.$(G2_VERSION): $(OBJ) -- ld -shared -soname libg2.so.0 -o $@ $(OBJ) -+libg2.so.$(RVERSION): $(OBJ) -+ x86_64-linux-gnu-gcc -Wl,-soname,$@ -shared $(OBJ) -lc -lm -lX11 -lgd -o $@ -+ test ! -f libg2.so && $(LN_S) $@ libg2.so -+ test ! -f libg2.so.$(MVERSION) && $(LN_S) $@ libg2.so.$(MVERSION) - --libg2.so: libg2.so.0.$(G2_VERSION) -- ln -f -s libg2.so.0.$(G2_VERSION) $@ -+libg2.so: libg2.so.$(RVERSION) -+ ln -f -s libg2.so.$(RVERSION) $@ - - install: libg2.a -- test -d $(LIBDIR) || mkdir -p $(LIBDIR) -- test -d $(INCDIR) || mkdir -p $(INCDIR) -- $(INSTALL_DATA) libg2.a $(LIBDIR) -+ test -d $(prefix)$(LIBDIR) || mkdir -p $(prefix)$(LIBDIR) -+ test -d $(prefix)$(INCDIR) || mkdir -p $(prefix)$(INCDIR) -+ $(INSTALL_DATA) libg2.a $(prefix)$(LIBDIR) -+ test -f libg2.so.$(RVERSION) && \ -+ $(INSTALL_DATA) libg2.so.$(RVERSION) $(prefix)$(LIBDIR) && \ -+ $(LN_S) libg2.so.$(RVERSION) $(prefix)$(LIBDIR)/libg2.so.$(MVERSION) && \ -+ $(LN_S) libg2.so.$(RVERSION) $(prefix)$(LIBDIR)/libg2.so - for IFILE in $(INS); do \ -- $(INSTALL_DATA) $$IFILE $(INCDIR); \ -+ $(INSTALL_DATA) $$IFILE $(prefix)$(INCDIR); \ - done - - release: clean doc -@@ -119,10 +126,10 @@ doc: - - - clean: -- -(cd ./demo ; make clean) -+ #(cd ./demo ; make clean) - -(cd ./g2_python ; make clean) - -rm -f $(OBJ) -- -rm -f libg2.a config.cache config.log Makefile.bak config.status -+ -rm -f libg2.a config.cache config.log config.status - -rm -f ./include/*.h - -$(FIND) . -name "*~" -exec rm -f {} \; - -(cd ./g2_perl ; make clean) -@@ -131,10 +138,15 @@ clean: - -rm -f ./g2_perl/test.jpg - -rm -f ./g2_perl/test.fig - -rm -f ./g2_perl/Makefile.old -- -rm -f ./libg2.so.0.$(G2_VERSION) -- -rm -f libg2.$(G2_VERSION).a -+ -rm -f ./libg2.so.$(RVERSION) -+ -rm -f ./libg2.so.$(MVERSION) -+ -rm -f ./libg2.$(RVERSION).a -+ -rm -f ./libg2.$(MVERSION).a -+ -rm -f libg2.so - -rm -f a.out -- -rm -fr doc/html/ doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf -+ -+doc_clean: -+ -rm -fr doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf - - demo: libg2.a - (cd ./demo ; make) diff -Nru g2-0.72/debian/rules g2-0.72/debian/rules --- g2-0.72/debian/rules 2013-12-16 16:11:48.000000000 +0000 +++ g2-0.72/debian/rules 2017-11-07 10:33:32.000000000 +0000 @@ -9,8 +9,10 @@ pkglib=libg20 pkgdev=libg2-dev +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + %: - dh $@ --with autotools_dev,autoreconf + dh $@ # Compile with -fPIC on all platforms #override_dh_auto_configure: