diff -Nru t-prot-3.4/debian/changelog t-prot-3.4/debian/changelog --- t-prot-3.4/debian/changelog 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/changelog 2016-01-03 19:45:05.000000000 +0000 @@ -1,3 +1,16 @@ +t-prot (3.4-4) unstable; urgency=medium + + [ Rhonda D'Vine ] + * switch my name + * Convert debian/rules to dh style. + * Switch to debian source format 3.0 (quilt). + * Add #DEBHELPER# placeholder to debian/post* files. + + [ Axel Beckert ] + * Switch background color in Muttrc from black to default + + -- Rhonda D'Vine Sun, 03 Jan 2016 20:43:36 +0100 + t-prot (3.4-3) unstable; urgency=medium * Really make build reproducible by also hardcoding file permissions for diff -Nru t-prot-3.4/debian/compat t-prot-3.4/debian/compat --- t-prot-3.4/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ t-prot-3.4/debian/compat 2016-01-03 19:44:49.000000000 +0000 @@ -0,0 +1 @@ +9 diff -Nru t-prot-3.4/debian/conffiles t-prot-3.4/debian/conffiles --- t-prot-3.4/debian/conffiles 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/conffiles 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -/etc/t-prot/Muttrc -/etc/t-prot/footers/debian- -/etc/t-prot/footers/new-debian- -/etc/t-prot/footers/new-https-debian- -/etc/t-prot/footers/debian-private -/etc/t-prot/footers/mailman diff -Nru t-prot-3.4/debian/config t-prot-3.4/debian/config --- t-prot-3.4/debian/config 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/config 2016-01-03 19:44:32.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # debconf config file for t-prot -# Copyright 2002-2010 by Gerfried Fuchs +# Copyright 2002-2010 by Rhonda D'Vine # Licenced under WTFPLv2 set -e diff -Nru t-prot-3.4/debian/control t-prot-3.4/debian/control --- t-prot-3.4/debian/control 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/control 2016-01-03 19:45:02.000000000 +0000 @@ -1,11 +1,11 @@ Source: t-prot Section: mail Priority: optional -Maintainer: Gerfried Fuchs +Maintainer: Rhonda D'Vine Uploaders: Axel Beckert -Build-Depends-Indep: dpkg-dev (>= 1.17.0~), - po-debconf, - quilt (>= 0.40-1~) +Build-Depends-Indep: debhelper (>= 9~), + dpkg-dev (>= 1.17.0~), + po-debconf Standards-Version: 3.9.6 Homepage: http://www.escape.de/~tolot/mutt/ Vcs-Browser: http://git.deb.at/w/pkg/t-prot.git @@ -13,7 +13,7 @@ Package: t-prot Architecture: all -Depends: debconf (>= 0.5) | debconf-2.0, +Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, liblocale-gettext-perl, perl (>= 5.6.0-16) Recommends: mutt (>= 1.5.5.1) diff -Nru t-prot-3.4/debian/copyright t-prot-3.4/debian/copyright --- t-prot-3.4/debian/copyright 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/copyright 2016-01-03 19:44:32.000000000 +0000 @@ -1,4 +1,4 @@ -This package was initially debianized by Gerfried Fuchs on +This package was initially debianized by Rhonda D'Vine on Tue, 29 Jan 2002 15:55:21 +0100. It was downloaded from: @@ -51,7 +51,7 @@ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE Version 2, December 2004 - Copyright (C) 2002-2012 Gerfried Fuchs + Copyright (C) 2002-2012 Rhonda D'Vine Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long diff -Nru t-prot-3.4/debian/dirs t-prot-3.4/debian/dirs --- t-prot-3.4/debian/dirs 1970-01-01 00:00:00.000000000 +0000 +++ t-prot-3.4/debian/dirs 2016-01-03 19:44:49.000000000 +0000 @@ -0,0 +1 @@ +etc/t-prot/ads diff -Nru t-prot-3.4/debian/docs t-prot-3.4/debian/docs --- t-prot-3.4/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ t-prot-3.4/debian/docs 2016-01-03 19:44:49.000000000 +0000 @@ -0,0 +1,2 @@ +TODO +README diff -Nru t-prot-3.4/debian/install t-prot-3.4/debian/install --- t-prot-3.4/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ t-prot-3.4/debian/install 2016-01-03 19:44:49.000000000 +0000 @@ -0,0 +1,7 @@ +t-prot usr/bin +t-prot.1 usr/share/man/man1 +debian/Muttrc etc/t-prot +debian/footers/* etc/t-prot/footers +contrib/t-prot.sl usr/share/slrn/macros +contrib/filter_innd.pl usr/share/doc/t-prot/examples +contrib/README.examples usr/share/doc/t-prot/examples diff -Nru t-prot-3.4/debian/Muttrc t-prot-3.4/debian/Muttrc --- t-prot-3.4/debian/Muttrc 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/Muttrc 2016-01-03 11:21:14.000000000 +0000 @@ -10,5 +10,5 @@ macro pager \e1 ":set display_filter='t-prot -cmekatlS --max-lines=250 --bigq --pgp-short --pgp-move-vrf -Mmutt -L/etc/t-prot/footers -A/etc/t-prot/ads'; exec exit\n:exec display-message\n" "Turn TOFU protection on" # highlight TOFU protection: -color body brightmagenta black "^\\[---.*" -color body green black "^#v[-+]" +color body brightmagenta default "^\\[---.*" +color body green default "^#v[-+]" diff -Nru t-prot-3.4/debian/po/ca.po t-prot-3.4/debian/po/ca.po --- t-prot-3.4/debian/po/ca.po 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/po/ca.po 2016-01-03 19:44:32.000000000 +0000 @@ -1,6 +1,6 @@ # # Catalan translation for t-prot package. -# Copyright (C) 2006 Gerfried Fuchs. +# Copyright (C) 2006 Rhonda D'Vine. # This file is distributed under the same license as the t-prot package. # # Jordà Polo , 2006. @@ -10,7 +10,7 @@ "Project-Id-Version: 2.1.1\n" "Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" "POT-Creation-Date: 2006-08-02 15:54-0500\n" -"PO-Revision-Date: 2006-08-03 23:10+0200\n" +"PO-Revision-Date: 2016-01-03 12:26+0100\n" "Last-Translator: Jordà Polo \n" "Language-Team: Català \n" "Language: \n" diff -Nru t-prot-3.4/debian/po/de.po t-prot-3.4/debian/po/de.po --- t-prot-3.4/debian/po/de.po 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/po/de.po 2016-01-03 19:44:32.000000000 +0000 @@ -1,15 +1,15 @@ # debconf template file for the t-prot package. -# Copyright (C) 2006 Gerfried Fuchs +# Copyright (C) 2006 Rhonda D'Vine # This file is distributed under the same license as the t-prot package. -# Gerfried Fuchs , 2006. +# Rhonda D'Vine , 2006. # msgid "" msgstr "" "Project-Id-Version: t-prot 2.0.2\n" "Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" "POT-Creation-Date: 2006-08-02 15:54-0500\n" -"PO-Revision-Date: 2009-10-21 17:57+0200\n" -"Last-Translator: Gerfried Fuchs \n" +"PO-Revision-Date: 2016-01-03 12:26+0100\n" +"Last-Translator: Rhonda D'Vine \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" diff -Nru t-prot-3.4/debian/po/ja.po t-prot-3.4/debian/po/ja.po --- t-prot-3.4/debian/po/ja.po 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/po/ja.po 2016-01-03 19:44:32.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Gerfried Fuchs +# Copyright (C) 2009 Rhonda D'Vine # This file is distributed under the same license as t-prot package. # Hideki Yamane (Debian-JP) , 2009. # @@ -7,7 +7,7 @@ "Project-Id-Version: t-prot 2.7.1-1\n" "Report-Msgid-Bugs-To: t-prot@packages.debian.org\n" "POT-Creation-Date: 2006-08-02 15:54-0500\n" -"PO-Revision-Date: 2009-04-07 22:26+0900\n" +"PO-Revision-Date: 2016-01-03 12:26+0100\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "Language: ja\n" diff -Nru t-prot-3.4/debian/postinst t-prot-3.4/debian/postinst --- t-prot-3.4/debian/postinst 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/postinst 2016-01-03 19:44:58.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # postinst for t-prot -# Copyright 2002-2010 by Gerfried Fuchs +# Copyright 2002-2016 by Rhonda D'Vine # Licenced under WTFPLv2 set -e @@ -21,11 +21,6 @@ exit 0 fi -# change existing symlink from ../Muttrc.t-prot to ../t-prot/Mutrc -if [ "$version" = "2.1-1" ] && [ -L /etc/Muttrc.d/t-prot.rc ]; then - cd /etc/Muttrc.d && ln -sf ../t-prot/Muttrc t-prot.rc || true -fi - # if we got reinstalled after a remove, enable the config snippet again if [ "$action" = 'configure' ] && [ -e /etc/Muttrc.d/t-prot.rc.removed ] && [ ! -e /etc/Muttrc.d/t-prot.rc ]; then mv /etc/Muttrc.d/t-prot.rc.removed /etc/Muttrc.d/t-prot.rc || true @@ -52,3 +47,5 @@ ;; esac fi + +#DEBHELPER# diff -Nru t-prot-3.4/debian/postrm t-prot-3.4/debian/postrm --- t-prot-3.4/debian/postrm 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/postrm 2016-01-03 19:44:58.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # postrm for t-prot -# Copyright 2002-2010 by Gerfried Fuchs +# Copyright 2002-2016 by Rhonda D'Vine # Licenced under WTFPLv2 set -e @@ -25,3 +25,5 @@ fi ;; esac + +#DEBHELPER# diff -Nru t-prot-3.4/debian/README.Debian t-prot-3.4/debian/README.Debian --- t-prot-3.4/debian/README.Debian 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/README.Debian 2016-01-03 19:44:32.000000000 +0000 @@ -27,4 +27,4 @@ folder-hook and enable the list footer and ad footers for the appropriate list only instead. - -- Gerfried Fuchs Mon, 26 Jun 2006 03:19:06 -0500 + -- Rhonda D'Vine Mon, 26 Jun 2006 03:19:06 -0500 diff -Nru t-prot-3.4/debian/rules t-prot-3.4/debian/rules --- t-prot-3.4/debian/rules 2016-01-04 05:57:23.000000000 +0000 +++ t-prot-3.4/debian/rules 2016-01-03 19:44:49.000000000 +0000 @@ -1,99 +1,8 @@ #!/usr/bin/make -f -# debian/rules for t-prot package -# Copyright 2002-2012 by Gerfried Fuchs -# Licenced under WTFPLv2 +#DH_VERBOSE = 1 -PKG = t-prot -TMP = $(CURDIR)/debian/$(PKG) -BUILD_DATE = $(shell dpkg-parsechangelog --show-field Date) -INSTALL = install -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 - - -clean: - $(checkdir) - $(checkroot) - -rm -rf $(TMP) debian/files debian/stamp-* - $(MAKE) -f /usr/share/quilt/quilt.make unpatch - -build: build-arch build-indep -build-arch: debian/stamp-build -build-indep: debian/stamp-build -debian/stamp-build: - # only thing to do is apply the patches ... - $(MAKE) -f /usr/share/quilt/quilt.make patch - touch debian/stamp-build - - -install: debian/stamp-install -debian/stamp-install: build - $(checkdir) - $(checkroot) - -rm -rf $(TMP) - $(INSTALL_DIR) $(TMP) - cd $(TMP) && $(INSTALL_DIR) etc/t-prot/footers etc/t-prot/ads \ - usr/bin usr/share/man/man1 usr/share/slrn/macros \ - usr/share/doc/$(PKG)/examples - # usr/share/doc/$(PKG)/contrib - $(INSTALL_SCRIPT) t-prot $(TMP)/usr/bin - $(INSTALL_FILE) t-prot.1 $(TMP)/usr/share/man/man1 - $(INSTALL_FILE) debian/Muttrc $(TMP)/etc/t-prot - $(INSTALL_FILE) debian/footers/* $(TMP)/etc/t-prot/footers - $(INSTALL_FILE) contrib/t-prot.sl $(TMP)/usr/share/slrn/macros - - $(INSTALL_FILE) TODO README $(TMP)/usr/share/doc/$(PKG) - $(INSTALL_FILE) contrib/filter_innd.pl contrib/README.examples \ - $(TMP)/usr/share/doc/$(PKG)/examples - $(INSTALL_FILE) ChangeLog \ - $(TMP)/usr/share/doc/$(PKG)/changelog - cd $(TMP)/usr/share && gzip -n9 doc/$(PKG)/changelog \ - man/man1/t-prot.1 - - -binary-indep: install - $(checkdir) - $(checkroot) - $(INSTALL_DIR) $(TMP)/DEBIAN - $(INSTALL_FILE) debian/copyright debian/README.Debian \ - $(TMP)/usr/share/doc/$(PKG) - $(INSTALL_FILE) debian/changelog \ - $(TMP)/usr/share/doc/$(PKG)/changelog.Debian - cd $(TMP)/usr/share/doc/$(PKG) && gzip -n9 \ - changelog.Debian - $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \ - $(TMP)/DEBIAN - po2debconf debian/templates > $(TMP)/DEBIAN/templates - $(INSTALL_FILE) debian/conffiles \ - $(TMP)/DEBIAN - dpkg-gencontrol -ldebian/changelog -isp -p$(PKG) -P$(TMP) - cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ - xargs -r0 md5sum > DEBIAN/md5sums - # Make build reproducible: - # Hardcode permissions for files created by output redirection - chmod 644 $(TMP)/DEBIAN/md5sums $(TMP)/DEBIAN/templates - # Set timestamp of all files to timestamp in debian/changelog entry - find $(TMP) -depth -newermt '$(BUILD_DATE)' -print0 | \ - xargs -0r touch --no-dereference --date='$(BUILD_DATE)' - dpkg --build $(TMP) .. - - -binary-arch: - # We have nothing to do here. - - -binary: binary-indep - - -define checkdir - test -f debian/rules -endef - -define checkroot - test root = "`whoami`" -endef - -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ + # not sure about override for po2debconf needed + # po2debconf debian/templates > $(TMP)/DEBIAN/templates diff -Nru t-prot-3.4/debian/source/format t-prot-3.4/debian/source/format --- t-prot-3.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ t-prot-3.4/debian/source/format 2016-01-03 19:44:52.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)