diff -Nru ftp.app-0.6/debian/changelog ftp.app-0.6/debian/changelog --- ftp.app-0.6/debian/changelog 2018-01-30 05:47:13.000000000 +0000 +++ ftp.app-0.6/debian/changelog 2018-05-13 07:46:10.000000000 +0000 @@ -1,14 +1,26 @@ -ftp.app (0.6-1build2) bionic; urgency=medium +ftp.app (0.6-2) unstable; urgency=medium - * No-change rebuild for gnustep-gui soname change. + * Team upload. + * debian/compat: Bump to 11. + * debian/rules: Rewrite for modern dh. Don't convert/install the .xpm + icon (Closes: #897524). Use standard variables; enable all hardening. + * debian/control: Run wrap-and-sort -ast for diff-friendliness. + (Build-Depends): Drop imagemagick. Bump debhelper to >= 11. Require + gnustep-make >= 2.7.0-3 for the optim variable definition. + (Depends): Drop ${gnustep:Depends}; obsolete. + (Vcs-Git, Vcs-Browser): Switch to Salsa. + (Standards-Version): Claim compliance with 4.1.4 as of this release. + * debian/menu: Delete as per current policy requirement. + * debian/dirs: Replace usr/bin with usr/share/GNUstep. + * debian/install: New file; install the .desktop file. + * debian/preinst: Delete; no longer needed. + * debian/FTP.desktop: Use the .tif icon, add Keywords and Comment keys. + * debian/watch: Upgrade to version 4, use Savannah's mirror redirector. + * debian/copyright: Rewrite in format 1.0. + * debian/patches/spelling-errors.patch: New; fix some spelling errors. + * debian/patches/series: New file. - -- Matthias Klose Tue, 30 Jan 2018 05:47:13 +0000 - -ftp.app (0.6-1build1) bionic; urgency=medium - - * No-change rebuild for gnustep-base soname change. - - -- Matthias Klose Tue, 07 Nov 2017 08:25:50 +0000 + -- Yavor Doganov Sun, 13 May 2018 10:46:10 +0300 ftp.app (0.6-1) unstable; urgency=medium diff -Nru ftp.app-0.6/debian/compat ftp.app-0.6/debian/compat --- ftp.app-0.6/debian/compat 2017-09-11 11:08:31.000000000 +0000 +++ ftp.app-0.6/debian/compat 2018-05-13 06:02:31.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru ftp.app-0.6/debian/control ftp.app-0.6/debian/control --- ftp.app-0.6/debian/control 2017-09-11 11:08:31.000000000 +0000 +++ ftp.app-0.6/debian/control 2018-05-13 07:45:37.000000000 +0000 @@ -2,16 +2,22 @@ Section: gnustep Priority: optional Maintainer: Federico Gimenez Nieto -Uploaders: Debian GNUstep maintainers -Build-Depends: debhelper (>= 10), libgnustep-gui-dev, gnustep-make, imagemagick -Standards-Version: 4.0.0 -Vcs-Git: https://anonscm.debian.org/git/pkg-gnustep/ftp.app.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-gnustep/ftp.app.git +Uploaders: + Debian GNUstep maintainers , +Build-Depends: + debhelper (>= 11), + gnustep-make (>= 2.7.0-3), + libgnustep-gui-dev, +Standards-Version: 4.1.4 +Vcs-Git: https://salsa.debian.org/gnustep-team/ftp.app.git +Vcs-Browser: https://salsa.debian.org/gnustep-team/ftp.app Homepage: http://www.nongnu.org/gap/ftp/ Package: ftp.app Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${gnustep:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends}, Description: File transfer protocol application for GNUstep This is a file transfer application (RFC 765) featuring a compact and easy interface. As most applications in GAP it tries to work on both GNUstep and @@ -19,4 +25,4 @@ ease working in both environments. . FTP supports different port arbitration modes: "default", standard "PORT" - (also known as active) and standard "PASV" (also known as passive). + (also known as active) and standard "PASV" (also known as passive). diff -Nru ftp.app-0.6/debian/copyright ftp.app-0.6/debian/copyright --- ftp.app-0.6/debian/copyright 2017-09-11 11:08:31.000000000 +0000 +++ ftp.app-0.6/debian/copyright 2018-05-13 06:54:19.000000000 +0000 @@ -1,52 +1,61 @@ -This package was debianized by Gürkan Sengün on -Thu, 9 Feb 2006 16:51:45 +0100. - -It was downloaded from http://www.nongnu.org/gap/ftp/ - -Upstream Author: - - Riccardo Mottola - -License: - - Copyright (C) 2005-2017 Riccardo Mottola (multix) - Copyright (C) 2005-2017 Free Software Foundation - - 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. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - This library 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 - version 2.1 of the License, or (at your option) any later version. - - ------------------------------------------------------------------------ - - This library 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 - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -The Debian packaging is -Copyright (c) 2006-2017 Gürkan Myczko -Copyright (c) 2010-2012 Federico Gimenez Nieto -and is licensed under the GPL-2, see `/usr/share/common-licenses/GPL-2'. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: FTP +Upstream-Contact: gap-dev-discuss@nongnu.org +Source: https://download.savannah.gnu.org/releases/gap/ + +Files: * +Copyright: 2005 Free Software Foundation, Inc. + 2005-2017 Riccardo Mottola +License: GPL-2+ + +Files: GetNameController.* + client.* + ftpclient.* +Copyright: 2005-2016 Free Software Foundation, Inc. + 2005-2017 Riccardo Mottola +License: LGPL-2.1+ +Comment: Since these files are combined into one executable the + license is upgraded to GPL-2+. + +Files: debian/* +Copyright: 2006-2017,Gürkan Myczko + 2010-2012 Federico Gimenez Nieto + 2018 Yavor Doganov +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 application 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 + Library General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this library; 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 version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: LGPL-2.1+ + This library 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 version 2.1 of the + License, or (at your option) any later version. + . + This library 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; 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 version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. diff -Nru ftp.app-0.6/debian/dirs ftp.app-0.6/debian/dirs --- ftp.app-0.6/debian/dirs 2017-01-08 04:38:41.000000000 +0000 +++ ftp.app-0.6/debian/dirs 2018-05-13 06:06:15.000000000 +0000 @@ -1 +1 @@ -usr/bin +usr/share/GNUstep diff -Nru ftp.app-0.6/debian/FTP.desktop ftp.app-0.6/debian/FTP.desktop --- ftp.app-0.6/debian/FTP.desktop 2017-01-08 04:38:41.000000000 +0000 +++ ftp.app-0.6/debian/FTP.desktop 2018-05-13 06:23:03.000000000 +0000 @@ -2,6 +2,8 @@ Type=Application Version=1.0 Name=FTP +Comment=FTP client for GNUstep Categories=FileTransfer;Network; +Keywords=ftp;transfer; Exec=FTP -Icon=/usr/share/pixmaps/FTP.xpm +Icon=/usr/share/GNUstep/FTP.app/FTP_icon_gs.tif diff -Nru ftp.app-0.6/debian/install ftp.app-0.6/debian/install --- ftp.app-0.6/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ ftp.app-0.6/debian/install 2018-05-13 06:07:24.000000000 +0000 @@ -0,0 +1 @@ +debian/FTP.desktop usr/share/applications diff -Nru ftp.app-0.6/debian/menu ftp.app-0.6/debian/menu --- ftp.app-0.6/debian/menu 2017-01-08 04:38:41.000000000 +0000 +++ ftp.app-0.6/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -?package(ftp.app):needs="X11" \ - section="Applications/Network/File Transfer"\ - title="FTP" \ - command="/usr/bin/FTP" \ - icon="/usr/share/pixmaps/FTP.xpm" diff -Nru ftp.app-0.6/debian/patches/series ftp.app-0.6/debian/patches/series --- ftp.app-0.6/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ftp.app-0.6/debian/patches/series 2018-05-13 07:37:02.000000000 +0000 @@ -0,0 +1 @@ +spelling-errors.patch diff -Nru ftp.app-0.6/debian/patches/spelling-errors.patch ftp.app-0.6/debian/patches/spelling-errors.patch --- ftp.app-0.6/debian/patches/spelling-errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ ftp.app-0.6/debian/patches/spelling-errors.patch 2018-05-13 07:38:58.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Fix some spelling errors. +Author: Yavor Doganov +Forwarded: https://savannah.nongnu.org/bugs/?53887 +Last-Update: 2018-05-13 +--- + +--- ftp.app.orig/ftpclient.m ++++ ftp.app/ftpclient.m +@@ -1083,7 +1083,7 @@ + NSLog(@"Error return code of PORT: %d", returnCode); + if(reply && [reply count] > 0) + { +- NSLog(@"error occoured in port command: %@", [reply objectAtIndex:0]); ++ NSLog(@"error occurred in port command: %@", [reply objectAtIndex:0]); + return -1; + } + NSLog(@"error in port command, no code"); +--- ftp.app.orig/localclient.m ++++ ftp.app/localclient.m +@@ -107,7 +107,7 @@ + + if ([fm removeFileAtPath:[file path] handler:nil] == NO) + { +- NSLog(@"an error occoured during local delete"); ++ NSLog(@"an error occurred during local delete"); + return NO; + } + return YES; diff -Nru ftp.app-0.6/debian/preinst ftp.app-0.6/debian/preinst --- ftp.app-0.6/debian/preinst 2017-01-08 04:38:41.000000000 +0000 +++ ftp.app-0.6/debian/preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -#!/bin/sh -# preinst script for preview.app, adapted from gnumail.app -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -PACKAGENAME=FTP.app -RESDIR=/usr/lib/GNUstep/Applications/$PACKAGENAME/Resources - -case "$1" in - install|upgrade) - if [ -d $RESDIR ] && [ ! -L $RESDIR ]; then - rm -rf $RESDIR - fi - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 - - diff -Nru ftp.app-0.6/debian/rules ftp.app-0.6/debian/rules --- ftp.app-0.6/debian/rules 2017-01-08 05:00:29.000000000 +0000 +++ ftp.app-0.6/debian/rules 2018-05-13 05:45:19.000000000 +0000 @@ -3,77 +3,20 @@ #export DH_VERBOSE=1 include /usr/share/GNUstep/debian/config.mk -export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR) - d_app := $(CURDIR)/debian/ftp.app +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-undefined -Wl,--as-needed -#defined LDFLAGS to prevent dpkg-shlibdeps warnings -LDFLAGS := -z relro -Wl,-z,defs -Wl,--as-needed - -#define optim to build optimized package (thanks Yavor Doganov) -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -optim := debug=yes -endif - -build: build-stamp - -build-stamp: - dh_testdir - $(MAKE) $(optim) LDFLAGS="$(LDFLAGS)" messages=yes - convert Resources/FTP_icon_gs.tif -resize 32x32 FTP.xpm - mv FTP-0.xpm FTP.xpm - rm FTP-1.xpm - touch build-stamp +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f build-stamp - $(MAKE) clean - rm -f FTP.xpm - dh_clean +override_dh_auto_build: + dh_auto_build -- $(optim) messages=yes \ + $(shell dpkg-buildflags --export=cmdline) -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) install GNUSTEP_INSTALLATION_DOMAIN=SYSTEM DESTDIR=$(CURDIR)/debian/ftp.app - dh_install debian/*.desktop usr/share/applications/ - rm $(CURDIR)/debian/*.app/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop - #move resources to /usr/share/GNUstep and add a symlink if the installation is following the FHS -ifeq ($(GS_USE_FHS),yes) - dh_installdirs usr/share/GNUstep +override_dh_link: + $(RM) $(d_app)$(GNUSTEP_SYSTEM_APPS)/*.app/Resources/*.desktop mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/FTP.app/Resources \ $(d_app)/usr/share/GNUstep/FTP.app dh_link usr/share/GNUstep/FTP.app \ $(GNUSTEP_SYSTEM_APPS)/FTP.app/Resources -endif - # Install the XPM icon. - install -D -m 644 FTP.xpm $(d_app)/usr/share/pixmaps/FTP.xpm - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installmenu - dh_installman - dh_installdeb - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_strip - dh_compress - dh_fixperms - gsdh_gnustep - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch - diff -Nru ftp.app-0.6/debian/watch ftp.app-0.6/debian/watch --- ftp.app-0.6/debian/watch 2017-01-08 04:38:41.000000000 +0000 +++ ftp.app-0.6/debian/watch 2018-05-13 06:34:33.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -http://www.nongnu.org/gap/ftp/ http://savannah.nongnu.org/download/gap/FTP-([\d.]+)\.tar.gz +version=4 +https://dl.sv.gnu.org/releases/gap/FTP-([\d.]+)\.tar.gz