[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#846277: marked as done (gftp: diff for NMU version 2.0.19-4.1)

Your message dated Thu, 19 Jan 2017 13:15:25 +0200
with message-id <20170119111525.64srbh3uy2x5kpin@localhost>
and subject line This was uploaded as QA upload
has caused the Debian Bug report #846277,
regarding gftp: diff for NMU version 2.0.19-4.1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
846277: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846277
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: gftp
Version: 2.0.19-4
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for gftp (versioned as 2.0.19-4.1) and
uploaded it to DELAYED/1. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
WBR, wRAR

diff -Nru gftp-2.0.19/debian/changelog gftp-2.0.19/debian/changelog
--- gftp-2.0.19/debian/changelog	2012-05-10 00:01:27.000000000 +0600
+++ gftp-2.0.19/debian/changelog	2016-11-30 00:12:22.000000000 +0500
@@ -1,3 +1,16 @@
+gftp (2.0.19-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with dpkg-buildpackage -A, patch by Santiago Vila (Closes:
+    #806032).
+  * Switch to debhelper compat level 10, fix outdated configure.in (Closes:
+    #727869).
+  * Enable -Wl,--as-needed.
+  * Drop the menu file.
+  * Don't pass unnecessary options to configure.
+
+ -- Andrey Rahmatullin <wrar@debian.org>  Wed, 30 Nov 2016 00:12:22 +0500
+
 gftp (2.0.19-4) unstable; urgency=low
 
   * Bug fix: "FTBFS on hurd-i386.", thanks to Cyril Roelandt (Closes: #671687).
diff -Nru gftp-2.0.19/debian/compat gftp-2.0.19/debian/compat
--- gftp-2.0.19/debian/compat	2011-11-23 23:10:08.000000000 +0600
+++ gftp-2.0.19/debian/compat	2016-11-30 00:12:22.000000000 +0500
@@ -1 +1 @@
-7
+10
diff -Nru gftp-2.0.19/debian/control gftp-2.0.19/debian/control
--- gftp-2.0.19/debian/control	2012-05-10 00:36:57.000000000 +0600
+++ gftp-2.0.19/debian/control	2016-11-30 00:12:22.000000000 +0500
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Cleto Martín <cleto.martin@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libreadline-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0), imagemagick
+Build-Depends: debhelper (>= 10), libreadline-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0), imagemagick
 Standards-Version: 3.9.3
 Homepage: http://www.gftp.org/
 
diff -Nru gftp-2.0.19/debian/gftp-common.examples gftp-2.0.19/debian/gftp-common.examples
--- gftp-2.0.19/debian/gftp-common.examples	1970-01-01 05:00:00.000000000 +0500
+++ gftp-2.0.19/debian/gftp-common.examples	2016-11-30 00:12:22.000000000 +0500
@@ -0,0 +1 @@
+docs/parse-netrc.pl
diff -Nru gftp-2.0.19/debian/gftp-common.install gftp-2.0.19/debian/gftp-common.install
--- gftp-2.0.19/debian/gftp-common.install	2008-12-01 02:25:19.000000000 +0500
+++ gftp-2.0.19/debian/gftp-common.install	2016-11-30 00:12:22.000000000 +0500
@@ -1,3 +1,4 @@
+etc/gftp
 usr/bin/gftp
 usr/share/gftp/gftprc
 usr/share/gftp/bookmarks
diff -Nru gftp-2.0.19/debian/gftp-gtk.menu gftp-2.0.19/debian/gftp-gtk.menu
--- gftp-2.0.19/debian/gftp-gtk.menu	2008-12-01 02:25:19.000000000 +0500
+++ gftp-2.0.19/debian/gftp-gtk.menu	1970-01-01 05:00:00.000000000 +0500
@@ -1,6 +0,0 @@
-?package(gftp-gtk): \
-	needs="X11" \
-	section="Applications/Network/File Transfer" \
-	title="gFTP" \
-	command="/usr/bin/gftp-gtk" \
-	icon="/usr/share/pixmaps/gftp.xpm"
diff -Nru gftp-2.0.19/debian/patches/fix-configure.in.patch gftp-2.0.19/debian/patches/fix-configure.in.patch
--- gftp-2.0.19/debian/patches/fix-configure.in.patch	1970-01-01 05:00:00.000000000 +0500
+++ gftp-2.0.19/debian/patches/fix-configure.in.patch	2016-11-30 00:12:22.000000000 +0500
@@ -0,0 +1,32 @@
+Description: Fix configure.in problems.
+Author: Andrey Rahmatullin <wrar@debian.org>
+Last-Update: 2016-11-30
+
+--- gftp-2.0.19.orig/configure.in
++++ gftp-2.0.19/configure.in
+@@ -37,7 +37,6 @@ AC_EXEEXT
+ AC_PROG_RANLIB
+ AC_SYS_LARGEFILE
+ dnl AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ AC_C_CONST
+ AC_C_INLINE
+ AC_INTL_PRINTF
+@@ -86,7 +85,7 @@ else
+ fi
+ 
+ if test "x$GFTP_TEXT" = "x" -a $found_glib20 = 0 ; then
+-  AM_PATH_GLIB(1.2.3, , AC_MSG_ERROR(gFTP needs GLIB 1.2.3 or higher))
++  AM_PATH_GLIB_2_0(1.2.3, , AC_MSG_ERROR(gFTP needs GLIB 1.2.3 or higher))
+ fi
+ 
+ EXTRA_LIBS=""
+@@ -202,7 +201,7 @@ if test "x$enable_gtkport" = "xyes" ; th
+   fi
+ 
+   if test "x$GFTP_GTK" = "x" ; then
+-    AM_PATH_GTK(1.2.3, GFTP_GTK=gftp-gtk, AC_MSG_WARN(gFTP needs GTK+ 1.2.3 or higher for the graphical version. Only building the text version))
++    AM_PATH_GTK_2_0(1.2.3, GFTP_GTK=gftp-gtk, AC_MSG_WARN(gFTP needs GTK+ 1.2.3 or higher for the graphical version. Only building the text version))
+     GTHREAD_LIBS="-lgthread"
+   else
+     GTHREAD_LIBS="-lgthread-2.0"
diff -Nru gftp-2.0.19/debian/patches/series gftp-2.0.19/debian/patches/series
--- gftp-2.0.19/debian/patches/series	2012-05-10 00:01:57.000000000 +0600
+++ gftp-2.0.19/debian/patches/series	2016-11-30 00:12:22.000000000 +0500
@@ -1,2 +1,3 @@
 01-hurd_do_not_use_PATH_MAX.patch
 desktop-file-binary
+fix-configure.in.patch
diff -Nru gftp-2.0.19/debian/rules gftp-2.0.19/debian/rules
--- gftp-2.0.19/debian/rules	2011-11-25 01:18:31.000000000 +0600
+++ gftp-2.0.19/debian/rules	2016-11-30 00:12:22.000000000 +0500
@@ -1,35 +1,20 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_ARCH_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- CFLAGS="-O2 -g -Wall -D_GNU_SOURCE" ./configure \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
+	dh_auto_configure -- \
 		--enable-textport=yes \
 		--disable-ssl
 
 override_dh_auto_install:
 	dh_auto_install
 	convert -geometry 32x32 $(CURDIR)/debian/tmp/usr/share/pixmaps/gftp.png $(CURDIR)/debian/tmp/usr/share/pixmaps/gftp.xpm
-	install -m 755 $(CURDIR)/docs/parse-netrc.pl $(CURDIR)/debian/gftp-common/usr/share/doc/gftp-common/examples
-	mv $(CURDIR)/debian/tmp/usr/share/gftp/gftprc $(CURDIR)/debian/gftp-common/etc/gftp
-	mv $(CURDIR)/debian/tmp/usr/share/gftp/bookmarks $(CURDIR)/debian/gftp-common/etc/gftp
+	install -d debian/tmp/etc/gftp
+	cd debian/tmp && mv usr/share/gftp/gftprc etc/gftp
+	cd debian/tmp && mv usr/share/gftp/bookmarks etc/gftp
 	ln -s /etc/gftp/gftprc $(CURDIR)/debian/tmp/usr/share/gftp/gftprc
 	ln -s /etc/gftp/bookmarks $(CURDIR)/debian/tmp/usr/share/gftp/bookmarks

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
This was uploaded as QA upload.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

--- End Message ---
Reply to: