- modified to version 2.0.18

Changed files:
    gftp-configure_in.patch -> 1.5
    gftp-desktop.patch -> 1.9
    gftp-locale_names.patch -> 1.3

diff --git a/gftp-configure_in.patch b/gftp-configure_in.patch
index 38218c161ad6617f00043c7d13374f1b74deaab5..6b1c901599fad72cdf3f031af2a9e4449ae11fa8 100644 (file)
--- a/gftp-configure_in.patch
+++ b/gftp-configure_in.patch
@@ -1,5 +1,5 @@
---- gftp-2.0.17/configure.in.orig      2004-03-29 02:00:10.000000000 +0200
-+++ gftp-2.0.17/configure.in   2004-10-23 20:03:32.147303184 +0200
+--- gftp-2.0.18_old/configure.in       2005-02-12 22:38:26.029161880 +0100
++++ gftp-2.0.18/configure.in   2005-02-12 23:13:17.369229864 +0100
 @@ -41,7 +41,7 @@
  AM_C_PROTOTYPES
  AC_C_CONST
@@ -9,12 +9,15 @@
  
  AM_MAINTAINER_MODE
  
-@@ -55,7 +55,7 @@
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h libutil.h limits.h malloc.h pty.h strings.h sys/ioctl.h sys/time.h unistd.h stdint.h sys/mkdev.h)
+@@ -56,9 +56,9 @@
+ AC_CHECK_HEADERS(fcntl.h libutil.h limits.h malloc.h pty.h strings.h sys/ioctl.h sys/time.h unistd.h stdint.h sys/mkdev.h inttypes.h)
  
+ dnl AM_TYPE_PTRDIFF_T
 -AC_TYPE_SOCKLEN_T
 +dnl AC_TYPE_SOCKLEN_T
  AC_TYPE_MODE_T
+-AC_TYPE_INTPTR_T
++dnl AC_TYPE_INTPTR_T
  AC_TYPE_PID_T
  AC_TYPE_SIZE_T
+ AC_HEADER_TIME

diff --git a/gftp-desktop.patch b/gftp-desktop.patch
index ee8eed5d99def81cb474072836084c56ad94bfc4..9e943ebb6a829d9f8afc628b69c1843303eaaee9 100644 (file)
--- a/gftp-desktop.patch
+++ b/gftp-desktop.patch
@@ -1,38 +1,39 @@
---- gftp-2.0.16.orig/docs/gftp.desktop 2002-08-05 21:46:56.000000000 +0200
-+++ gftp-2.0.16/docs/gftp.desktop      2003-11-30 20:50:16.000000000 +0100
-@@ -1,4 +1,5 @@
+--- gftp-2.0.18/docs/gftp.desktop      2004-11-03 23:11:57.000000000 +0100
++++ gftp-2.0.17/docs/gftp.desktop      2002-08-05 21:46:56.000000000 +0200
+@@ -1,12 +1,29 @@
  [Desktop Entry]
-+Encoding=UTF-8
+-Version=1.0
+-Encoding=UTF-8
  Name=gFTP
- Name[br]=gFTP
- Name[da]=gFTP
-@@ -10,20 +11,22 @@
- Name[nl]=gFTP
- Name[pl]=gFTP
- Name[pt_BR]=gFTP
--Name[zh_TW.Big5]=gFTP
-+Name[zh_TW]=gFTP
- Comment=Multithreaded ftp client
- Comment[br]=Cliente de ftp multithreaded
--Comment[da]=Flertrådet ftpklient
-+Comment[da]=Flertrådet ftpklient
- Comment[de]=Multithreaded FTP Programm
- Comment[es]=Cliente FTP multihilo
- Comment[fr]=Client ftp multithread 
--Comment[ja]=¥Þ¥ë¥Á¥¹¥ì¥Ã¥ÉFTP¥¯¥é¥¤¥¢¥ó¥È
--Comment[ko]=´ÙÁß¾²·¹µå FTP ÇÁ·Î±×·¥
-+Comment[ja]=マルチスレッドFTPクライアント
-+Comment[ko]=다중쓰레드 FTP 프로그램
- Comment[nl]=Multithreaded ftp programma
--Comment[pl]=Wielozadaniowy klient FTP
-+Comment[pl]=Wielowątkowy klient FTP
- Comment[pt_BR]=Cliente FTP multi-tarefa
--Comment[zh_TW.Big5]=¦h½uºü  ftp client
-+Comment[zh_TW]=多線緒  ftp client
- Exec=gftp
+-GenericName=gFTP
+-Comment=Download and upload files using multiple file transfer protocols
+-Exec=gftp %u
+-TryExec=gftp
++Name[br]=gFTP
++Name[da]=gFTP
++Name[de]=gFTP
++Name[es]=gFTP
++Name[fr]=gFTP
++Name[ja]=gFTP
++Name[ko]=gFTP
++Name[nl]=gFTP
++Name[pl]=gFTP
++Name[pt_BR]=gFTP
++Name[zh_TW.Big5]=gFTP
++Comment=Multithreaded ftp client
++Comment[br]=Cliente de ftp multithreaded
++Comment[da]=Flertrådet ftpklient
++Comment[de]=Multithreaded FTP Programm
++Comment[es]=Cliente FTP multihilo
++Comment[fr]=Client ftp multithread 
++Comment[ja]=¥Þ¥ë¥Á¥¹¥ì¥Ã¥ÉFTP¥¯¥é¥¤¥¢¥ó¥È
++Comment[ko]=´ÙÁß¾²·¹µå FTP ÇÁ·Î±×·¥
++Comment[nl]=Multithreaded ftp programma
++Comment[pl]=Wielozadaniowy klient FTP
++Comment[pt_BR]=Cliente FTP multi-tarefa
++Comment[zh_TW.Big5]=¦h½uºü  ftp client
++Exec=gftp
  Icon=gftp.png
