packages: minicom/minicom-check_exec.patch, minicom/minicom-tinfo.patch, mi...

[arekm]

Author: arekm                        Date: Thu Feb  3 16:08:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.5

---- Files affected:
packages/minicom:
   minicom-check_exec.patch (1.10 -> 1.11) , minicom-tinfo.patch (1.2 -> 1.3) , minicom.spec (1.87 -> 1.88) , minicom-umask.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/minicom/minicom-check_exec.patch
diff -u packages/minicom/minicom-check_exec.patch:1.10 packages/minicom/minicom-check_exec.patch:1.11
--- packages/minicom/minicom-check_exec.patch:1.10	Sun Nov  2 00:58:32 2008
+++ packages/minicom/minicom-check_exec.patch	Thu Feb  3 17:08:45 2011
@@ -38,7 +38,7 @@
 +msgid "Error executing `%s'"
 +msgstr "Chyba pøi spu¹tìní `%s'"
 +
- #: src/updown.c:362
+ #: src/updown.c:426
  msgid ""
  "\n"
 --- minicom-2.2/po/es.po.orig	2006-10-16 09:55:19.000000000 +0200
@@ -52,7 +52,7 @@
 +msgid "Error executing `%s'"
 +msgstr "Error al ejecutar `%s'"
 +
- #: src/updown.c:362
+ #: src/updown.c:426
  msgid ""
  "\n"
 --- minicom-2.2/po/fr.po.orig	2006-10-16 09:55:19.000000000 +0200
@@ -66,7 +66,7 @@
 +msgid "Error executing `%s'"
 +msgstr "Erreur lors de l'exécution de `%s'"
 +
- #: src/updown.c:362
+ #: src/updown.c:426
  msgid ""
  "\n"
 diff -ur minicom-2.00.0.orig/po/ja.po minicom-2.00.0/po/ja.po
@@ -82,7 +82,7 @@
 +msgstr "¼Â¹Ô¥¨¥é¡¼ `%s'"
 +
  # c-format(wprintf)
- #: src/updown.c:359
+ #: src/updown.c:426
  msgid ""
 --- minicom-2.2/po/pl.po.orig	2006-10-25 19:57:04.234956000 +0200
 +++ minicom-2.2/po/pl.po	2006-10-25 20:10:05.011751500 +0200
@@ -95,7 +95,7 @@
 +msgid "Error executing `%s'"
 +msgstr "Wyst±pi³ b³±d podczas wykonywania `%s'"
 +
- #: src/updown.c:362
+ #: src/updown.c:426
  msgid ""
  "\n"
 --- minicom-2.3/po/pt_BR.po.orig	2008-02-24 11:49:07.000000000 +0100
@@ -109,7 +109,7 @@
 +msgid "Error executing `%s'"
 +msgstr "Erro ao executar `%s'"
 +
- # ../file.c:334 ../updown.c:243
- #: src/updown.c:249
+ # ../file.c:334 ../updown.c:243
+ #: src/updown.c:299
  msgid "upload"
 

================================================================
Index: packages/minicom/minicom-tinfo.patch
diff -u packages/minicom/minicom-tinfo.patch:1.2 packages/minicom/minicom-tinfo.patch:1.3
--- packages/minicom/minicom-tinfo.patch:1.2	Fri Sep  5 15:17:41 2008
+++ packages/minicom/minicom-tinfo.patch	Thu Feb  3 17:08:45 2011
@@ -11,17 +11,18 @@
  fi
 --- minicom-2.3/src/window.c.orig	2008-09-05 12:44:15.000000000 +0200
 +++ minicom-2.3/src/window.c	2008-09-05 15:03:07.000000000 +0200
-@@ -28,7 +28,12 @@
- #include <limits.h>
+@@ -26,6 +26,13 @@
  #include <stdarg.h>
  #include <wchar.h>
--#include <termcap.h>
+ 
 +#ifdef HAVE_TERMCAP_H
 +#  include <termcap.h>
 +#endif
 +#ifdef HAVE_NCURSES_TERMCAP_H
 +#  include <ncurses/termcap.h>
 +#endif
- 
++
  #include "port.h"
  #include "minicom.h"
+ #include "intl.h"
+

================================================================
Index: packages/minicom/minicom.spec
diff -u packages/minicom/minicom.spec:1.87 packages/minicom/minicom.spec:1.88
--- packages/minicom/minicom.spec:1.87	Mon May 31 06:32:36 2010
+++ packages/minicom/minicom.spec	Thu Feb  3 17:08:45 2011
@@ -13,22 +13,21 @@
 Summary(uk.UTF-8):	Комунікаційний пакет типу Telix для текстового режиму
 Summary(zh_CN.UTF-8):	一个文本界面的调试解调器控制器和终端模拟器。
 Name:		minicom
-Version:	2.4
+Version:	2.5
 Release:	1
 License:	GPL v2
 Group:		Applications/Communications
-Source0:	http://alioth.debian.org/download.php/3195/%{name}-%{version}.tar.gz
-# Source0-md5:	774df678cf7cbc7bbf6bab8f60672efd
+Source0:	http://alioth.debian.org/download.php/3487/%{name}-%{version}.tar.gz
+# Source0-md5:	a5117d4d21e2c9e825edb586ee2fe8d2
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source3-md5:	93ca30842bce63473004570b6b30be25
 Patch0:		%{name}-fromsnap.patch
 Patch1:		%{name}-man.patch
-Patch2:		%{name}-umask.patch
-Patch3:		%{name}-check_exec.patch
-Patch4:		%{name}-man_no_ko.patch
-Patch5:		%{name}-tinfo.patch
+Patch2:		%{name}-check_exec.patch
+Patch3:		%{name}-man_no_ko.patch
+Patch4:		%{name}-tinfo.patch
 URL:		http://alioth.debian.org/projects/minicom/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.7
@@ -92,12 +91,12 @@
 
 %prep
 %setup -q
+%undos po/pt_BR.po
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 rm -f po/stamp-po
 
@@ -192,6 +191,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2011/02/03 16:08:45  arekm
+- up to 2.5
+
 Revision 1.87  2010/05/31 04:32:36  arekm
 - upstream tarball
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/minicom/minicom-check_exec.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/minicom/minicom-tinfo.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/minicom/minicom.spec?r1=1.87&r2=1.88&f=u