From: Gerfried Fuchs Date: Thu, 12 Apr 2012 18:12:46 +0000 (+0200) Subject: merge changes from 0.5.6-4 X-Git-Tag: debian/0.6.0_pre2-2~14 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=bebf8b598d4a0438aaa10affb555fceb3233cb9b;p=pkg%2Fabook.git merge changes from 0.5.6-4 --- diff --git a/debian/changelog b/debian/changelog index b99ba52..85c34aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ abook (0.6.0~pre2-2) unstable; urgency=low (closes: #394532) - from 0.5.6-3: - Japanese debconf translation by Noritada Kobayashi (closes: #412998) + - from 0.5.6-4: + - Dutch debconf translation by Bart Cornelis (closes: #415513) + - Updated menu file to go with new menu policy. + - debian/rules: slightly cleanup. -- diff --git a/debian/control b/debian/control index 27d24ca..7ecaf6c 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: abook Section: mail Priority: optional -Maintainer: Gerfried Fuchs +Maintainer: Gerfried Fuchs Standards-Version: 3.7.2 Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, po-debconf diff --git a/debian/copyright b/debian/copyright index fa0f719..bf23ad3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,6 @@ This package was first debianized by Alan Ford on Sat, 18 Mar 2000 12:38:34 +0000. +It is now maintained by Gerfried Fuchs . It was downloaded from http://abook.sourceforge.net/ @@ -7,8 +8,20 @@ http://abook.sourceforge.net/ Upstream Author: Jaakko Heinonen Copyright: + 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 + (at your option) any later version. -abook is distributed under the terms of the GNU GPL, version 2. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/menu b/debian/menu index 027911f..ed9a138 100644 --- a/debian/menu +++ b/debian/menu @@ -1,2 +1,2 @@ -?package(abook):needs="text" section="Apps/Tools" title="Abook" \ - command="/usr/bin/abook" longtitle="Address Book" +?package(abook):needs="text" section="Applications/Data Management"\ + command="/usr/bin/abook" title="ABook" longtitle="Address Book" diff --git a/debian/po/nl.po b/debian/po/nl.po new file mode 100644 index 0000000..baa5a42 --- /dev/null +++ b/debian/po/nl.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +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: 2007-03-09 18:35+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Do you want to enable abook system wide for mutt?" +msgstr "Wilt u abook voor mutt systeemwijd activeren?" + +#. 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 "Mutt kan abook als een 'bevraag-backend' gebruiken. Als u wilt dat dit pakket een '/etc/Muttrc.d/abook.rc '-bestand aanmaakt dient u hier positief te antwoorden. Het aanmaken van dit bestand activeert het bevragen van de abook-database, en het toevoegen van e-mailadressen aan de abook-databse (door 'A' te drukken in 'pager'-modus)." + diff --git a/debian/rules b/debian/rules index 0d36a2f..80a2b28 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debian/rules for abook -PACKAGE = abook -TMP = $(CURDIR)/debian/$(PACKAGE) +PKG = abook +TMP = $(CURDIR)/debian/$(PKG) CFLAGS = -g -Wall @@ -28,7 +28,7 @@ clean: $(checkdir) $(checkroot) rm -rf build-stamp $(TMP) debian/files debian/substvars - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean build: build-stamp @@ -45,15 +45,15 @@ install: build $(checkroot) -rm -rf $(TMP) $(INSTALL_DIR) $(TMP) - cd $(TMP) && $(INSTALL_DIR) usr/share/doc/$(PACKAGE)/examples + cd $(TMP) && $(INSTALL_DIR) usr/share/doc/$(PKG)/examples $(MAKE) prefix=$(TMP)/usr install INSTALL_PROGRAM="$(INSTALL_PROGRAM)" - $(INSTALL_FILE) ChangeLog $(TMP)/usr/share/doc/$(PACKAGE)/changelog + $(INSTALL_FILE) ChangeLog $(TMP)/usr/share/doc/$(PKG)/changelog $(INSTALL_FILE) ANNOUNCE AUTHORS BUGS FAQ README THANKS TODO \ - $(TMP)/usr/share/doc/$(PACKAGE) + $(TMP)/usr/share/doc/$(PKG) $(INSTALL_FILE) sample.abookrc \ - $(TMP)/usr/share/doc/$(PACKAGE)/examples + $(TMP)/usr/share/doc/$(PKG)/examples cd $(TMP)/usr/share && gzip -9 man/man1/abook.1 man/man5/abookrc.5 \ - doc/$(PACKAGE)/changelog + doc/$(PKG)/changelog # Build architecture-independent files here. @@ -66,17 +66,17 @@ binary-arch: build install $(checkdir) $(checkroot) $(INSTALL_DIR) $(TMP)/DEBIAN $(TMP)/usr/share/menu - $(INSTALL_FILE) debian/menu $(TMP)/usr/share/menu/$(PACKAGE) - $(INSTALL_FILE) debian/copyright $(TMP)/usr/share/doc/$(PACKAGE) + $(INSTALL_FILE) debian/menu $(TMP)/usr/share/menu/$(PKG) + $(INSTALL_FILE) debian/copyright $(TMP)/usr/share/doc/$(PKG) $(INSTALL_FILE) debian/changelog \ - $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian - gzip -9 $(TMP)/usr/share/doc/$(PACKAGE)/changelog.Debian + $(TMP)/usr/share/doc/$(PKG)/changelog.Debian + gzip -9 $(TMP)/usr/share/doc/$(PKG)/changelog.Debian $(INSTALL_SCRIPT) debian/config debian/postinst debian/postrm \ $(TMP)/DEBIAN po2debconf debian/templates > $(TMP)/DEBIAN/templates dpkg-shlibdeps -Tdebian/substvars -dDepends $(TMP)/usr/bin/abook dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars \ - -p$(PACKAGE) -P$(TMP) + -p$(PKG) -P$(TMP) cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ xargs -r0 md5sum > DEBIAN/md5sums dpkg --build $(TMP) ..