--Terminal=0
-+Terminal=false
+ Terminal=0
  Type=Application
-+Categories=GTK;Network;FileTransfer;
-+# vi: encoding=utf-8
+-Categories=Application;GTK;GNOME;Network;FileTransfer;

diff --git a/gftp-locale_names.patch b/gftp-locale_names.patch
index 5b7f01ce4661914879b45624921408817812d48c..dda7e1e73edb9f752ebb5b5eb03d287e1f32284e 100644 (file)
--- a/gftp-locale_names.patch
+++ b/gftp-locale_names.patch
@@ -1,24 +1,22 @@
-diff -aurN gftp-2.0.17.orig/configure gftp-2.0.17/configure
---- gftp-2.0.17.orig/configure 2004-03-29 02:00:22.000000000 +0200
-+++ gftp-2.0.17/configure      2004-10-23 20:37:28.320757768 +0200
-@@ -973,7 +973,7 @@
+--- gftp-2.0.18_old/configure  2005-02-12 22:38:26.025162488 +0100
++++ gftp-2.0.18/configure      2005-02-12 23:07:26.353592352 +0100
+@@ -1767,7 +1767,7 @@
  
  
  
--ALL_LINGUAS="am az ar be bg bn ca cs da de el es fi fr ga hr hu it ja ko mk ml ms nl no pl pt pt_BR ro ru sk sr sr@Latn sv ta th tr uk zh_CN zh_TW"
-+ALL_LINGUAS="am az ar be bg bn ca cs da de el es fi fr ga hr hu it ja ko mk ml ms nb nl pl pt pt_BR ro ru sk sr sr@Latn sv ta th tr uk zh_CN zh_TW"
- 
+-ALL_LINGUAS="am az ar be bg bn ca cs da de el en_CA en_GB es fi fr ga hr hu it ja ko mk ml ms nl no pa pl pt pt_BR ro ru sk sq sr sr@Latn sv ta th tr uk zh_CN zh_TW"
++ALL_LINGUAS="am az ar be bg bn ca cs da de el en_CA en_GB es fi fr ga hr hu it ja ko mk ml ms nb nl pa pl pt pt_BR ro ru sk sq sr sr@Latn sv ta th tr uk zh_CN zh_TW"
  
  # Make sure we can run config.sub.
-diff -aurN gftp-2.0.17.orig/configure.in gftp-2.0.17/configure.in
---- gftp-2.0.17.orig/configure.in      2004-03-29 02:00:10.000000000 +0200
-+++ gftp-2.0.17/configure.in   2004-10-23 20:37:07.099983816 +0200
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+--- gftp-2.0.18_old/configure.in       2005-02-12 22:38:26.029161880 +0100
++++ gftp-2.0.18/configure.in   2005-02-12 23:07:47.068443216 +0100
 @@ -28,7 +28,7 @@
  AC_SUBST(VERSION)
  AC_SUBST(PREFIX)
  
--ALL_LINGUAS="am az ar be bg bn ca cs da de el es fi fr ga hr hu it ja ko mk ml ms nl no pl pt pt_BR ro ru sk sr sr@Latn sv ta th tr uk zh_CN zh_TW"
-+ALL_LINGUAS="am az ar be bg bn ca cs da de el es fi fr ga hr hu it ja ko mk ml ms nb nl pl pt pt_BR ro ru sk sr sr@Latn sv ta th tr uk zh_CN zh_TW"
+-ALL_LINGUAS="am az ar be bg bn ca cs da de el en_CA en_GB es fi fr ga hr hu it ja ko mk ml ms nl no pa pl pt pt_BR ro ru sk sq sr sr@Latn sv ta th tr uk zh_CN zh_TW"
++ALL_LINGUAS="am az ar be bg bn ca cs da de el en_CA en_GB es fi fr ga hr hu it ja ko mk ml ms nb nl pa pl pt pt_BR ro ru sk sq sr sr@Latn sv ta th tr uk zh_CN zh_TW"
  
  AC_CANONICAL_HOST
  AC_PROG_CC