changeset 312:a2ec3572dea2

2003-11-9 Brian Masney <[e-mail]> * debian/* - updated Debian package files from Aurelien Jarno <[e-mail]>

--- a/ChangeLog	Sun Nov 09 13:56:22 2003 +0000
+++ b/ChangeLog	Mon Nov 10 01:42:38 2003 +0000
@@ -1,4 +1,7 @@
 2003-11-9 Brian Masney <[e-mail]>
+	* debian/* - updated Debian package files from 
+	Aurelien Jarno <[e-mail]>
+
 	* debian/ChangeLog - incremented version to 2.0.16
 
 	* docs/Makefile.am - clean up documentation in clean target
@@ -1742,7 +1745,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.171 2003/11/09 13:56:21 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.172 2003/11/10 01:42:37 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 

--- a/debian/changelog	Sun Nov 09 13:56:22 2003 +0000
+++ b/debian/changelog	Mon Nov 10 01:42:38 2003 +0000
@@ -1,14 +1,90 @@
 gftp (2.0.16-1) unstable; urgency=low
 
-  * New release. See CHANGELOG for details on changes in this release
+  * New upstream release. 
+
+ -- Aurelien Jarno <[e-mail]>  Sun,  9 Nov 2003 16:01:01 +0100
+
+gftp (2.0.15-8) unstable; urgency=low
+
+  * Added a patch to fix a refresh distant files bug.
+  * Patch pulled from CVS: dont't attempt to log again, if the code 5xx
+    is returned.
+
+ -- Aurelien Jarno <[e-mail]>  Mon, 13 Oct 2003 12:18:38 +0200
+
+gftp (2.0.15-7) unstable; urgency=low
+
+  * Patch pulled from CVS: fix for CRAY directory listings. Some UNIX
+    directory listings with files containing spaces could be 
+    misinterpreted (closes: bug#190814).
+
+ -- Aurelien Jarno <[e-mail]>  Sun,  5 Oct 2003 15:05:28 +0200
+
+gftp (2.0.15-6) unstable; urgency=low
+
+  * Patch pulled from CVS: Zero-out the number of bytes of the next item 
+    in the download queue (closes: bug#201190).
+
+ -- Aurelien Jarno <[e-mail]>  Thu,  2 Oct 2003 18:35:10 +0200
 
- -- Brian Masney <[e-mail]>  Sun, 09 Nov 2003 08:54:21 -0500
+gftp (2.0.15-5) unstable; urgency=low
+
+  * Fixed file renaming (closes: bug#211311). 
+
+ -- Aurelien Jarno <[e-mail]>  Sun, 28 Sep 2003 21:06:02 +0200
+
+gftp (2.0.15-4) unstable; urgency=low
+
+  * Added a script call parse-netrc.pl to /usr/share/doc/gftp-{common,gtk,
+    text}/examples, which converts bookmarks from netrc to gftp format
+    (closes: bug#128883).
+  * Pulled a patch from CVS to fix a refresh files bug.
+
+ -- Aurelien Jarno <[e-mail]>  Thu, 25 Sep 2003 08:31:55 +0200
+
+gftp (2.0.15-3) unstable; urgency=low
+
+  * Applied patch from upstream to fix wrong directory entries.
+  * Fixed "Save directory listing" option (closes: bug#195136).
+
+ -- Aurelien Jarno <[e-mail]>  Mon, 22 Sep 2003 00:24:19 +0200
+
+gftp (2.0.15-2) unstable; urgency=low
+
+  * Oops, I forgot to change the maintainer in debian/control. Done.
+
+ -- Aurelien Jarno <[e-mail]>  Sun, 21 Sep 2003 20:42:00 +0200
 
 gftp (2.0.15-1) unstable; urgency=low
 
-  * New release. See CHANGELOG for details on changes in this release
+  * New maintainer (closes: bug#211998).
+  * Acknowledge previous NMU (closes: bug#157018, #167185, #176188, #176206,
+    #176337, #176682, #192598).
+  * Updated debian/copyright.
+  * Uses debian/compat instead of DH_COMPAT.
+  * debian/control:
+    + Added homepage and author to the description.
+    + Depends on ${misc:Depends}.
+    + Changed gftp to arch all as it is only a transitionnal package.
+  * debian/control:
+    + Uses dh_install instead of dh_movefiles.
+    + Uses autotools-dev to update config.{guess,sub}.
+    + Don't install README, THANKS, TODO and USERS-GUIDE in all three gftp-*
+      packages. Put them only in gftp-common and create links to them in
+      gftp-gtk and gftp-text.
 
- -- Brian Masney <[e-mail]>  Wed, 20 Aug 2003 19:41:35 -0400
+ -- Aurelien Jarno <[e-mail]>  Sun, 21 Sep 2003 20:17:02 +0200
+
+gftp (2.0.15-0.1) unstable; urgency=low
+
+  * 0-day NMU.
+  * New upstream release:
+    - Fixes for transferring files greater than 2.1GB (closes: bug#157018).
+    - Filename with spaces are now correctly handled (closes: bug#161785).
+  * Create the menu icon from /usr/share/gftp/gftp.png (closes: bug#192598).
+  * Upgraded policy compliance to 3.6.1 (no changes).
+
+ -- Aurelien Jarno <[e-mail]>  Sun, 14 Sep 2003 22:08:31 +0200
 
 gftp (2.0.14-1.1) unstable; urgency=low
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/compat	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,1 @@
+4

--- a/debian/control	Sun Nov 09 13:56:22 2003 +0000
+++ b/debian/control	Mon Nov 10 01:42:38 2003 +0000
@@ -1,25 +1,24 @@
 Source: gftp
 Section: net
 Priority: optional
-Maintainer: Aurelien Beaujean <[e-mail]>
-Build-Depends: debhelper (>= 2), libreadline4-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0)
-Standards-Version: 3.5.10
+Maintainer: Aurelien Jarno <[e-mail]>
+Build-Depends: debhelper (>> 4.0.0), autotools-dev, libreadline4-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0), imagemagick
+Standards-Version: 3.6.1
 
 Package: gftp
-Architecture: any
-Depends: gftp-gtk, gftp-text, gftp-common
+Architecture: all
+Depends: ${misc:Depends}, gftp-gtk (= ${Source-Version}), gftp-text (= ${Source-Version})
 Description: X/GTK+ FTP client
  gFTP is a multithreaded FTP client, available in two versions:
   * version for X, written using GLib and GTK+
   * version for the console, using only GLib
  .
- This is an upgrade convenience package, it's only useful for depending on 
+ This is an upgrade convenience package, it's only useful for depending on.
 
 Package: gftp-gtk
 Architecture: any
-Depends: ${shlibs:Depends}, gftp-common (>= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, gftp-common (= ${Source-Version})
 Conflicts: gftp-common (<< 2.0.14-1)
-Replaces: gftp-common (<< 2.0.14-1)
 Description: X/GTK+ FTP client
  gFTP is a multithreaded FTP client. This version of it runs under X
  and was written using GLib/GTK+.
@@ -37,10 +36,13 @@
    * support for SSH and SSH2 file transfers,
    * support FXP transferts,
    * stop button, and many more features.
+ .   
+  Author:   Brian Masney <[e-mail]>
+  Homepage: http://www.gftp.org
 
 Package: gftp-text
 Architecture: any
-Depends: ${shlibs:Depends}, gftp-common (>= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, gftp-common (= ${Source-Version})
 Description: colored FTP client using GLib
  gFTP is a multithreaded FTP client. This version of it runs under console
  and was written using GLib.
@@ -58,10 +60,13 @@
    * support for SSH and SSH2 file transfers,
    * support FXP transferts,
    * stop button, and many more features.
+ .   
+  Author:   Brian Masney <[e-mail]>
+  Homepage: http://www.gftp.org
 
 Package: gftp-common
 Architecture: any
-Depends: gftp-gtk (= ${Source-Version}) | gftp-text (= ${Source-Version})
+Depends: ${misc:Depends}, gftp-gtk (= ${Source-Version}) | gftp-text (= ${Source-Version})
 Description: shared files for other gFTP packages
  gFTP is a multithreaded FTP client. This package contains the locale data
  used by both gftp-gtk and gftp-text, along with a common manual page.
@@ -79,3 +84,7 @@
    * support for SSH and SSH2 file transfers,
    * support FXP transferts,
    * stop button, and many more features.
+ .   
+  Author:   Brian Masney <[e-mail]>
+  Homepage: http://www.gftp.org
+

--- a/debian/copyright	Sun Nov 09 13:56:22 2003 +0000
+++ b/debian/copyright	Mon Nov 10 01:42:38 2003 +0000
@@ -1,24 +1,13 @@
 This package was originally debianized by Martin Schulze on 5 Jan 1999, and
-later maintained by Brian E. Ermovick and then Josip Rodin. Today, it's
-maintained by Aurelien Beaujean <[e-mail]>
+later maintained by Brian E. Ermovick, then Josip Rodinand and, then Aurelien
+Beaujean. Today, it's maintained by Aurelien Jarno <[e-mail]>.
 
-Original source can be found at: http://www.gftp.org/
-
-Copyright (C) 1998-2002 Brian Masney <[e-mail]>
+It was downloaded from http://www.gftp.org/
 
-   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.
+Upstream Author: Brian Masney <[e-mail]>
+
+Copyright:
 
-   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. 
-   59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-On Debian systems, the complete text of the GNU General Public License can
-be found in the `/usr/share/common-licenses/GPL' file.
+You are free to distribute this software under the terms of the GNU General
+Public License.  On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-common.dirs	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/gftp-common/examples

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-common.docs	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,4 @@
+README
+TODO
+THANKS
+docs/USERS-GUIDE

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-common.install	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,5 @@
+usr/bin/gftp
+usr/share/gftp/gftprc
+usr/share/gftp/bookmarks
+usr/share/locale/*
+usr/share/man/man1/gftp.1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-gtk.install	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,5 @@
+usr/bin/gftp-gtk
+usr/share/gftp/*.xpm
+usr/share/gnome/apps/Internet/gftp.desktop
+usr/share/pixmaps/gftp.png
+usr/share/pixmaps/gftp.xpm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-gtk.links	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,6 @@
+usr/share/man/man1/gftp.1.gz usr/share/man/man1/gftp-gtk.1.gz
+usr/share/doc/gftp-common/README.gz usr/share/doc/gftp-gtk/README.gz
+usr/share/doc/gftp-common/USERS-GUIDE.gz usr/share/doc/gftp-gtk/USERS-GUIDE.gz
+usr/share/doc/gftp-common/THANKS usr/share/doc/gftp-gtk/THANKS
+usr/share/doc/gftp-common/TODO usr/share/doc/gftp-gtk/TODO
+usr/share/doc/gftp-common/examples/parse-netrc.pl usr/share/doc/gftp-gtk/examples/parse-netrc.pl

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-gtk.menu	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,6 @@
+?package(gftp-gtk): \
+	needs=X11 \
+	section="Apps/Net" \
+	title="gFTP" \
+	command="gftp" \
+	icon="/usr/share/pixmaps/gftp.xpm"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-text.install	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,1 @@
+usr/bin/gftp-text

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/gftp-text.links	Mon Nov 10 01:42:38 2003 +0000
@@ -0,0 +1,6 @@
+usr/share/man/man1/gftp.1.gz usr/share/man/man1/gftp-text.1.gz
+usr/share/doc/gftp-common/README.gz usr/share/doc/gftp-text/README.gz
+usr/share/doc/gftp-common/USERS-GUIDE.gz usr/share/doc/gftp-text/USERS-GUIDE.gz
+usr/share/doc/gftp-common/THANKS usr/share/doc/gftp-text/THANKS
+usr/share/doc/gftp-common/TODO usr/share/doc/gftp-text/TODO
+usr/share/doc/gftp-common/examples/parse-netrc.pl usr/share/doc/gftp-text/examples/parse-netrc.pl

--- a/debian/rules	Sun Nov 09 13:56:22 2003 +0000
+++ b/debian/rules	Mon Nov 10 01:42:38 2003 +0000
@@ -1,85 +1,140 @@
 #!/usr/bin/make -f
-# Derived from dh_make example.
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
-arch := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export DH_COMPAT=2
 
-ggtmp := $(CURDIR)/debian/gftp-gtk
-gttmp := $(CURDIR)/debian/gftp-text
+# 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)
 
-CFLAGS := -O2
-ifneq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
-CFLAGS += -g
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
 endif
-ifeq "$(arch)" "alpha"
-CFLAGS += -mieee
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+ifeq ($(DEB_ARCH_GNU_TYPE), "alpha")
+	CFLAGS += -mieee
 endif
 
-build: build-stamp
-build-stamp:
+config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir='$${prefix}/share/man' --enable-textport=yes
+	
+	-test -r /usr/share/misc/config.sub && \
+	cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	cp -f /usr/share/misc/config.guess config.guess
+				
+	./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--enable-textport=yes 
+
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
 	$(MAKE) 
-	touch $@
+	touch build-stamp
 
-clean:
+clean: debian-clean
+	dh_clean
+
+debian-clean:
 	dh_testdir
 	dh_testroot
-#	rm -f debian/dirs debian/docs
-	rm -f debian/dirs
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean build-stamp
+	-$(MAKE) distclean
+	-rm -f *-stamp
+	-rm -f config.sub config.guess
 
-install: build-stamp
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) install prefix=$(ggtmp)/usr
-	ln -s gftp.1.gz $(ggtmp)/usr/share/man/man1/gftp-gtk.1.gz
-	dh_movefiles --sourcedir=debian/gftp-gtk -pgftp-common \
-          usr/share/locale usr/share/gftp/gftprc usr/share/gftp/bookmarks \
-          usr/share/man/man1/gftp.1 usr/bin/gftp
-	dh_installdirs -pgftp-gtk usr/lib/menu
+	dh_installdirs
+	
+	# Main install.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	
+	# Install icon
+	convert -geometry 32x32 $(CURDIR)/debian/tmp/usr/share/pixmaps/gftp.png $(CURDIR)/debian/tmp/usr/share/pixmaps/gftp.xpm
 
-	# Install menu file manualy into the gftp-common file because
-	# dh_installmenu cannot do it for me
-	install -p -m644 debian/menu debian/gftp-gtk/usr/lib/menu/gftp
-	echo "# Automatically added by dh_installmenu">> debian/gftp-gtk.postinst.debhelper
-	sed "" /usr/share/debhelper/autoscripts/postinst-menu >> debian/gftp-gtk.postinst.debhelper
-	echo '# End automatically added section' >> debian/gftp-gtk.postinst.debhelper
-	echo "# Automatically added by dh_installmenu">> debian/gftp-gtk.postrm.debhelper
-	sed "" /usr/share/debhelper/autoscripts/postrm-menu >> debian/gftp-gtk.postrm.debhelper
-	echo '# End automatically added section' >> debian/gftp-gtk.postrm.debhelper
+	# Move all files in their corresponding package
+	dh_install --sourcedir=debian/tmp
 
-	dh_movefiles --sourcedir=debian/gftp-gtk -pgftp-text usr/bin/gftp-text
-	dh_installdirs -pgftp-text usr/share/man/man1
-	ln -s gftp.1.gz $(gttmp)/usr/share/man/man1/gftp-text.1.gz
-	rm -f $(ggtmp)/usr/share/gftp/COPYING # we have the GPL elsewhere
-	find $(ggtmp)/usr -type d -empty | xargs -r rmdir -p --ignore-fail-on-non-empty
-
-binary-indep:
-# Nothing to do, no architecture independent packages here.
-# locales (gftp-common) have endianness
+	# Install parse-netrc.pl
+	install -m 755 $(CURDIR)/docs/parse-netrc.pl $(CURDIR)/debian/gftp-common/usr/share/doc/gftp-common/examples
+	
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf
+	dh_installdocs -i
+#	dh_installexamples
+#	dh_installmenu
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installman
+#	dh_installinfo
+	dh_installchangelogs -i ChangeLog
+	dh_link -i
+#	dh_strip
+	dh_compress -i
+	dh_fixperms -i
+#	dh_makeshlibs
+	dh_installdeb -i
+#	dh_perl
+#	dh_shlibdeps
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+	
 
-binary-arch: install
-	dh_testdir
-	dh_testroot
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+
+	# Hack to remove files from the upstream tarball
+	-rm -f debian/dirs
+	-rm -f debian/docs
+	-rm -f debian/menu
+	
+	dh_installdebconf -a	
 	dh_installdocs -a
-	dh_installdocs -An -pgftp-gtk -pgftp-text README TODO
+#	dh_installexamples
+	dh_installmenu -a
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+	dh_installcron -a
+	dh_installman -a
+	dh_installinfo -a	
 	dh_installchangelogs -a ChangeLog
-	#dh_installmenu -a --package=gftp-gtk
-ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
+	dh_link -a
 	dh_strip -a
-endif
 	dh_compress -a
 	dh_fixperms -a
+#	dh_makeshlibs
 	dh_installdeb -a
+#	dh_perl
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
-
+	
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install