diff --git a/debian/changelog b/debian/changelog index 0839e38..609cba1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +dhelp (0.6.22) unstable; urgency=low + + * Fix unowned files after purge (Closes: #679691). + * Acknowledge NMU by Gunnar Wolf . + * Fix Last-Translator field in po files to comply with Debian + translation team's policy. + + -- Georgios M. Zarkadas Wed, 29 Aug 2012 23:30:20 +0300 + +dhelp (0.6.21+nmu1) unstable; urgency=low + + * Non-Maintainer Upload + * Dropped the declaration of dependence on ruby-commandline, which was + already done on the code + + -- Gunnar Wolf Mon, 02 Jul 2012 12:16:40 -0500 + dhelp (0.6.21) unstable; urgency=low * New maintainer: Georgios M. Zarkadas (Closes: #650441). diff --git a/debian/control b/debian/control index f79dcc0..772aff4 100644 --- a/debian/control +++ b/debian/control @@ -10,10 +10,9 @@ Build-Depends: debhelper (>= 5), cdbs (>= 0.4.23-1.1), Package: dhelp Depends: perl-modules, libtemplate-perl, libhtml-parser-perl, - liburi-perl, liblocale-gettext-perl, libdata-page-perl, - ruby1.8, ruby-bdb | libdb-ruby1.8, ruby-commandline | libcommandline-ruby1.8, - ruby-debian, libgettext-ruby1.8, doc-base, swish++, pstotext, poppler-utils, - ucf (>= 0.8), ${misc:Depends} + liburi-perl, liblocale-gettext-perl, libdata-page-perl, ruby1.8, + ruby-bdb | libdb-ruby1.8, ruby-debian, libgettext-ruby1.8, doc-base, + swish++, pstotext, poppler-utils, ucf (>= 0.8), ${misc:Depends} Recommends: www-browser | html2text Suggests: httpd-cgi, info2www, man2html, catdvi Architecture: all diff --git a/debian/postrm b/debian/postrm new file mode 100755 index 0000000..8d18e93 --- /dev/null +++ b/debian/postrm @@ -0,0 +1,99 @@ +#!/bin/sh +# +# Copyright (C) 2002 Stefan Hornburg (Racke) +# Copyright (C) 2012 Georgios M. Zarkadas +# +# 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. +# +# 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., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA. + +set -e + +#DEBHELPER# + +#### Globals #### + +DHELP_APTHOOK=/etc/apt/apt.conf.d/35dhelp + +#### Import Library #### + +# Unfortunately the library cannot be available in postrm, since all files +# (but conffiles) of the package have been already purged when it is run. +# Thus we need to manually copy all needed functions here. + + +# Test executability (implies existence) of a binary in the system's path. +# ARGS: +# $1=binary_basename +# +is_exec() +{ + # First ensure we are not passed an empty argument, + # because test -x "" returns success. + + if [ "X${1}" = "X" ]; then + return 2 + fi + + # Then look for the binary location. If not found, + # return error, because test -x "" returns success. + + local binary=$(which "${1}" 2>/dev/null) + + if [ "X${binary}" = "X" ]; then + return 1 + fi + + # If the binary is found, return its executable status. + + test -x "${binary}" 2>/dev/null +} + +# Remove a conffile from the filesystem and the ucf and ucfr databases. +# ARGS: +# $1=package $2=conffile +# +ucf_unregister_file () +{ + local package="${1}" + local conffile="${2}" + local ext + + # the '' value is to delete the file itself + for ext in '' '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do + rm -f "${conffile}${ext}" || true + done + if is_exec ucf; then + ucf --purge "${conffile}" + fi + if is_exec ucfr; then + ucfr --purge "${package}" "${conffile}" + fi +} + +#### Functions #### + +#### Main script body #### + +case $1 in +purge) + # Remove and unregister with ucf our dpkg post-invoke hook. + + ucf_unregister_file dhelp ${DHELP_APTHOOK} + ;; +*) + ;; +esac + +unset DHELP_APTHOOK || true diff --git a/debian/prerm b/debian/prerm index 9c3a31d..621a3c0 100755 --- a/debian/prerm +++ b/debian/prerm @@ -24,8 +24,6 @@ set -e #### Globals #### -DHELP_APTHOOK=/etc/apt/apt.conf.d/35dhelp - #### Import Library #### # If old version's prerm fails, our files (and thus the script library) @@ -44,6 +42,7 @@ failed-upgrade) "against the dhelp package." fi done + unset DHELP_LIBFILE || true ;; esac @@ -97,14 +96,3 @@ failed-upgrade) ;; esac -case $1 in -purge) - # Remove and unregister with ucf our dpkg post-invoke hook. - - ucf_unregister_file dhelp ${DHELP_APTHOOK} - ;; -*) - ;; -esac - -unset DHELP_APTHOOK DHELP_LIBFILE || true diff --git a/po/de.po b/po/de.po index 887682e..def4ed1 100644 --- a/po/de.po +++ b/po/de.po @@ -2,7 +2,6 @@ # Copyright (C) 2008 Helge Kreutzmann # This file is distributed under the same license as the dhelp package. # Helge Kreutzmann , 2008 -# Georgios M. Zarkadas , 2012 # msgid "" msgstr "" @@ -10,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-28 06:13+0200\n" "PO-Revision-Date: 2012-05-28 07:28+0200\n" -"Last-Translator: Georgios M. Zarkadas \n" +"Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" "Language: de\n" "MIME-Version: 1.0\n" diff --git a/po/fr.po b/po/fr.po index 47457cc..32d4a1b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,7 +2,6 @@ # Copyright (C) 2008 Steve Petruzzello # This file is distributed under the same license as the dhelp package. # Steve Petruzzello , 2008 -# Georgios M. Zarkadas , 2012 # msgid "" msgstr "" @@ -10,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-28 06:13+0200\n" "PO-Revision-Date: 2012-05-28 07:16+0200\n" -"Last-Translator: Georgios M. Zarkadas \n" +"Last-Translator: Steve Petruzzello \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" diff --git a/po/id.po b/po/id.po index f741fb9..040c042 100644 --- a/po/id.po +++ b/po/id.po @@ -2,7 +2,6 @@ # Copyright (C) 2009 Izharul Haq # This file is distributed under the same license as the dhelp package. # Izharul Haq , 2009. -# Georgios M. Zarkadas , 2012 # msgid "" msgstr "" @@ -10,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-28 06:13+0200\n" "PO-Revision-Date: 2012-05-28 07:50+0200\n" -"Last-Translator: Georgios M. Zarkadas \n" +"Last-Translator: Izharul Haq \n" "Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" diff --git a/po/ru.po b/po/ru.po index 4ae3d36..bae936a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,6 @@ # Copyright (C) 2008 Yuri Kozlov # This file is distributed under the same license as the dhelp package. # Yuri Kozlov , 2008. -# Georgios M. Zarkadas , 2012 # msgid "" msgstr "" @@ -10,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-28 06:13+0200\n" "PO-Revision-Date: 2012-05-28 07:52+0200\n" -"Last-Translator: Georgios M. Zarkadas \n" +"Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n"