From c4ad285b4dd0c51f7a4983d3bd7e555c89ad7781 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 12 Apr 2012 20:19:41 +0200 Subject: [PATCH] merge changes from 0.5.6-5 --- debian/changelog | 6 ++++++ debian/control | 5 +++-- debian/patches/series | 1 + debian/po/ru.po | 40 ++++++++++++++++++++++++++++++++++++++++ debian/rules | 6 ++++-- 5 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 debian/patches/series create mode 100644 debian/po/ru.po diff --git a/debian/changelog b/debian/changelog index 85c34aa..a257847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,12 @@ abook (0.6.0~pre2-2) unstable; urgency=low - Dutch debconf translation by Bart Cornelis (closes: #415513) - Updated menu file to go with new menu policy. - debian/rules: slightly cleanup. + - from 0.5.6-5: + - Add Homepage to source control stanca. + - Bump Standards-Version to 3.7.3, menu file was already updated. + - Russian debconf translation by Yuri Kozlov (closes: #451813) + - search_ctrl-d_segfault_fix included in the release already + (closes: #462145) -- 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/series b/debian/patches/series new file mode 100644 index 0000000..1bb8bf6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +# empty 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 80a2b28..3fd4136 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