diff -Nru gip-1.7.0-1/debian/changelog gip-1.7.0-1/debian/changelog --- gip-1.7.0-1/debian/changelog 2020-03-22 15:42:24.000000000 +0000 +++ gip-1.7.0-1/debian/changelog 2020-07-11 05:00:18.000000000 +0000 @@ -1,8 +1,46 @@ -gip (1.7.0-1-4build1) focal; urgency=medium +gip (1.7.0-1-5) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * New maintainer. + Thanks to Ignace Mouzannar, the last maintainer. (Closes: 955987) + * Ran wrap-and-sort. + * Using new DH level format. Consequently: + - debian/compat: removed. + - debian/control: changed from 'debhelper' to 'debhelper-compat' in + Build-Depends field and bumped level to 13. + * debian/control: + - Added 'Rules-Requires-Root: binary-targets' to source stanza. + - Added the field Homepage. + - Added VCS fields. + - Bumped Standards-Version to 4.5.0. + * debian/copyright: + - Migrated to 1.0 format. Full updated. + - Updated the field Source. + * debian/gip.docs: removed README.source. + * debian/patches: + - Renamed all patches: + ~ 010_gen-sh.patch + ~ 020_build-sh.patch + ~ 030_gip-desktop.patch + ~ 040_init-lock-events.patch + ~ 050_installer-build-files-sh.patch + ~ 060_binary-hex-network-update.patch + ~ 070_remove-header.patch + ~ 080_debian-hardening.patch + ~ 090_desktop-file.patch + - 020_build-sh.patch: updated to fixed the package reproducibility. + Thanks to Reiner Herrmann . (Closes: 842868) + - 080_debian-hardening.patch: updated to set CPPFLAGS. + * debian/README.source: removed. + * debian/rules: + - Added CPPFLAGS. + - Added DEB_BUILD_MAINT_OPTIONS. + - Added DH_VERBOSE. + - Removed CFLAGS from noopt. + * debian/salsa-ci.yml: added to provide CI tests for Salsa. + * debian/tests/control: added to perform a test. + * debian/watch: updated to version 4 and changed the URI. - -- Matthias Klose Sun, 22 Mar 2020 16:42:24 +0100 + -- Thiago Andrade Marques Sat, 11 Jul 2020 02:00:18 -0300 gip (1.7.0-1-4) unstable; urgency=medium @@ -48,7 +86,7 @@ * debian/control: - Bumped Standards-Version to 3.9.1. - - Added Vcs-Svn and Vcs-Browser as the package has been added on + - Added Vcs-Svn and Vcs-Browser as the package has been added on collab-maint/ext-main. * debian/patches: - Added 40-init_lock_events.diff: to initialize the lock_events variable @@ -75,11 +113,11 @@ * debian/compat: - Updated debhelper compatibility to 7. * debian/patches/: - - Added 10-gen-sh.diff: to remove the timestamps modification of the + - Added 10-gen-sh.diff: to remove the timestamps modification of the po/gip.pot file. - - Added 20-build-sh.diff: to correct installation path in the build.sh + - Added 20-build-sh.diff: to correct installation path in the build.sh file, and remove uselessly linked libraries. - - Added 30-gip-desktop.diff: to correct the path in the .desktop file, + - Added 30-gip-desktop.diff: to correct the path in the .desktop file, and remove the "Encoding" key. * Added a debian/watch file. * Added a debian/gip.dirs file. @@ -146,4 +184,3 @@ * Adjusted the build.sh to fix INST_* problems. -- Khalid El Fathi Mon, 25 Oct 2004 22:27:20 +0200 - diff -Nru gip-1.7.0-1/debian/compat gip-1.7.0-1/debian/compat --- gip-1.7.0-1/debian/compat 2016-07-24 03:45:13.000000000 +0000 +++ gip-1.7.0-1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru gip-1.7.0-1/debian/control gip-1.7.0-1/debian/control --- gip-1.7.0-1/debian/control 2016-07-24 03:53:03.000000000 +0000 +++ gip-1.7.0-1/debian/control 2020-07-11 04:40:18.000000000 +0000 @@ -1,9 +1,15 @@ Source: gip Section: gnome Priority: optional -Maintainer: Ignace Mouzannar -Build-Depends: debhelper (>= 9), intltool, libgtkmm-2.4-dev -Standards-Version: 3.9.8 +Maintainer: Thiago Andrade Marques +Build-Depends: debhelper-compat (= 13), + intltool, + libgtkmm-2.4-dev +Standards-Version: 4.5.0 +Rules-Requires-Root: binary-targets +Homepage: https://code.google.com/archive/p/gip/ +Vcs-Browser: https://salsa.debian.org/debian/gip +Vcs-Git: https://salsa.debian.org/debian/gip.git Package: gip Architecture: any diff -Nru gip-1.7.0-1/debian/copyright gip-1.7.0-1/debian/copyright --- gip-1.7.0-1/debian/copyright 2010-08-31 20:30:35.000000000 +0000 +++ gip-1.7.0-1/debian/copyright 2020-07-11 03:34:08.000000000 +0000 @@ -1,27 +1,66 @@ -This package was debianized by Khalid El Fathi on -Mon, 25 Oct 2004 22:27:20 +0200. - -It was downloaded from http://code.google.com/p/gip/ - -Upstream Author: Samuel Abels - -Copyright: Copyright (c) 2004-2009, Samuel Abels - -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 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 General -Public License can be found in `/usr/share/common-licenses/GPL-2'. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: gip +Upstream-Contact: Samuel Abels +Source: https://code.google.com/archive/p/gip/ + +Files: * +Copyright: 2004-2009 Samuel Abels +License: GPL-2 + +Files: po/* +Copyright: 2004 Andrej Kacian + 2004 Gian Jaskulski + 2004 Orhan Veli Esen + 2004 Víctor Alonso + 2004-2006 Mikel Olasagasti + 2005 Aleksandar Jelenak + 2005 Antoine Bigirimana + 2005 Augustin KIBERWA + 2005 Carole Karema + 2005 Clytie Siddall + 2005 Daniel Nylander + 2005 Donatien NSENGIYUMVA + 2005 Florian Verdet _goto + 2005 JEAN BAPTISTE NGENDAHAYO + 2005 Noëlla Mupole + 2005 Philibert Ndandali + 2005 Sharuzzaman Ahmat Raslan + 2005 Steve Murphy + 2005 Viateur MUGENZI + 2005 Wei-Lun Chao + 2005 Yavor Doganov + 2006 Mikel Olasagasti + 2006 Taco Witte + 2007 Kevin Scannell + 2008 Andhika Padmawan + 2008 Ji ZhengYu + 2008 Joe Hansen + 2008 Jorma Karvonen + 2008 Keld Simonsen + 2008 Peter Astakhov +License: GPL-2 + + +Files: debian/* +Copyright: 2004-2006 Khalid El Fathi + 2008 Cyril Brulebois + 2009-2016 Ignace Mouzannar + 2020 Thiago Andrade Marques +License: GPL-2+ + +License: GPL-2 or 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 version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru gip-1.7.0-1/debian/gip.docs gip-1.7.0-1/debian/gip.docs --- gip-1.7.0-1/debian/gip.docs 2010-08-31 20:30:35.000000000 +0000 +++ gip-1.7.0-1/debian/gip.docs 2020-07-05 11:28:26.000000000 +0000 @@ -1,2 +1 @@ README -debian/README.source diff -Nru gip-1.7.0-1/debian/patches/010_gen-sh.patch gip-1.7.0-1/debian/patches/010_gen-sh.patch --- gip-1.7.0-1/debian/patches/010_gen-sh.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/010_gen-sh.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Removes the timestamps modification of the po/gip.pot file +Author: Ignace Mouzannar +Last-Update: 2009-10-02 + +--- a/po/gen.sh ++++ b/po/gen.sh +@@ -6,11 +6,6 @@ + # Ger a list of all files that are potentially holding translatable strings. + FILES=`find ../src/ -name "*.cc" -o -name "*.c"` + +-# Re-generate (merge) the potfile. +-touch gip.pot +-xgettext -jC -k"_" -k"N_" --from-code ISO-8859-1 -o gip.pot $FILES \ +- || exit 1 +- + # Generate .mo files from all .po files. + find . -name "*.po" | while read POFILE; do + MOFILE=`echo $POFILE | sed 's/\.po$/\.mo/'` diff -Nru gip-1.7.0-1/debian/patches/020_build-sh.patch gip-1.7.0-1/debian/patches/020_build-sh.patch --- gip-1.7.0-1/debian/patches/020_build-sh.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/020_build-sh.patch 2020-07-05 12:43:53.000000000 +0000 @@ -0,0 +1,91 @@ +Description: + - Corrects installation path in the build.sh file + - Removes uselessly linked libraries in the LFLAGS variable, as none of + their symbols are used. + - Corrects linking paths (used to include the debian/gip/ build directory). + (LP: #565187) + - Sort source files for deterministic linking order (Closes: #842868). +Author: Ignace Mouzannar +Reviewed-by: Reiner Herrmann +Last-Update: 2016-11-01 + +Index: gip/build.sh +=================================================================== +--- gip.orig/build.sh ++++ gip/build.sh +@@ -12,7 +12,7 @@ REQUIRED_PROGS="$REQUIRED_PROGS xgettext + REQUIRED_LIBS='gtkmm-2.4 sigc++-2.0' + + # Program files. +-PROGFILES=`find src/ -name "*.cc" -o -name "*.c"` ++PROGFILES=`find src/ -name "*.cc" -o -name "*.c" | LC_ALL=C sort` + + # Installation paths. (Plugins will be installed in the LIBDIR) + INST_IN_LIBDIR=`find . -name "*.glade"` +@@ -153,21 +153,20 @@ done + INST_BINDIR="$INST_PREFIX/bin/" + INST_LIBDIR="$INST_PREFIX/lib/$EXECUTABLE" + INST_LOCALEDIR="$INST_PREFIX/share/locale" +-INST_PIXMAPDIR="$INST_PREFIX/lib/$EXECUTABLE" +-INST_DOCDIR="$INST_PREFIX/doc/$EXECUTABLE" +-INST_GNOMEDOCDIR="$INST_PREFIX/share/gnome/help/$EXECUTABLE/C" ++INST_PIXMAPDIR="$INST_PREFIX/share/$EXECUTABLE" ++INST_DOCDIR="$INST_PREFIX/share/doc/$EXECUTABLE" + INST_MIME_XML="$INST_PREFIX/share/mime/packages/" + INST_MIME_KEY="$INST_PREFIX/share/mime-info/" + INST_MENU_XDG="$INST_PREFIX/share/applications/" +-INST_ICON=$INST_PREFIX/share/icons/hicolor +-INST_ICON_LOWRES=$INST_ICON/32x32/apps +-INST_ICON_HIGHRES=$INST_ICON/48x48/apps ++INST_ICON="$INST_PREFIX/share/icons/hicolor" ++INST_ICON_LOWRES="$INST_ICON/32x32/apps" ++INST_ICON_HIGHRES="$INST_ICON/48x48/apps" + + # Preprocessor macros: +-MACROS="PACKAGE_LIB_DIR=$INST_LIBDIR/\ +-:PACKAGE_PIXMAPS_DIR=$INST_PIXMAPDIR/\ +-:PACKAGE_LOCALE_DIR=$INST_LOCALEDIR/\ +-:PACKAGE_DOC_DIR=$INST_DOCDIR/\ ++MACROS="PACKAGE_LIB_DIR=`echo $INST_LIBDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ ++:PACKAGE_PIXMAPS_DIR=`echo $INST_PIXMAPDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ ++:PACKAGE_LOCALE_DIR=`echo $INST_LOCALEDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ ++:PACKAGE_DOC_DIR=`echo $INST_DOCDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ + :VERSION=$VERSION\ + :SUBVERSION=$TAGVERSION\ + :GETTEXTPACKAGE=$EXECUTABLE\ +@@ -250,7 +249,8 @@ fi + ############################################################################### + # Compiler/Linker options. + CFLAGS="-DHAVE_CONFIG_H -I. -I.. `pkg-config $REQUIRED_LIBS --cflags`" +-LFLAGS=`pkg-config $REQUIRED_LIBS --libs` ++#LFLAGS=`pkg-config $REQUIRED_LIBS --libs` ++LFLAGS="-lgtkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lglibmm-2.4 -lglib-2.0 -lsigc-2.0" + + if [ "$PLUGINDIRS" != "" ]; then + build_plugins_all $PLUGINDIRS || exit 1 +@@ -288,8 +288,8 @@ fi + + echo Creating directories... + CREATEDIRS="$INST_BINDIR $INST_LIBDIR $INST_PIXMAPDIR $INST_DOCDIR" +-CREATEDIRS="$CREATEDIRS $INST_LOCALEDIR $INST_GNOMEDOCDIR" +-CREATEDIRS="$CREATEDIRS $INST_MENU_XDG $INST_MIME_XML $INST_GNOMEDOCDIR" ++CREATEDIRS="$CREATEDIRS $INST_LOCALEDIR" ++CREATEDIRS="$CREATEDIRS $INST_MENU_XDG $INST_MIME_XML" + CREATEDIRS="$CREATEDIRS $INST_ICON_LOWRES $INST_ICON_HIGHRES" + make_installdirs.sh $CREATEDIRS || exit 1 + +@@ -311,14 +311,6 @@ if [ "$INST_IN_DOCDIR" != "" ]; then + cp $INST_IN_DOCDIR $INST_DOCDIR || exit 1 + fi + +-echo Installing GNOME documentation in $INST_GNOMEDOCDIR... +-if [ -d "$INST_GNOMEDOCDIR" -a -w "$INST_GNOMEDOCDIR" ]; then +- cp -r "$INST_IN_GNOMEDOCDIR" "$INST_GNOMEDOCDIR" +-else +- echo "WARNING: GNOME documentation directory not found or it is not" >&2 +- echo " writeable! Skipping GNOME documentation installation." >&2 +-fi +- + echo Installing localisation files in $INST_LOCALEDIR... + if [ "$INST_IN_LOCALEDIR" != "" ]; then + install_locales.sh -p $INST_LOCALEDIR -d $EXECUTABLE $INST_IN_LOCALEDIR \ diff -Nru gip-1.7.0-1/debian/patches/030_gip-desktop.patch gip-1.7.0-1/debian/patches/030_gip-desktop.patch --- gip-1.7.0-1/debian/patches/030_gip-desktop.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/030_gip-desktop.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,26 @@ +Description: + - Corrects path in .desktop file + - Removes the "Encoding" key. +Author: Ignace Mouzannar +Last-Update: 2009-10-02 + +--- a/gip.desktop.in ++++ b/gip.desktop.in +@@ -1,15 +1,14 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=%APP_NAME% IP Address Calculator + Name[de]=%APP_NAME% IP-Adress-Rechner + GenericName=IP Adress Calculator + GenericName[de]=IP-Adress-Rechner + Comment=Calculate IP addresses and networks + Comment[de]=IP-Adressen und Netzbereiche berechnen +-Exec=%INSTALL_BIN%%APP_SYSNAME% %U ++Exec=/usr/bin/gip %U + StartupNotify=true + Terminal=false +-Icon=%INSTALL_LIB%/calculator.png ++Icon=/usr/share/gip/calculator.png + Type=Application + Categories=GNOME;GTK;Utility; + MimeType=application/x-%APP_SYSNAME%; diff -Nru gip-1.7.0-1/debian/patches/040_init-lock-events.patch gip-1.7.0-1/debian/patches/040_init-lock-events.patch --- gip-1.7.0-1/debian/patches/040_init-lock-events.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/040_init-lock-events.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,51 @@ +Description: Add initialization (to FALSE) of the lock_events variable +Author: Frank Dean +Last-Update: 04-04-2010 +--- a/src/gui_ipv4_analyzer.cc ++++ b/src/gui_ipv4_analyzer.cc +@@ -28,7 +28,7 @@ + /****************************************************************************** + * Constructor/Destructor + ******************************************************************************/ +-GUIIPv4Analyzer::GUIIPv4Analyzer() ++GUIIPv4Analyzer::GUIIPv4Analyzer() : lock_events(FALSE) + { + #ifdef _DEBUG_ + printf("GUIIPv4Analyzer::GUIIPv4Analyzer(): Called.\n"); +--- a/src/gui_ipv4_subnet_calculator.cc ++++ b/src/gui_ipv4_subnet_calculator.cc +@@ -30,7 +30,8 @@ + ******************************************************************************/ + GUIIPv4SubnetCalculator::GUIIPv4SubnetCalculator() + : label_range(_("Address range:")), +- label_dash("-") ++ label_dash("-"), ++ lock_events(FALSE) + { + resize(2, 4); + set_border_width(6); +--- a/src/gui_ipv4_subnet_splitter.cc ++++ b/src/gui_ipv4_subnet_splitter.cc +@@ -32,7 +32,8 @@ + : label_range(_("Address range:"), 0, 0.5), + label_dash("-"), + label_pfxlen(_("Subnetted using prefixlength:"), 0, 0.5), +- label_maxmatch(_("Showing a maximum of 1000 subnets."), 1, 0.5) ++ label_maxmatch(_("Showing a maximum of 1000 subnets."), 1, 0.5), ++ lock_events(FALSE) + { + resize(4, 4); + set_border_width(6); +--- a/po/gen.sh ++++ b/po/gen.sh +@@ -18,8 +18,7 @@ + echo GETTEXT_PACKAGE=gip > ../configure.ac || exit 1 + touch POTFILES.in || exit 1 + intltool-update -m || exit 1 +-if [ -e missing ]; then +- mv missing POTFILES.in || exit 1 +-fi ++ ++rm -f missing + + rm ../configure.ac diff -Nru gip-1.7.0-1/debian/patches/050_installer-build-files-sh.patch gip-1.7.0-1/debian/patches/050_installer-build-files-sh.patch --- gip-1.7.0-1/debian/patches/050_installer-build-files-sh.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/050_installer-build-files-sh.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Fix placement of libs in linking stages for GCC 4.6 +Author: Daniel T Chen +Reviewed-by: Daniel T Chen +Origin: Ubuntu +Forwarded: no +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gip/+bug/771081 +Last-Updated: 2011-09-15 + +Index: gip-1.7.0-1/installer/build_files.sh +=================================================================== +--- gip-1.7.0-1.orig/installer/build_files.sh 2011-09-16 14:33:30.000000000 -0400 ++++ gip-1.7.0-1/installer/build_files.sh 2011-09-16 14:34:33.000000000 -0400 +@@ -122,14 +122,14 @@ + if [ "$SHARED" = "" ]; then + # Link as an executable. + set -x +- g++ $CFLAGS $LFLAGS -o $OUTFILE $OBJECTFILES ++ g++ $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS + ERR="$?" + set +x + else + # Link as a shared library. + SHAREDNAME=`echo $OUTFILE | sed 's/\..*//'` + set -x +- g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS $LFLAGS -o $OUTFILE $OBJECTFILES ++ g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS + ERR="$?" + set +x + fi diff -Nru gip-1.7.0-1/debian/patches/060_binary-hex-network-update.patch gip-1.7.0-1/debian/patches/060_binary-hex-network-update.patch --- gip-1.7.0-1/debian/patches/060_binary-hex-network-update.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/060_binary-hex-network-update.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Adds update signals to binary and hex "network" fields when user +updates "Network mask" or "Prefix length". +Author: Ignace Mouzannar +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gip/+bug/704348 +Last-Update: 2011-11-19 +--- a/src/dispatcher.cc ++++ b/src/dispatcher.cc +@@ -124,8 +124,10 @@ + mainwindow->ipv4_analyzer.set_output_hosts_all(numhosts_all); + mainwindow->ipv4_analyzer.set_output_network(ip & mask); + mainwindow->ipv4_analyzer.set_output_broadcast(broadcast); ++ mainwindow->ipv4_analyzer.set_output_bin_network(ip & mask); + mainwindow->ipv4_analyzer.set_output_bin_mask(mask); + mainwindow->ipv4_analyzer.set_output_bin_broadcast(broadcast); ++ mainwindow->ipv4_analyzer.set_output_hex_network(ip & mask); + mainwindow->ipv4_analyzer.set_output_hex_mask(mask); + mainwindow->ipv4_analyzer.set_output_hex_broadcast(broadcast); + mainwindow->unlock_signals(); +@@ -156,8 +158,10 @@ + mainwindow->ipv4_analyzer.set_output_hosts_all(numhosts_all); + mainwindow->ipv4_analyzer.set_output_network(ip & mask); + mainwindow->ipv4_analyzer.set_output_broadcast(broadcast); ++ mainwindow->ipv4_analyzer.set_output_bin_network(ip & mask); + mainwindow->ipv4_analyzer.set_output_bin_mask(mask); + mainwindow->ipv4_analyzer.set_output_bin_broadcast(broadcast); ++ mainwindow->ipv4_analyzer.set_output_hex_network(ip & mask); + mainwindow->ipv4_analyzer.set_output_hex_mask(mask); + mainwindow->ipv4_analyzer.set_output_hex_broadcast(broadcast); + mainwindow->unlock_signals(); diff -Nru gip-1.7.0-1/debian/patches/070_remove-header.patch gip-1.7.0-1/debian/patches/070_remove-header.patch --- gip-1.7.0-1/debian/patches/070_remove-header.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/070_remove-header.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,16 @@ +Description: remove include to fix FTBFS with newer libsigc++ +Author: Logan Rosen +Forwarded: no +Last-Update: 2016-01-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/dispatcher.h ++++ b/src/dispatcher.h +@@ -23,7 +23,6 @@ + #ifndef HAVE_DISPATCHER_H + #define HAVE_DISPATCHER_H + +-#include + #include "gui_mainwindow.h" + #include "lib_ipv4.h" + diff -Nru gip-1.7.0-1/debian/patches/080_debian-hardening.patch gip-1.7.0-1/debian/patches/080_debian-hardening.patch --- gip-1.7.0-1/debian/patches/080_debian-hardening.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/080_debian-hardening.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,52 @@ +Description: Adds hardening compile-time options, as suggested and + described here: https://wiki.debian.org/Hardening +Author: Ignace Mouzannar +Forwarded: no +Last-Update: 2020-06-10 +Index: gip/build.sh +=================================================================== +--- gip.orig/build.sh ++++ gip/build.sh +@@ -248,9 +248,10 @@ fi + # Build. + ############################################################################### + # Compiler/Linker options. +-CFLAGS="-DHAVE_CONFIG_H -I. -I.. `pkg-config $REQUIRED_LIBS --cflags`" ++export DEB_BUILD_MAINT_OPTIONS="hardening=+all" ++CFLAGS="$(dpkg-buildflags --get CFLAGS) -DHAVE_CONFIG_H -I. -I.. `pkg-config $REQUIRED_LIBS --cflags`" + #LFLAGS=`pkg-config $REQUIRED_LIBS --libs` +-LFLAGS="-lgtkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lglibmm-2.4 -lglib-2.0 -lsigc-2.0" ++LFLAGS="$(dpkg-buildflags --get LDFLAGS) -lgtkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lglibmm-2.4 -lglib-2.0 -lsigc-2.0" + + if [ "$PLUGINDIRS" != "" ]; then + build_plugins_all $PLUGINDIRS || exit 1 +Index: gip/installer/build_files.sh +=================================================================== +--- gip.orig/installer/build_files.sh ++++ gip/installer/build_files.sh +@@ -27,7 +27,7 @@ compile_file() { + # Compile. + echo Compiling: $FILE... + set -x +- g++ -fPIC $CFLAGS -c $FILE -o $OBJECTFILE ++ g++ -fPIC $CFLAGS $CPPFLAGS -c $FILE -o $OBJECTFILE + ERR="$?" + set +x + if [ "$ERR" -ne "0" ]; then +@@ -122,14 +122,14 @@ fi + if [ "$SHARED" = "" ]; then + # Link as an executable. + set -x +- g++ $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS ++ g++ -pie -fPIE $CFLAGS $CPPFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS + ERR="$?" + set +x + else + # Link as a shared library. + SHAREDNAME=`echo $OUTFILE | sed 's/\..*//'` + set -x +- g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS ++ g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS $CPPFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS + ERR="$?" + set +x + fi diff -Nru gip-1.7.0-1/debian/patches/090_desktop-file.patch gip-1.7.0-1/debian/patches/090_desktop-file.patch --- gip-1.7.0-1/debian/patches/090_desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/090_desktop-file.patch 2020-07-05 03:52:00.000000000 +0000 @@ -0,0 +1,13 @@ +Description: add Keywords field to the desktop file +Author: Ignace Mouzannar +Forwarded: no +Last-Update: 2016-07-23 +Index: gip-1.7.0-1/gip.desktop.in +=================================================================== +--- gip-1.7.0-1.orig/gip.desktop.in ++++ gip-1.7.0-1/gip.desktop.in +@@ -12,3 +12,4 @@ Icon=/usr/share/gip/calculator.png + Type=Application + Categories=GNOME;GTK;Utility; + MimeType=application/x-%APP_SYSNAME%; ++Keywords=gnome;ip;address;calculator diff -Nru gip-1.7.0-1/debian/patches/10-gen-sh.diff gip-1.7.0-1/debian/patches/10-gen-sh.diff --- gip-1.7.0-1/debian/patches/10-gen-sh.diff 2010-08-31 22:27:11.000000000 +0000 +++ gip-1.7.0-1/debian/patches/10-gen-sh.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Removes the timestamps modification of the po/gip.pot file -Author: Ignace Mouzannar -Last-Update: 2009-10-02 - ---- a/po/gen.sh -+++ b/po/gen.sh -@@ -6,11 +6,6 @@ - # Ger a list of all files that are potentially holding translatable strings. - FILES=`find ../src/ -name "*.cc" -o -name "*.c"` - --# Re-generate (merge) the potfile. --touch gip.pot --xgettext -jC -k"_" -k"N_" --from-code ISO-8859-1 -o gip.pot $FILES \ -- || exit 1 -- - # Generate .mo files from all .po files. - find . -name "*.po" | while read POFILE; do - MOFILE=`echo $POFILE | sed 's/\.po$/\.mo/'` diff -Nru gip-1.7.0-1/debian/patches/20-build-sh.diff gip-1.7.0-1/debian/patches/20-build-sh.diff --- gip-1.7.0-1/debian/patches/20-build-sh.diff 2010-08-31 22:58:00.000000000 +0000 +++ gip-1.7.0-1/debian/patches/20-build-sh.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -Description: - - Corrects installation path in the build.sh file - - Removes uselessly linked libraries in the LFLAGS variable, as none of - their symbols are used. - - Corrects linking paths (used to include the debian/gip/ build directory). - (LP: #565187) -Author: Ignace Mouzannar -Last-Update: 2010-09-01 - ---- a/build.sh -+++ b/build.sh -@@ -153,21 +153,20 @@ - INST_BINDIR="$INST_PREFIX/bin/" - INST_LIBDIR="$INST_PREFIX/lib/$EXECUTABLE" - INST_LOCALEDIR="$INST_PREFIX/share/locale" --INST_PIXMAPDIR="$INST_PREFIX/lib/$EXECUTABLE" --INST_DOCDIR="$INST_PREFIX/doc/$EXECUTABLE" --INST_GNOMEDOCDIR="$INST_PREFIX/share/gnome/help/$EXECUTABLE/C" -+INST_PIXMAPDIR="$INST_PREFIX/share/$EXECUTABLE" -+INST_DOCDIR="$INST_PREFIX/share/doc/$EXECUTABLE" - INST_MIME_XML="$INST_PREFIX/share/mime/packages/" - INST_MIME_KEY="$INST_PREFIX/share/mime-info/" - INST_MENU_XDG="$INST_PREFIX/share/applications/" --INST_ICON=$INST_PREFIX/share/icons/hicolor --INST_ICON_LOWRES=$INST_ICON/32x32/apps --INST_ICON_HIGHRES=$INST_ICON/48x48/apps -+INST_ICON="$INST_PREFIX/share/icons/hicolor" -+INST_ICON_LOWRES="$INST_ICON/32x32/apps" -+INST_ICON_HIGHRES="$INST_ICON/48x48/apps" - - # Preprocessor macros: --MACROS="PACKAGE_LIB_DIR=$INST_LIBDIR/\ --:PACKAGE_PIXMAPS_DIR=$INST_PIXMAPDIR/\ --:PACKAGE_LOCALE_DIR=$INST_LOCALEDIR/\ --:PACKAGE_DOC_DIR=$INST_DOCDIR/\ -+MACROS="PACKAGE_LIB_DIR=`echo $INST_LIBDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ -+:PACKAGE_PIXMAPS_DIR=`echo $INST_PIXMAPDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ -+:PACKAGE_LOCALE_DIR=`echo $INST_LOCALEDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ -+:PACKAGE_DOC_DIR=`echo $INST_DOCDIR |sed \"s/.*debian\/$EXECUTABLE//\"`/\ - :VERSION=$VERSION\ - :SUBVERSION=$TAGVERSION\ - :GETTEXTPACKAGE=$EXECUTABLE\ -@@ -250,7 +249,8 @@ - ############################################################################### - # Compiler/Linker options. - CFLAGS="-DHAVE_CONFIG_H -I. -I.. `pkg-config $REQUIRED_LIBS --cflags`" --LFLAGS=`pkg-config $REQUIRED_LIBS --libs` -+#LFLAGS=`pkg-config $REQUIRED_LIBS --libs` -+LFLAGS="-lgtkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lglibmm-2.4 -lglib-2.0 -lsigc-2.0" - - if [ "$PLUGINDIRS" != "" ]; then - build_plugins_all $PLUGINDIRS || exit 1 -@@ -288,8 +288,8 @@ - - echo Creating directories... - CREATEDIRS="$INST_BINDIR $INST_LIBDIR $INST_PIXMAPDIR $INST_DOCDIR" --CREATEDIRS="$CREATEDIRS $INST_LOCALEDIR $INST_GNOMEDOCDIR" --CREATEDIRS="$CREATEDIRS $INST_MENU_XDG $INST_MIME_XML $INST_GNOMEDOCDIR" -+CREATEDIRS="$CREATEDIRS $INST_LOCALEDIR" -+CREATEDIRS="$CREATEDIRS $INST_MENU_XDG $INST_MIME_XML" - CREATEDIRS="$CREATEDIRS $INST_ICON_LOWRES $INST_ICON_HIGHRES" - make_installdirs.sh $CREATEDIRS || exit 1 - -@@ -311,14 +311,6 @@ - cp $INST_IN_DOCDIR $INST_DOCDIR || exit 1 - fi - --echo Installing GNOME documentation in $INST_GNOMEDOCDIR... --if [ -d "$INST_GNOMEDOCDIR" -a -w "$INST_GNOMEDOCDIR" ]; then -- cp -r "$INST_IN_GNOMEDOCDIR" "$INST_GNOMEDOCDIR" --else -- echo "WARNING: GNOME documentation directory not found or it is not" >&2 -- echo " writeable! Skipping GNOME documentation installation." >&2 --fi -- - echo Installing localisation files in $INST_LOCALEDIR... - if [ "$INST_IN_LOCALEDIR" != "" ]; then - install_locales.sh -p $INST_LOCALEDIR -d $EXECUTABLE $INST_IN_LOCALEDIR \ diff -Nru gip-1.7.0-1/debian/patches/30-gip-desktop.diff gip-1.7.0-1/debian/patches/30-gip-desktop.diff --- gip-1.7.0-1/debian/patches/30-gip-desktop.diff 2010-08-31 20:30:35.000000000 +0000 +++ gip-1.7.0-1/debian/patches/30-gip-desktop.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: - - Corrects path in .desktop file - - Removes the "Encoding" key. -Author: Ignace Mouzannar -Last-Update: 2009-10-02 - ---- a/gip.desktop.in -+++ b/gip.desktop.in -@@ -1,15 +1,14 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=%APP_NAME% IP Address Calculator - Name[de]=%APP_NAME% IP-Adress-Rechner - GenericName=IP Adress Calculator - GenericName[de]=IP-Adress-Rechner - Comment=Calculate IP addresses and networks - Comment[de]=IP-Adressen und Netzbereiche berechnen --Exec=%INSTALL_BIN%%APP_SYSNAME% %U -+Exec=/usr/bin/gip %U - StartupNotify=true - Terminal=false --Icon=%INSTALL_LIB%/calculator.png -+Icon=/usr/share/gip/calculator.png - Type=Application - Categories=GNOME;GTK;Utility; - MimeType=application/x-%APP_SYSNAME%; diff -Nru gip-1.7.0-1/debian/patches/40-init_lock_events.diff gip-1.7.0-1/debian/patches/40-init_lock_events.diff --- gip-1.7.0-1/debian/patches/40-init_lock_events.diff 2010-08-31 22:27:35.000000000 +0000 +++ gip-1.7.0-1/debian/patches/40-init_lock_events.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -Description: Add initialization (to FALSE) of the lock_events variable -Author: Frank Dean -Last-Update: 04-04-2010 ---- a/src/gui_ipv4_analyzer.cc -+++ b/src/gui_ipv4_analyzer.cc -@@ -28,7 +28,7 @@ - /****************************************************************************** - * Constructor/Destructor - ******************************************************************************/ --GUIIPv4Analyzer::GUIIPv4Analyzer() -+GUIIPv4Analyzer::GUIIPv4Analyzer() : lock_events(FALSE) - { - #ifdef _DEBUG_ - printf("GUIIPv4Analyzer::GUIIPv4Analyzer(): Called.\n"); ---- a/src/gui_ipv4_subnet_calculator.cc -+++ b/src/gui_ipv4_subnet_calculator.cc -@@ -30,7 +30,8 @@ - ******************************************************************************/ - GUIIPv4SubnetCalculator::GUIIPv4SubnetCalculator() - : label_range(_("Address range:")), -- label_dash("-") -+ label_dash("-"), -+ lock_events(FALSE) - { - resize(2, 4); - set_border_width(6); ---- a/src/gui_ipv4_subnet_splitter.cc -+++ b/src/gui_ipv4_subnet_splitter.cc -@@ -32,7 +32,8 @@ - : label_range(_("Address range:"), 0, 0.5), - label_dash("-"), - label_pfxlen(_("Subnetted using prefixlength:"), 0, 0.5), -- label_maxmatch(_("Showing a maximum of 1000 subnets."), 1, 0.5) -+ label_maxmatch(_("Showing a maximum of 1000 subnets."), 1, 0.5), -+ lock_events(FALSE) - { - resize(4, 4); - set_border_width(6); ---- a/po/gen.sh -+++ b/po/gen.sh -@@ -18,8 +18,7 @@ - echo GETTEXT_PACKAGE=gip > ../configure.ac || exit 1 - touch POTFILES.in || exit 1 - intltool-update -m || exit 1 --if [ -e missing ]; then -- mv missing POTFILES.in || exit 1 --fi -+ -+rm -f missing - - rm ../configure.ac diff -Nru gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff --- gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff 2011-11-19 23:05:35.000000000 +0000 +++ gip-1.7.0-1/debian/patches/50-installer-build_files-sh.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Description: Fix placement of libs in linking stages for GCC 4.6 -Author: Daniel T Chen -Reviewed-by: Daniel T Chen -Origin: Ubuntu -Forwarded: no -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gip/+bug/771081 -Last-Updated: 2011-09-15 - -Index: gip-1.7.0-1/installer/build_files.sh -=================================================================== ---- gip-1.7.0-1.orig/installer/build_files.sh 2011-09-16 14:33:30.000000000 -0400 -+++ gip-1.7.0-1/installer/build_files.sh 2011-09-16 14:34:33.000000000 -0400 -@@ -122,14 +122,14 @@ - if [ "$SHARED" = "" ]; then - # Link as an executable. - set -x -- g++ $CFLAGS $LFLAGS -o $OUTFILE $OBJECTFILES -+ g++ $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS - ERR="$?" - set +x - else - # Link as a shared library. - SHAREDNAME=`echo $OUTFILE | sed 's/\..*//'` - set -x -- g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS $LFLAGS -o $OUTFILE $OBJECTFILES -+ g++ -shared -Wl,-soname,$SHAREDNAME $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS - ERR="$?" - set +x - fi diff -Nru gip-1.7.0-1/debian/patches/60-binary-hex-network-update.diff gip-1.7.0-1/debian/patches/60-binary-hex-network-update.diff --- gip-1.7.0-1/debian/patches/60-binary-hex-network-update.diff 2011-11-20 00:12:31.000000000 +0000 +++ gip-1.7.0-1/debian/patches/60-binary-hex-network-update.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Description: Adds update signals to binary and hex "network" fields when user -updates "Network mask" or "Prefix length". -Author: Ignace Mouzannar -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gip/+bug/704348 -Last-Update: 2011-11-19 ---- a/src/dispatcher.cc -+++ b/src/dispatcher.cc -@@ -124,8 +124,10 @@ - mainwindow->ipv4_analyzer.set_output_hosts_all(numhosts_all); - mainwindow->ipv4_analyzer.set_output_network(ip & mask); - mainwindow->ipv4_analyzer.set_output_broadcast(broadcast); -+ mainwindow->ipv4_analyzer.set_output_bin_network(ip & mask); - mainwindow->ipv4_analyzer.set_output_bin_mask(mask); - mainwindow->ipv4_analyzer.set_output_bin_broadcast(broadcast); -+ mainwindow->ipv4_analyzer.set_output_hex_network(ip & mask); - mainwindow->ipv4_analyzer.set_output_hex_mask(mask); - mainwindow->ipv4_analyzer.set_output_hex_broadcast(broadcast); - mainwindow->unlock_signals(); -@@ -156,8 +158,10 @@ - mainwindow->ipv4_analyzer.set_output_hosts_all(numhosts_all); - mainwindow->ipv4_analyzer.set_output_network(ip & mask); - mainwindow->ipv4_analyzer.set_output_broadcast(broadcast); -+ mainwindow->ipv4_analyzer.set_output_bin_network(ip & mask); - mainwindow->ipv4_analyzer.set_output_bin_mask(mask); - mainwindow->ipv4_analyzer.set_output_bin_broadcast(broadcast); -+ mainwindow->ipv4_analyzer.set_output_hex_network(ip & mask); - mainwindow->ipv4_analyzer.set_output_hex_mask(mask); - mainwindow->ipv4_analyzer.set_output_hex_broadcast(broadcast); - mainwindow->unlock_signals(); diff -Nru gip-1.7.0-1/debian/patches/70-remove-header.diff gip-1.7.0-1/debian/patches/70-remove-header.diff --- gip-1.7.0-1/debian/patches/70-remove-header.diff 2016-07-22 05:25:02.000000000 +0000 +++ gip-1.7.0-1/debian/patches/70-remove-header.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: remove include to fix FTBFS with newer libsigc++ -Author: Logan Rosen -Forwarded: no -Last-Update: 2016-01-05 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/dispatcher.h -+++ b/src/dispatcher.h -@@ -23,7 +23,6 @@ - #ifndef HAVE_DISPATCHER_H - #define HAVE_DISPATCHER_H - --#include - #include "gui_mainwindow.h" - #include "lib_ipv4.h" - diff -Nru gip-1.7.0-1/debian/patches/71-debian-hardening.diff gip-1.7.0-1/debian/patches/71-debian-hardening.diff --- gip-1.7.0-1/debian/patches/71-debian-hardening.diff 2016-07-23 19:19:21.000000000 +0000 +++ gip-1.7.0-1/debian/patches/71-debian-hardening.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -Description: Adds hardening compile-time options, as suggested and - described here: https://wiki.debian.org/Hardening -Author: Ignace Mouzannar -Forwarded: no -Last-Update: 2016-07-23 -Index: gip-1.7.0-1/build.sh -=================================================================== ---- gip-1.7.0-1.orig/build.sh -+++ gip-1.7.0-1/build.sh -@@ -248,9 +248,10 @@ fi - # Build. - ############################################################################### - # Compiler/Linker options. --CFLAGS="-DHAVE_CONFIG_H -I. -I.. `pkg-config $REQUIRED_LIBS --cflags`" -+export DEB_BUILD_MAINT_OPTIONS="hardening=+all" -+CFLAGS="$(dpkg-buildflags --get CFLAGS) -DHAVE_CONFIG_H -I. -I.. `pkg-config $REQUIRED_LIBS --cflags`" - #LFLAGS=`pkg-config $REQUIRED_LIBS --libs` --LFLAGS="-lgtkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lglibmm-2.4 -lglib-2.0 -lsigc-2.0" -+LFLAGS="$(dpkg-buildflags --get LDFLAGS) -lgtkmm-2.4 -latkmm-1.6 -lgtk-x11-2.0 -lglibmm-2.4 -lglib-2.0 -lsigc-2.0" - - if [ "$PLUGINDIRS" != "" ]; then - build_plugins_all $PLUGINDIRS || exit 1 -Index: gip-1.7.0-1/installer/build_files.sh -=================================================================== ---- gip-1.7.0-1.orig/installer/build_files.sh -+++ gip-1.7.0-1/installer/build_files.sh -@@ -122,7 +122,7 @@ fi - if [ "$SHARED" = "" ]; then - # Link as an executable. - set -x -- g++ $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS -+ g++ -pie -fPIE $CFLAGS -o $OUTFILE $OBJECTFILES $LFLAGS - ERR="$?" - set +x - else diff -Nru gip-1.7.0-1/debian/patches/72-desktop-file.diff gip-1.7.0-1/debian/patches/72-desktop-file.diff --- gip-1.7.0-1/debian/patches/72-desktop-file.diff 2016-07-23 19:27:20.000000000 +0000 +++ gip-1.7.0-1/debian/patches/72-desktop-file.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: add Keywords field to the desktop file -Author: Ignace Mouzannar -Forwarded: no -Last-Update: 2016-07-23 -Index: gip-1.7.0-1/gip.desktop.in -=================================================================== ---- gip-1.7.0-1.orig/gip.desktop.in -+++ gip-1.7.0-1/gip.desktop.in -@@ -12,3 +12,4 @@ Icon=/usr/share/gip/calculator.png - Type=Application - Categories=GNOME;GTK;Utility; - MimeType=application/x-%APP_SYSNAME%; -+Keywords=gnome;ip;address;calculator diff -Nru gip-1.7.0-1/debian/patches/series gip-1.7.0-1/debian/patches/series --- gip-1.7.0-1/debian/patches/series 2016-07-23 19:27:58.000000000 +0000 +++ gip-1.7.0-1/debian/patches/series 2020-07-05 03:52:00.000000000 +0000 @@ -1,9 +1,9 @@ -10-gen-sh.diff -20-build-sh.diff -30-gip-desktop.diff -40-init_lock_events.diff -50-installer-build_files-sh.diff -60-binary-hex-network-update.diff -70-remove-header.diff -71-debian-hardening.diff -72-desktop-file.diff +010_gen-sh.patch +020_build-sh.patch +030_gip-desktop.patch +040_init-lock-events.patch +050_installer-build-files-sh.patch +060_binary-hex-network-update.patch +070_remove-header.patch +080_debian-hardening.patch +090_desktop-file.patch diff -Nru gip-1.7.0-1/debian/README.source gip-1.7.0-1/debian/README.source --- gip-1.7.0-1/debian/README.source 2010-08-31 20:30:35.000000000 +0000 +++ gip-1.7.0-1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -This package uses the quilt patch management solution. -For more information about how to use it, please refer to: -/usr/share/doc/quilt/README.source diff -Nru gip-1.7.0-1/debian/rules gip-1.7.0-1/debian/rules --- gip-1.7.0-1/debian/rules 2016-07-22 05:45:36.000000000 +0000 +++ gip-1.7.0-1/debian/rules 2020-07-11 03:31:04.000000000 +0000 @@ -1,13 +1,10 @@ #!/usr/bin/make -f -# -*- makefile -*- +#export DH_VERBOSE=1 -CFLAGS = -Wall -g +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +CFLAGS = -Wall -g +CPPFLAGS += -D_FORTIFY_SOURCE=2 %: dh $@ diff -Nru gip-1.7.0-1/debian/salsa-ci.yml gip-1.7.0-1/debian/salsa-ci.yml --- gip-1.7.0-1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/salsa-ci.yml 2020-07-05 03:51:11.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru gip-1.7.0-1/debian/tests/control gip-1.7.0-1/debian/tests/control --- gip-1.7.0-1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ gip-1.7.0-1/debian/tests/control 2020-07-11 04:44:14.000000000 +0000 @@ -0,0 +1,2 @@ +Test-Command: xvfb-run -a gip & +Depends: @, xauth, xvfb diff -Nru gip-1.7.0-1/debian/watch gip-1.7.0-1/debian/watch --- gip-1.7.0-1/debian/watch 2011-11-20 00:02:05.000000000 +0000 +++ gip-1.7.0-1/debian/watch 2020-07-11 04:09:58.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -http://googlecode.debian.net/p/gip/gip-(.*)\.tar\.gz +version=4 +https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gip/gip-1.7.0-1.tar.gz +#This project was discontinued. Awaiting migration to github.