From fb0661c596e94ea70479125c57a9cc43dc03a1c9 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Fri, 13 Apr 2012 07:31:22 +0200 Subject: [PATCH] merge changes from 0.5.6-7 --- debian/changelog | 10 ++++++++ debian/control | 2 +- debian/copyright | 5 ++-- debian/patches/03_datafile-f-switch | 16 +++++++++++++ debian/patches/series | 1 + debian/po/zh_TW.po | 36 +++++++++++++++++++++++++++++ debian/postinst | 4 ++-- debian/postrm | 4 ++-- debian/rules | 17 ++++++++++---- 9 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 debian/patches/03_datafile-f-switch create mode 100644 debian/po/zh_TW.po diff --git a/debian/changelog b/debian/changelog index 11ea088..ee3232c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,16 @@ abook (0.6.0~pre2-2) unstable; urgency=low - 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) + - from 0.5.6-7: + - Build-Depend on autotools-dev, copy config.{guess,sub} before configure + run and remove them in clean target (closes: #535739) + - Updated to Standards-Version 3.8.2: Switched from findstring to filter + and add support parallel. + suggestion from policy. + - Switched the packaging licensing to BSD style. + - New patch datafile-f-switch: Let --datafile also work through -f short + option, suggested by Joey Schulze + - Traditional Chinese debconf translation by Kanru Chen (closes: #508023) -- diff --git a/debian/control b/debian/control index a1e0925..639cca7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Gerfried Fuchs Standards-Version: 3.8.0 Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, - po-debconf, quilt (>= 0.40) + po-debconf, quilt (>= 0.40), autotools-dev Homepage: http://abook.sourceforge.net/ Package: abook diff --git a/debian/copyright b/debian/copyright index 4a059f5..997d714 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,8 +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 +The debianization of the package is licensed under BSD style and +Copyright (c) 2003-2008 by Gerfried Fuchs . +See /usr/share/common-licenses/BSD for the complete text. On Debian GNU/Linux systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2', diff --git a/debian/patches/03_datafile-f-switch b/debian/patches/03_datafile-f-switch new file mode 100644 index 0000000..f5e8e2f --- /dev/null +++ b/debian/patches/03_datafile-f-switch @@ -0,0 +1,16 @@ +Author: Gerfried Fuchs vim:ft=diff: +Description: Let --datafile also work through -f short option + +Index: b/abook.c +=================================================================== +--- a/abook.c ++++ b/abook.c +@@ -331,7 +331,7 @@ parse_command_line(int argc, char **argv + { 0, 0, 0, 0 } + }; + +- c = getopt_long(argc, argv, "hC:", ++ c = getopt_long(argc, argv, "hC:f:", + long_options, &option_index); + + if(c == -1) diff --git a/debian/patches/series b/debian/patches/series index 1c72136..c89c5ae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 02_fix-manpage +03_datafile-f-switch diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po new file mode 100644 index 0000000..11247f6 --- /dev/null +++ b/debian/po/zh_TW.po @@ -0,0 +1,36 @@ +# po-debconf translation for abook. +# Copyright (C) 2006 Gerfried Fuchs +# This file is distributed under the same license as the abook package. +# Kanru Chen , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: abook VERSION\n" +"Report-Msgid-Bugs-To: abook@packages.debian.org\n" +"POT-Creation-Date: 2006-08-18 10:38-0500\n" +"PO-Revision-Date: 2008-12-07 08:42+0800\n" +"Last-Translator: Kanru Chen \n" +"Language-Team: Debian-user in Chinese [Big5] \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 "您想要在 mutt 的全域設定啟用 abook 嗎？" + +#. 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 資料庫，並且在輸入按鍵 \"A\" " +"時把郵件地址加入 abook。" diff --git a/debian/postinst b/debian/postinst index 057954d..c22ed21 100644 --- a/debian/postinst +++ b/debian/postinst @@ -1,7 +1,7 @@ #!/bin/sh -e # postinst for abook -# copyright 2003-2008 by Gerfried Fuchs -# Licenced the same way as abook itself +# copyright 2003-2009 by Gerfried Fuchs +# Licenced under BSD style # Source debconf library. if [ -e /usr/share/debconf/confmodule ]; then diff --git a/debian/postrm b/debian/postrm index f45490e..87fe8a9 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,7 +1,7 @@ #!/bin/sh -e # postrm for abook -# copyright 2003-2008 by Gerfried Fuchs -# Licenced the same way as abook itself +# copyright 2003-2009 by Gerfried Fuchs +# Licenced under BSD style if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus diff --git a/debian/rules b/debian/rules index d4e572c..3cb1203 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules for abook -# copyright 2003-2008 by Gerfried Fuchs -# Licenced the same way as abook itself +# copyright 2003-2009 by Gerfried Fuchs +# Licenced under BSD style PKG = abook TMP = $(CURDIR)/debian/$(PKG) @@ -15,15 +15,20 @@ INSTALL_FILE = $(INSTALL) -p -oroot -groot -m644 INSTALL_PROGRAM = $(INSTALL) -p -oroot -groot -m755 INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755 INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755 -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s STRIP = true endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + # Uncomment this to turn on verbose mode. @@ -33,13 +38,15 @@ endif clean: unpatch $(checkdir) $(checkroot) - rm -rf build-stamp $(TMP) debian/files debian/substvars + rm -rf build-stamp $(TMP) debian/files debian/substvars \ + config.guess config.sub [ ! -f Makefile ] || $(MAKE) distclean build: build-stamp build-stamp: patch-stamp $(checkdir) + cp /usr/share/misc/config.guess /usr/share/misc/config.sub . ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(MAKE) CFLAGS="$(CFLAGS)" -- 2.39.2