diff -u gftp-2.0.18/debian/control gftp-2.0.18/debian/control --- gftp-2.0.18/debian/control +++ gftp-2.0.18/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Aurélien GÉRÔME -Build-Depends: debhelper (>> 4.0.0), autotools-dev, libreadline5-dev | libreadline-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0), imagemagick +Build-Depends: debhelper (>> 4.0.0), autotools-dev, libreadline5-dev | libreadline-dev, libgtk2.0-dev (>= 2.0.9), libglib2.0-dev (>= 2.2.0), imagemagick, dpatch Standards-Version: 3.7.3 Homepage: http://www.gftp.org/ Vcs-Git: git://git.roxor.cx/git/gftp/ diff -u gftp-2.0.18/debian/rules gftp-2.0.18/debian/rules --- gftp-2.0.18/debian/rules +++ gftp-2.0.18/debian/rules @@ -5,6 +5,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make + # 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) @@ -34,12 +36,12 @@ --disable-ssl build: build-stamp -build-stamp: config.status +build-stamp: patch-stamp config.status dh_testdir $(MAKE) touch build-stamp -clean: debian-clean +clean: unpatch debian-clean dh_clean debian-clean: diff -u gftp-2.0.18/debian/changelog gftp-2.0.18/debian/changelog --- gftp-2.0.18/debian/changelog +++ gftp-2.0.18/debian/changelog @@ -1,3 +1,12 @@ +gftp (2.0.18-17ubuntu2) hardy; urgency=low + + * debian/control, debian/rules, debian/patches/00list: + - added dpatch support + * debian/patches/strings-fix.dpatch: + - fixed some strings (LP: #64597) + + -- Mario Bonino Wed, 19 Dec 2007 09:33:07 +0100 + gftp (2.0.18-17ubuntu1) hardy; urgency=low * Sync with Debian only in patch2: unchanged: --- gftp-2.0.18.orig/debian/patches/00list +++ gftp-2.0.18/debian/patches/00list @@ -0,0 +1 @@ +strings-fix.dpatch only in patch2: unchanged: --- gftp-2.0.18.orig/debian/patches/strings-fix.dpatch +++ gftp-2.0.18/debian/patches/strings-fix.dpatch @@ -0,0 +1,189 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## strings-fix.dpatch by Mario Bonino +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to fix mistakes in some strings. + +@DPATCH@ +diff -urNad gftp-2.0.18~/docs/USERS-GUIDE gftp-2.0.18/docs/USERS-GUIDE +--- gftp-2.0.18~/docs/USERS-GUIDE 2002-08-05 21:46:56.000000000 +0200 ++++ gftp-2.0.18/docs/USERS-GUIDE 2007-12-19 09:42:05.000000000 +0100 +@@ -480,9 +480,9 @@ + + On the top line of gFTP you will see the word "Local". Click on Local + and you will get a pop down menu. Click on "Open URL" and you will get a +-command line window. You can enter an URL name in this command line in a manner ++command line window. You can enter a URL name in this command line in a manner + very similar to the way it works in most web browsers. You can type in the +-URL, paste the URL from the clipboard, or Drag and Drop an URL from another ++URL, paste the URL from the clipboard, or Drag and Drop a URL from another + application (say Konqueror). gFTP will connect to the site you specify in the + Open URL window. + +@@ -515,7 +515,7 @@ + + If you want to specify several files to transfer one after the other then you + must first throw the "Start file transfer" toggle off by clicking on +-FTP->Options->Start file transfers->Apply->OK. If you are only transfering a ++FTP->Options->Start file transfers->Apply->OK. If you are only transferring a + single file then you can ignore the "Start file transfer" toggle. + + To transfer a file double click on the file name in the left directory +@@ -821,9 +821,9 @@ + + The right hand side of the transfer window shows the status of the + transfer(s) in progress. gFTP shows the % completion of the entire queue, the +-size of the file currently being transfered, how many bytes of the current file +-have already been transferred, which files are finished transfering, and which +-files are waiting to begin transfering. The progress report also shows the ++size of the file currently being transferred, how many bytes of the current file ++have already been transferred, which files are finished transferring, and which ++files are waiting to begin transferring. The progress report also shows the + current transfer rate and gives an estimated length of time until the entire + queue is transferred. Your milage may vary. + +@@ -1011,7 +1011,7 @@ + 14. SSH protocol + + SSH (Secure SHell) is a protocol which provides a high level of security +-for transfering files from one computer to another across the Internet. gFTP ++for transferring files from one computer to another across the Internet. gFTP + implements the SSH protocol by calling upon an SSH program to wrap a layer of + security around what would otherwise be an ordinary FTP tansfer. In effect + FTP "tunnels" through a secure SSH connection. +diff -urNad gftp-2.0.18~/docs/sample.gftp/gftprc gftp-2.0.18/docs/sample.gftp/gftprc +--- gftp-2.0.18~/docs/sample.gftp/gftprc 2004-11-05 03:34:51.000000000 +0100 ++++ gftp-2.0.18/docs/sample.gftp/gftprc 2007-12-19 09:41:48.000000000 +0100 +@@ -36,13 +36,13 @@ + # Overwrite files by default or set to resume file transfers + overwrite_default=0 + +-# Preserve file permissions of transfered files ++# Preserve file permissions of transferred files + preserve_permissions=1 + +-# Preserve file times of transfered files ++# Preserve file times of transferred files + preserve_time=1 + +-# Refresh the listbox after each file is transfered ++# Refresh the listbox after each file is transferred + refresh_files=0 + + # Put the directories first then the files +@@ -72,7 +72,7 @@ + # The maximum KB/s a file transfer can get. (Set to 0 to disable) + maxkbs=0.00 + +-# The block size that is used when transfering files. This should be a ++# The block size that is used when transferring files. This should be a + # multiple of 1024. + trans_blksize=20480 + +@@ -218,9 +218,9 @@ + # option to LIST + resolve_symlinks=1 + +-# If you are transfering a text file from Windows to UNIX box or vice versa, ++# If you are transferring a text file from Windows to UNIX box or vice versa, + # then you should enable this. Each system represents newlines differently for +-# text files. If you are transfering from UNIX to UNIX, then it is safe to ++# text files. If you are transferring from UNIX to UNIX, then it is safe to + # leave this off. If you are downloading binary data, you will want to disable + # this. + ascii_transfers=0 +diff -urNad gftp-2.0.18~/lib/gftp.h gftp-2.0.18/lib/gftp.h +--- gftp-2.0.18~/lib/gftp.h 2005-01-19 00:09:58.000000000 +0100 ++++ gftp-2.0.18/lib/gftp.h 2007-12-19 09:42:38.000000000 +0100 +@@ -250,8 +250,8 @@ + unsigned int selected : 1, /* Is this file selected? */ + was_sel : 1, /* Was this file selected before */ + shown : 1, /* Is this file shown? */ +- done_view : 1, /* View the file when done transfering? */ +- done_edit : 1, /* Edit the file when done transfering? */ ++ done_view : 1, /* View the file when done transferring? */ ++ done_edit : 1, /* Edit the file when done transferring? */ + done_rm : 1, /* Remove the file when done */ + transfer_done : 1, /* Is current file transfer done? */ + is_fd : 1; /* Is this a file descriptor? */ +@@ -532,11 +532,11 @@ + current_file_number, + current_file_retries; + +- off_t curtrans, /* Current transfered bytes for this file */ ++ off_t curtrans, /* Current transferred bytes for this file */ + tot_file_trans, /* Total number of bytes in the file being + transferred */ + curresumed, /* Resumed bytes for this file */ +- trans_bytes, /* Amount of data transfered for entire ++ trans_bytes, /* Amount of data transferred for entire + transfer */ + total_bytes, /* Grand total bytes for whole transfer */ + resumed_bytes; /* Grand total of resumed bytes for whole +diff -urNad gftp-2.0.18~/lib/options.h gftp-2.0.18/lib/options.h +--- gftp-2.0.18~/lib/options.h 2005-01-19 02:49:17.000000000 +0100 ++++ gftp-2.0.18/lib/options.h 2007-12-19 09:43:10.000000000 +0100 +@@ -74,17 +74,17 @@ + {"preserve_permissions", N_("Preserve file permissions"), + gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, + GFTP_CVARS_FLAGS_SHOW_BOOKMARK, +- N_("Preserve file permissions of transfered files"), GFTP_PORT_ALL, ++ N_("Preserve file permissions of transferred files"), GFTP_PORT_ALL, + NULL}, + {"preserve_time", N_("Preserve file time"), + gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, + GFTP_CVARS_FLAGS_SHOW_BOOKMARK, +- N_("Preserve file times of transfered files"), GFTP_PORT_ALL, ++ N_("Preserve file times of transferred files"), GFTP_PORT_ALL, + NULL}, + {"refresh_files", N_("Refresh after each file transfer"), + gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, + GFTP_CVARS_FLAGS_SHOW_BOOKMARK, +- N_("Refresh the listbox after each file is transfered"), GFTP_PORT_GTK, ++ N_("Refresh the listbox after each file is transferred"), GFTP_PORT_GTK, + NULL}, + {"sort_dirs_first", N_("Sort directories first"), + gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, +@@ -129,7 +129,7 @@ + {"trans_blksize", N_("Transfer Block Size:"), + gftp_option_type_int, GINT_TO_POINTER(20480), NULL, + GFTP_CVARS_FLAGS_SHOW_BOOKMARK, +- N_("The block size that is used when transfering files. This should be a multiple of 1024."), ++ N_("The block size that is used when transferring files. This should be a multiple of 1024."), + GFTP_PORT_ALL, NULL}, + + {"default_protocol", N_("Default Protocol:"), +diff -urNad gftp-2.0.18~/lib/rfc959.c gftp-2.0.18/lib/rfc959.c +--- gftp-2.0.18~/lib/rfc959.c 2007-12-19 09:28:44.000000000 +0100 ++++ gftp-2.0.18/lib/rfc959.c 2007-12-19 09:38:42.000000000 +0100 +@@ -84,7 +84,7 @@ + {"ascii_transfers", N_("Transfer files in ASCII mode"), + gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, + GFTP_CVARS_FLAGS_SHOW_BOOKMARK, +- N_("If you are transfering a text file from Windows to UNIX box or vice versa, then you should enable this. Each system represents newlines differently for text files. If you are transfering from UNIX to UNIX, then it is safe to leave this off. If you are downloading binary data, you will want to disable this."), ++ N_("If you are transferring a text file from Windows to UNIX box or vice versa, then you should enable this. Each system represents newlines differently for text files. If you are transferring from UNIX to UNIX, then it is safe to leave this off. If you are downloading binary data, you will want to disable this."), + GFTP_PORT_ALL, NULL}, + + {NULL, NULL, 0, NULL, NULL, 0, NULL, 0, NULL} +diff -urNad gftp-2.0.18~/src/gtk/transfer.c gftp-2.0.18/src/gtk/transfer.c +--- gftp-2.0.18~/src/gtk/transfer.c 2007-12-19 09:28:44.000000000 +0100 ++++ gftp-2.0.18/src/gtk/transfer.c 2007-12-19 09:39:08.000000000 +0100 +@@ -1,5 +1,5 @@ + /*****************************************************************************/ +-/* transfer.c - functions to handle transfering files */ ++/* transfer.c - functions to handle transferring files */ + /* Copyright (C) 1998-2003 Brian Masney */ + /* */ + /* This program is free software; you can redistribute it and/or modify */ +diff -urNad gftp-2.0.18~/src/uicommon/gftpui.c gftp-2.0.18/src/uicommon/gftpui.c +--- gftp-2.0.18~/src/uicommon/gftpui.c 2007-12-19 09:28:44.000000000 +0100 ++++ gftp-2.0.18/src/uicommon/gftpui.c 2007-12-19 09:40:03.000000000 +0100 +@@ -1488,7 +1488,7 @@ + { + tdata->fromreq->logging_function (gftp_logging_error, + tdata->fromreq, +- _("There was an error transfering the file %s"), ++ _("There was an error transferring the file %s"), + curfle->file); + } + }