[packages/gphoto2] - updated to 2.5.1 - updated pl.po-update patch - added ac patch (some recent autoconf/automake comp

qboosh qboosh at pld-linux.org
Mon Feb 4 20:52:21 CET 2013


commit 2685e8e29dc97b9d630e8703d1053be23ac8ab0e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 4 20:53:26 2013 +0100

    - updated to 2.5.1
    - updated pl.po-update patch
    - added ac patch (some recent autoconf/automake compatibility)

 gphoto2-ac.patch           |  10 ++++
 gphoto2-pl.po-update.patch | 133 +++++++++++++++++++++++++++++++++------------
 gphoto2.spec               |  12 ++--
 3 files changed, 115 insertions(+), 40 deletions(-)
---
diff --git a/gphoto2.spec b/gphoto2.spec
index a6ac385..54b44e8 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -8,15 +8,16 @@ Summary(pl.UTF-8):	Działający z linii poleceń program obsługujący libgphoto
 Summary(pt_BR.UTF-8):	GNU Photo - programa GNU para câmeras digitais
 Summary(zh_CN.UTF-8):	gPhoto - Linux下的使用数码相机的程序
 Name:		gphoto2
-Version:	2.4.14
-Release:	2
+Version:	2.5.1
+Release:	1
 License:	LGPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5:	60fd6e44d89592f6172227be67227636
+# Source0-md5:	03cda6d5b7c647ac4c90d0081f2cb7c7
 Patch0:		%{name}-manpage_addon.patch
 Patch1:		%{name}-pl.po-update.patch
 Patch2:		automake-1.12.patch
+Patch3:		%{name}-ac.patch
 URL:		http://www.gphoto.org/
 %{?with_aalib:BuildRequires:	aalib-devel}
 BuildRequires:	autoconf >= 2.59
@@ -24,13 +25,13 @@ BuildRequires:	automake >= 1:1.9
 BuildRequires:	cdk-devel >= 5.0_td20010421
 BuildRequires:	gettext-devel >= 0.14.1
 BuildRequires:	libexif-devel >= 0.6.9
-BuildRequires:	libgphoto2-devel >= 2.4.14
+BuildRequires:	libgphoto2-devel >= 2.5.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	readline-devel
-Requires:	libgphoto2 >= 2.4.14
+Requires:	libgphoto2 >= 2.5.0
 Obsoletes:	gphoto2-progs
 # these are not true (renamed to libgphoto2-{devel,static}) - we must have
 # the way to just rename package which is not required by anything installed
@@ -54,6 +55,7 @@ uma grande variedade de câmeras fotográficas digitais.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__rm} po/stamp-po
 
diff --git a/gphoto2-ac.patch b/gphoto2-ac.patch
new file mode 100644
index 0000000..bfd0ed1
--- /dev/null
+++ b/gphoto2-ac.patch
@@ -0,0 +1,10 @@
+--- gphoto2-2.5.1/configure.ac.orig	2013-02-04 20:13:13.848671318 +0100
++++ gphoto2-2.5.1/configure.ac	2013-02-04 20:17:20.538666176 +0100
+@@ -66,7 +66,6 @@
+ ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW"
+ AM_GNU_GETTEXT_VERSION([0.14.1])
+ AM_GNU_GETTEXT([external])
+-AM_PO_SUBDIRS()
+ AM_ICONV()
+ GP_GETTEXT_FLAGS()
+ 
diff --git a/gphoto2-pl.po-update.patch b/gphoto2-pl.po-update.patch
index 3fcf1fe..f6e6b32 100644
--- a/gphoto2-pl.po-update.patch
+++ b/gphoto2-pl.po-update.patch
@@ -1,53 +1,116 @@
---- gphoto2-2.4.14/po/pl.po.orig	2012-04-15 18:07:56.000000000 +0200
-+++ gphoto2-2.4.14/po/pl.po	2012-04-18 17:59:55.053223173 +0200
+--- gphoto2-2.5.1/po/pl.po.orig	2013-01-27 21:10:52.000000000 +0100
++++ gphoto2-2.5.1/po/pl.po	2013-02-04 20:12:45.358671913 +0100
 @@ -1,14 +1,14 @@
  # Polish translation for gphoto2.
--# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
  # This file is distributed under the same license as the gphoto2 package.
--# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2011.
-+# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2012.
+-# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2012.
++# Jakub Bogusz <qboosh at pld-linux.org>, 2006-2013.
  #
  msgid ""
  msgstr ""
--"Project-Id-Version: gphoto2 2.4.11\n"
-+"Project-Id-Version: gphoto2 2.4.14\n"
+-"Project-Id-Version: gphoto2 2.4.14\n"
++"Project-Id-Version: gphoto2 2.5.1\n"
  "Report-Msgid-Bugs-To: gphoto-devel at lists.sourceforge.net\n"
- "POT-Creation-Date: 2012-04-15 18:07+0200\n"
--"PO-Revision-Date: 2011-04-19 19:24+0200\n"
-+"PO-Revision-Date: 2012-04-17 21:09+0200\n"
+ "POT-Creation-Date: 2013-01-27 21:10+0100\n"
+-"PO-Revision-Date: 2012-04-17 21:09+0200\n"
++"PO-Revision-Date: 2013-02-04 18:45+0100\n"
  "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
  "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
  "Language: pl\n"
