From: Gerfried Fuchs Date: Thu, 24 Jul 2008 13:17:28 +0000 (+0200) Subject: Imported Debian patch 0.5.6-6 X-Git-Tag: debian/0.5.6-6 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=991642c957238e3d1293bcc37aebac66393c920a;p=pkg%2Fabook.git Imported Debian patch 0.5.6-6 --- 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 38cb3d9..819762b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,24 @@ +abook (0.5.6-6) unstable; urgency=low + + * 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 by Carlos Eduardo Sotelo Pinto (closes: #484848) + - Portuguese by Miguel Figueiredo (closes: #489036) + * Fixed Catalan po file encoding. + * Put proper headers into the templates.pot file. + * 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. + + -- Gerfried Fuchs Thu, 24 Jul 2008 15:17:28 +0200 + 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) + * New debconf translation: Russian 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 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/01_search_ctrl-d_segfault_fix b/debian/patches/01_search_ctrl-d_segfault_fix new file mode 100644 index 0000000..0c18f2c --- /dev/null +++ b/debian/patches/01_search_ctrl-d_segfault_fix @@ -0,0 +1,23 @@ +Author: Cedric Duval vim:ft=diff: +Description: Don't let ctrl-d in search segfault abook (closes: #462145) + +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/01search_ctrl-d_segfault_fix b/debian/patches/01search_ctrl-d_segfault_fix deleted file mode 100644 index e5924d2..0000000 --- a/debian/patches/01search_ctrl-d_segfault_fix +++ /dev/null @@ -1,20 +0,0 @@ -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/02_fix-manpage b/debian/patches/02_fix-manpage new file mode 100644 index 0000000..45b4345 --- /dev/null +++ b/debian/patches/02_fix-manpage @@ -0,0 +1,53 @@ +Author: Gerfried Fuchs vim:ft=diff: +Description: Escape hyphens in manpage where they mean the minus sign + +Index: abook-0.5.6/abook.1 +=================================================================== +--- abook-0.5.6.orig/abook.1 ++++ abook-0.5.6/abook.1 +@@ -80,11 +80,11 @@ The following \fIoutputformats\fR are su + .br + - \fBwl\fP Wanderlust address book + .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: abook-0.5.6/abookrc.5 +=================================================================== +--- abook-0.5.6.orig/abookrc.5 ++++ abook-0.5.6/abookrc.5 +@@ -47,7 +47,7 @@ Defines the field to display in the extr + .br + \fIfield\fP can be any of the following: + .br +--1 disabled ++\-1 disabled + .br + phone Home Phone + .br +@@ -125,7 +125,7 @@ set emailpos=25 + # Field to be used in the extra column + set extra_column=phone + # frequently used values: +-# -1 disabled ++# \-1 disabled + # phone Home Phone + # workphone Work Phone + # fax Fax +@@ -134,7 +134,7 @@ set extra_column=phone + # url URL + + # +-set extra_alternative=-1 ++set extra_alternative=\-1 + + # Screen column for the extra field to start + set extrapos=65 diff --git a/debian/patches/series b/debian/patches/series index 083b0fd..0014b15 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -01search_ctrl-d_segfault_fix +01_search_ctrl-d_segfault_fix +02_fix-manpage diff --git a/debian/po/ca.po b/debian/po/ca.po index eab8f41..24cc768 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -3,16 +3,16 @@ # Copyright (C) 2006 Gerfried Fuchs. # This file is distributed under the same license as the abook package. # -# Jordà Polo , 2006. +# Jordà Polo , 2006. # msgid "" msgstr "" "Project-Id-Version: 2.1.1\n" "Report-Msgid-Bugs-To: abook@packages.debian.org\n" "POT-Creation-Date: 2007-01-22 23:01+0100\n" -"PO-Revision-Date: 2007-01-22 23:00+0100\n" -"Last-Translator: Jordà Polo \n" -"Language-Team: Català \n" +"PO-Revision-Date: 2008-07-07 21:47+0200\n" +"Last-Translator: Jordà Polo \n" +"Language-Team: Català \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -33,6 +33,6 @@ msgid "" "addresses to abook with pressing \"A\" from pager mode." msgstr "" "abook ofereix la possibilitat de ser utilitzat des de mutt a l'hora de " -"realitzar consultes. Si accepteu, el paquet crearà un fitxer /etc/Muttrc.d/" -"abook.rc que permetrà fer consultes sobre la base de dades de abook i " -"afegir noves adreces de correu prement \"A\" des del mode paginador." +"realitzar consultes. Si accepteu, el paquet crearà un fitxer /etc/Muttrc.d/" +"abook.rc que permetrà fer consultes sobre la base de dades de abook i afegir " +"noves adreces de correu prement \"A\" des del mode paginador." diff --git a/debian/po/de.po b/debian/po/de.po index a15a247..a0b6443 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: abook 0.5.0\n" "Report-Msgid-Bugs-To: abook@packages.debian.org\n" -"POT-Creation-Date: 2007-01-22 23:01+0100\n" -"PO-Revision-Date: 2007-01-22 23:00+0100\n" -"Last-Translator: Gerfried Fuchs \n" +"POT-Creation-Date: 2006-08-18 10:38-0500\n" +"PO-Revision-Date: 2008-07-07 22:03+0200\n" +"Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" 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/po/pt.po b/debian/po/pt.po new file mode 100644 index 0000000..23c0fc1 --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,36 @@ +# Portuguese translation for abook (debconf) +# This file is distributed under the same license as the abook package. +# Miguel Figueiredo , 2006-2008. +# +msgid "" +msgstr "" +"Project-Id-Version: abook\n" +"Report-Msgid-Bugs-To: abook@packages.debian.org\n" +"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"PO-Revision-Date: 2008-07-02 23:05+0100\n" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: Portuguese \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 "Deseja utilizar o abook em todo o sistema para o 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 "" +"O abook oferece a possibilidade de ser utilizado como backend de consultas a " +"partir do mutt. Se responder afirmativamente a esta questão o pacote irá " +"criar um ficheiro /etc/Muttrc.d/abook.rc que permite fazer consultas à base " +"de dados do abook e adicionar endereços de mail ao abook ao premir \"A\" no " +"modo pager." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index cb19edc..50391d1 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,14 +1,14 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# po-debconf translation for abook. +# Copyright (C) 2006 Gerfried Fuchs +# This file is distributed under the same license as the abook package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: abook VERSION\n" "Report-Msgid-Bugs-To: abook@packages.debian.org\n" -"POT-Creation-Date: 2007-01-22 23:01+0100\n" +"POT-Creation-Date: 2006-08-18 10:38-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" 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 21ac1ef..ab966e2 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 @@ -50,6 +54,9 @@ install: build cd $(TMP) && $(INSTALL_DIR) usr/share/doc/$(PKG)/examples \ usr/share/doc/$(PKG)/contrib $(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/templates b/debian/templates index 60e3b11..2c09dcb 100644 --- a/debian/templates +++ b/debian/templates @@ -2,7 +2,7 @@ Template: abook/muttrc.d Type: boolean Default: true _Description: Do you want to enable abook system wide for mutt? - abook offers the possibility to be used as query backend from within mutt. If - you acknowledge this question the package will create an + 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. 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