From 535ad70b710dd0f45f044856a69b8256e39051b3 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Thu, 12 Apr 2012 20:54:34 +0200 Subject: [PATCH] merge changes from 0.5.6-6 --- debian/README.source | 2 ++ debian/changelog | 14 ++++++++ debian/control | 5 +-- debian/copyright | 8 ++++- debian/patches/02_fix-manpage | 35 ++++++++++++++++++++ debian/patches/series | 2 +- debian/po/es.po | 61 +++++++++++++++++++++++++++++++++++ debian/postinst | 2 ++ debian/postrm | 2 ++ debian/rules | 7 ++++ debian/watch | 5 ++- 11 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 debian/README.source create mode 100644 debian/patches/02_fix-manpage create mode 100644 debian/po/es.po diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..3556bbc --- /dev/null +++ b/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt for its patch management, see +/usr/share/doc/quilt/README.source if you are unfamiliar with it. diff --git a/debian/changelog b/debian/changelog index a257847..11ea088 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,20 @@ abook (0.6.0~pre2-2) unstable; urgency=low - Russian debconf translation by Yuri Kozlov (closes: #451813) - search_ctrl-d_segfault_fix included in the release already (closes: #462145) + - from 0.5.6-6: + - Made copyright file more clear. + - Updated watch file to use special uscan hack for sourceforge. + - Updated Standards-Version to 3.8.0, added README.source file. + - New debconf translations: + - Spanish debconf translation by Carlos Eduardo Sotelo Pinto + (closes: #484848) + - Portuguese debconf translation, already mentioned in changelog but + without (closes: #489036) + - Fixed Catalan po file encoding. + - Use versioned Build-Depends on quilt for quilt.make usage. + - Also strip sections .comment and .note + - Add patch fix-manpage to escape hyphens where they should be minus + signs (adjusted it for the 0.6.0~pre2 release) -- diff --git a/debian/control b/debian/control index ba175a9..a1e0925 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: abook Section: mail Priority: optional Maintainer: Gerfried Fuchs -Standards-Version: 3.7.3 -Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, po-debconf, quilt +Standards-Version: 3.8.0 +Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, + po-debconf, quilt (>= 0.40) Homepage: http://abook.sourceforge.net/ Package: abook diff --git a/debian/copyright b/debian/copyright index bf23ad3..4a059f5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,6 +8,8 @@ http://abook.sourceforge.net/ Upstream Author: Jaakko Heinonen Copyright: + Copyright (c) 2005 Jaakko Heinonen + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -23,5 +25,9 @@ Copyright: Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +The debianization of the package is licensed likewise and +Copyright (c) 2003-2008 by Gerfried Fuchs + On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License version 2 can be found in `/usr/share/common-licenses/GPL-2', +later versions can be found in the same directory. diff --git a/debian/patches/02_fix-manpage b/debian/patches/02_fix-manpage new file mode 100644 index 0000000..11a311b --- /dev/null +++ b/debian/patches/02_fix-manpage @@ -0,0 +1,35 @@ +Author: Gerfried Fuchs vim:ft=diff: +Description: Escape hyphens in manpage where they mean the minus sign + +Index: b/abook.1 +=================================================================== +--- a/abook.1 ++++ b/abook.1 +@@ -82,11 +82,11 @@ The following \fIoutputformats\fR are su + .br + - \fBbsdcal\fP BSD calendar + .TP +-\fB\-\-add-email\fP ++\fB\-\-add\-email\fP + Read an e-mail message from stdin and add the sender to the addressbook. + .TP +-\fB\-\-add-email-quiet\fP +-Same as --add-email but doesn't confirm adding. ++\fB\-\-add\-email\-quiet\fP ++Same as \-\-add\-email but doesn't confirm adding. + .TP + \fB\-\-formats\fP + List available formats. +Index: b/abookrc.5 +=================================================================== +--- a/abookrc.5 ++++ b/abookrc.5 +@@ -90,7 +90,7 @@ Defines the way entries are displayed in + \fI{name:22}\fP + displays the \fIname\fP field with a maximal width of 22 characters. + .TP +-\fI{phone:-13|workphone|mobile}\fP ++\fI{phone:\-13|workphone|mobile}\fP + displays (right aligned within a width of 13 characters), either the \fIphone\fP, \fIworkphone\fP or \fImobile\fP field, whichever being the first to be non-empty. + .RE + .IP diff --git a/debian/patches/series b/debian/patches/series index 1bb8bf6..1c72136 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -# empty +02_fix-manpage diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 0000000..ff73c5a --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,61 @@ +# abook translation to spanish +# Copyright (C) 2008 Software in the Public Interest, SPI Inc. +# This file is distributed under the same license as the abook package. +# +# Changes +# - Initial translation +# Carlos Eduardo Sotelo Pinto , 2008 +# +# Traductores, si no estan familiarizados con el formato PO, merece la +# pena leer la documentación de gettext, especialmente las secciones +# dedicadas a este formato, por ejemplo ejecutando +# +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconof +# /usr/share/doc/po-debconf/README-trans +# o +# http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Si tiene dudas o consultas sobre esta traducción consulte con el último +# traductor (campo Last-Translator) y ponga en copia a la lista de +# traducción de Debian al español () +# +# +msgid "" +msgstr "" +"Project-Id-Version: abook 0.5.6-5\n" +"Report-Msgid-Bugs-To: abook@packages.debian.org\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2008-06-02 15:27-0500\n" +"Last-Translator: Carlos Eduardo Sotelo Pinto \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable abook system wide for mutt?" +msgstr "¿Desea habilitar la extensión de abook para 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 brinda la posibilidad de utilizarse como origen de consultas " +"desde mutt. " +"Si acepta esta pregunta el paquete creará un fichero «/etc/Muttrc.d/abook.rc» " +"que habilita las consultas a la base de datos de abook y agrega " +"la dirección de correo a abook presionando \"A\" desde el modo paginador" diff --git a/debian/postinst b/debian/postinst index 408f6dc..057954d 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,5 +1,7 @@ #!/bin/sh -e # postinst for abook +# copyright 2003-2008 by Gerfried Fuchs +# Licenced the same way as abook itself # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then diff --git a/debian/postrm b/debian/postrm index 76b3870..f45490e 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,5 +1,7 @@ #!/bin/sh -e # postrm for abook +# copyright 2003-2008 by Gerfried Fuchs +# Licenced the same way as abook itself if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus diff --git a/debian/rules b/debian/rules index 3fd4136..d4e572c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f # debian/rules for abook +# copyright 2003-2008 by Gerfried Fuchs +# Licenced the same way as abook itself + PKG = abook TMP = $(CURDIR)/debian/$(PKG) @@ -19,6 +22,7 @@ else endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s + STRIP = true endif @@ -49,6 +53,9 @@ install: build $(INSTALL_DIR) $(TMP) cd $(TMP) && $(INSTALL_DIR) usr/share/doc/$(PKG)/examples $(MAKE) prefix=$(TMP)/usr install INSTALL_PROGRAM="$(INSTALL_PROGRAM)" + test "$(STRIP)" != true || strip \ + --remove-section=.comment --remove-section=.note \ + $(TMP)/usr/bin/abook $(INSTALL_FILE) ChangeLog $(TMP)/usr/share/doc/$(PKG)/changelog $(INSTALL_FILE) ANNOUNCE AUTHORS BUGS FAQ README THANKS TODO \ $(TMP)/usr/share/doc/$(PKG) diff --git a/debian/watch b/debian/watch index 87cf19a..b8b68b4 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,2 @@ -version=2 -# Site/Directory Pattern Version Script -http://heanet.dl.sourceforge.net/sourceforge/abook/ abook-([\d\.]*)\.tar\.gz debian uupdate +version=3 +http://sf.net/abook/abook-([\d.]+)\.tar\.gz -- 2.39.2