-@@ -983,6 +983,9 @@
- "Please make sure there is sufficient quoting around the arguments.\n"
- "\n"
+@@ -426,7 +426,7 @@
+ #: gphoto2/actions.c:1049
+ #, c-format
+ msgid "Movie capture finished (%d frames)\n"
+-msgstr ""
++msgstr "Nagrywanie filmu zakończone (klatek: %d)\n"
+ 
+ #: gphoto2/actions.c:1079
+ #, c-format
+@@ -435,17 +435,18 @@
+ "Oczekiwanie na zdarzenie z aparatu. Aby przerwać, proszę nacisnąć Ctrl-C.\n"
+ 
+ #: gphoto2/actions.c:1085
+-#, fuzzy, c-format
++#, c-format
+ msgid "Waiting for %d frames from the camera. Press Ctrl-C to abort.\n"
  msgstr ""
-+"Proszę upewnić się, że argumenty są wystarczająco zabezpieczone "
-+"cudzysłowami.\n"
-+"\n"
+-"Oczekiwanie na %d zdarzeń z aparatu. Aby przerwać, proszę nacisnąć Ctrl-C.\n"
++"Oczekiwanie na otrzymanie %d klatek z aparatu. Aby przerwać, proszę nacisnąć "
++"Ctrl-C.\n"
+ 
+ #: gphoto2/actions.c:1090
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "Waiting for %d milliseconds for events from camera. Press Ctrl-C to abort.\n"
+ msgstr ""
+-"Oczekiwanie przez %d sekund na zdarzenia z aparatu. Aby przerwać, proszę "
++"Oczekiwanie przez %d milisekund na zdarzenia z aparatu. Aby przerwać, proszę "
+ "nacisnąć Ctrl-C.\n"
+ 
+ #: gphoto2/actions.c:1095
+@@ -814,7 +815,6 @@
+ msgstr "Brak uprawnień"
+ 
+ #: gphoto2/main.c:707
+-#, fuzzy
+ msgid "Could not trigger capture."
+ msgstr "Nie udało się wyzwolić zrobienia zdjęcia."
+ 
+@@ -829,9 +829,9 @@
+ msgstr "Usuwanie pliku %s%s%s z aparatu\n"
+ 
+ #: gphoto2/main.c:777
+-#, fuzzy, c-format
++#, c-format
+ msgid "Keeping file %s%s%s on the camera\n"
+-msgstr "Usuwanie pliku %s%s%s z aparatu\n"
++msgstr "Zachowywanie pliku %s%s%s na aparacie\n"
+ 
+ #: gphoto2/main.c:810
+ #, c-format
+@@ -1114,11 +1114,11 @@
  
- #: gphoto2/main.c:1684
- msgid "Print complete help message on program usage"
-@@ -1066,9 +1069,8 @@
- msgstr "Wypisanie drzewa konfiguracji"
+ #: gphoto2/main.c:1864
+ msgid "Keep images on camera after capturing"
+-msgstr ""
++msgstr "Zachowanie zdjęć na aparacie po wykonaniu"
  
- #: gphoto2/main.c:1731
+ #: gphoto2/main.c:1866
+ msgid "Remove images from camera after capturing"
+-msgstr ""
++msgstr "Usunięcie zdjęć z aparatu po wykonaniu"
+ 
+ #: gphoto2/main.c:1868
+ msgid "Wait for event(s) from camera"
+@@ -1162,9 +1162,8 @@
+ msgstr "Zrobienie zdjęcia"
+ 
+ #: gphoto2/main.c:1885
 -#, fuzzy
- msgid "Dump full configuration tree"
--msgstr "Wypisanie drzewa konfiguracji"
-+msgstr "Zrzut pełnego drzewa konfiguracji"
+ msgid "Trigger capture of an image"
+-msgstr "Zrobienie zdjęcia"
++msgstr "Wyzwolenie zrobienia zdjęcia"
  
- #: gphoto2/main.c:1733
- msgid "Get configuration value"
-@@ -1225,9 +1227,8 @@
- msgstr "Usunięcie plików z podanego przedziału"
+ #: gphoto2/main.c:1887
+ msgid "Capture an image and download it"
+@@ -1187,9 +1186,8 @@
+ msgstr "Oczekiwanie na zwolnienie migawki aparatu i ściągnięcie"
  
- #: gphoto2/main.c:1813
+ #: gphoto2/main.c:1895
 -#, fuzzy
- msgid "Delete all files in folder (--no-recurse by default)"
--msgstr "Usunięcie wszystkich plików z folderu"
-+msgstr "Usunięcie wszystkich plików z folderu (domyślnie --no-recurse)"
+ msgid "Trigger image capture"
+-msgstr "Nie udało się wyzwolić zrobienia zdjęcia."
++msgstr "Wyzwolenie zrobienia zdjęcia"
  
- #: gphoto2/main.c:1815
- msgid "Upload a file to camera"
+ #: gphoto2/main.c:1901
+ msgid "List folders in folder"
+@@ -1643,6 +1641,3 @@
+ msgstr ""
+ "Aby uzyskać pomoc dla danego polecenia, należy napisać 'help nazwa-"
+ "polecenia'."
+-
+-#~ msgid "  Name:        '%s'\n"
+-#~ msgstr "  Nazwa:       '%s'\n"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gphoto2.git/commitdiff/2685e8e29dc97b9d630e8703d1053be23ac8ab0e



More information about the pld-cvs-commit mailing list