From e79a445f83989ef1f8ae564dd7c3be7e5d134d00 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 24 Jan 2008 20:01:26 +0100 Subject: [PATCH] Imported Debian patch 0.5.6-5 --- debian/changelog | 9 +++++ debian/control | 5 +-- debian/patches/01search_ctrl-d_segfault_fix | 20 +++++++++++ debian/patches/series | 1 + debian/po/ru.po | 40 +++++++++++++++++++++ debian/rules | 6 ++-- 6 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 debian/patches/01search_ctrl-d_segfault_fix create mode 100644 debian/patches/series create mode 100644 debian/po/ru.po diff --git a/debian/changelog b/debian/changelog index a7ba7cd..38cb3d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +abook (0.5.6-5) unstable; urgency=low + + * Add Homepage to source control stanca. + * Bump Standards-Version to 3.7.3, menu file was already updated. + * New debconf translation: Russion by Yuri Kozlov (closes: #451813) + * Pull search_ctrl-d_segfault_fix patch from upstream (closes: #462145) + + -- Gerfried Fuchs Thu, 24 Jan 2008 20:01:26 +0100 + abook (0.5.6-4) unstable; urgency=low * New debconf translation: Dutch by Bart Cornelis (closes: #415513) diff --git a/debian/control b/debian/control index 7ecaf6c..ba175a9 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: abook Section: mail Priority: optional Maintainer: Gerfried Fuchs -Standards-Version: 3.7.2 -Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, po-debconf +Standards-Version: 3.7.3 +Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, po-debconf, quilt +Homepage: http://abook.sourceforge.net/ Package: abook Architecture: any diff --git a/debian/patches/01search_ctrl-d_segfault_fix b/debian/patches/01search_ctrl-d_segfault_fix new file mode 100644 index 0000000..e5924d2 --- /dev/null +++ b/debian/patches/01search_ctrl-d_segfault_fix @@ -0,0 +1,20 @@ +Index: abook-0.5.6/ui.c +=================================================================== +--- abook-0.5.6.orig/ui.c ++++ abook-0.5.6/ui.c +@@ -569,9 +569,13 @@ ui_find(int next) + } else { + char *s; + s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0); +- strncpy(findstr, s, MAX_FIELD_LEN); +- free(s); + refresh_screen(); ++ if(s == NULL) { ++ return; /* user cancelled (ctrl-G) */ ++ } else { ++ strncpy(findstr, s, MAX_FIELD_LEN); ++ free(s); ++ } + } + + if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0 && diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..083b0fd --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01search_ctrl-d_segfault_fix diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 0000000..182d0fa --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,40 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2007. +msgid "" +msgstr "" +"Project-Id-Version: 0.5.6-4\n" +"Report-Msgid-Bugs-To: abook@packages.debian.org\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2007-11-18 21:39+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable abook system wide for mutt?" +msgstr "Включить общесистемное использование abook в mutt?" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"abook offers the possibility to be used as query backend from within mutt. " +"If you acknowledge this question the package will create an /etc/Muttrc.d/" +"abook.rc file that enables querying the abook database and adding mail " +"addresses to abook with pressing \"A\" from pager mode." +msgstr "" +"abook можно использовать как сервер запросов из mutt. " +"Если вы ответите утвердительно, то будет создан файл " +"/etc/Muttrc.d/abook.rc, настройки которого активируют возможность " +"запросов к базе данных abook и настраивают добавление почтовых адресов " +"в abook по нажатию клавиши \"A\" из режима просмотра письма." + diff --git a/debian/rules b/debian/rules index c7eef30..21ac1ef 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,8 @@ PKG = abook TMP = $(CURDIR)/debian/$(PKG) +QUILT_STAMPFN = patch-stamp +include /usr/share/quilt/quilt.make CFLAGS = -g -Wall INSTALL = install @@ -24,7 +26,7 @@ endif #export DH_VERBOSE=1 -clean: +clean: unpatch $(checkdir) $(checkroot) rm -rf build-stamp $(TMP) debian/files debian/substvars @@ -32,7 +34,7 @@ clean: build: build-stamp -build-stamp: +build-stamp: patch-stamp $(checkdir) ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info -- 2.39.2