Since this is untouched by the maintainer for over a month, i'm going to NMU. I'll upload to delayed/2 so the maintainers can solve it differently if they prefer. Let me know if you'd rather I delay it further.
NMU diff attached.
diff -u pop-before-smtp-1.41/debian/rules pop-before-smtp-1.41/debian/rules --- pop-before-smtp-1.41/debian/rules +++ pop-before-smtp-1.41/debian/rules @@ -5,7 +5,6 @@ include debian/cdbs/1/rules/auto-update.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include debian/cdbs/1/rules/copyright-check.mk include debian//cdbs/1/rules/buildinfo.mk DEB_INSTALL_DIRS_pop-before-smtp = var/lib/pop-before-smtp reverted: --- pop-before-smtp-1.41/debian/cdbs/1/rules/copyright-check.mk +++ pop-before-smtp-1.41.orig/debian/cdbs/1/rules/copyright-check.mk @@ -1,59 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2005-2006 Jonas Smedegaard <[email protected]> -# Description: Check for changes to copyright notices in source -# -# 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, 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. - -# TODO: Depend on kdesdk-scripts and use /usr/bin/licensecheck - -ifndef _cdbs_bootstrap -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class -endif - -ifndef _cdbs_rules_copyright-check -_cdbs_rules_copyright-check := 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) - -cdbs_copyright-check_find_opts := -not -regex '\./debian/.*' -not -regex '.*/config\.\(guess\|sub\|rpath\)' -cdbs_copyright-check_egrep_opts := --text -rih '(copyright|\(c\) ).*[0-9]{4}' - -clean:: - @echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...' - @find . -type f $(cdbs_copyright-check_find_opts) -exec cat '{}' ';' \ - | tr '\r' '\n' \ - | LC_ALL=C sed -e 's/[^[:print:]]//g' \ - | egrep $(cdbs_copyright-check_egrep_opts) \ - | sed -e 's/^[[:space:]*#]*//' -e 's/[[:space:]]*$$//' \ - | LC_ALL=C sort -u \ - > debian/copyright_newhints - @if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi - @echo "diff --normal debian/copyright_hints debian/copyright_newhints | egrep '^>'" - @diff --normal debian/copyright_hints debian/copyright_newhints | egrep '^>'; \ - if [ "$$?" -eq "0" ]; then \ - echo "New or changed copyright notices discovered! Do this:"; \ - echo " 1) Search source for each of the above lines ('grep -r' is your friend)"; \ - echo " 2) Update debian/copyright as needed"; \ - echo " 3) Replace debian/copyright_hints with debian/copyright_newhints"; \ - exit 1; \ - fi - - @echo 'No new copyright notices found - assuming no news is good news...' - rm -f debian/copyright_newhints - -endif diff -u pop-before-smtp-1.41/debian/changelog pop-before-smtp-1.41/debian/changelog --- pop-before-smtp-1.41/debian/changelog +++ pop-before-smtp-1.41/debian/changelog @@ -1,3 +1,12 @@ +pop-before-smtp (1.41-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Remove local CDBS rule, debian/cdbs/1/rules/copyright-check.mk, that was + incorrectly checking for copyright checks in the Debian directory (and + associated call in debian/rules) to fix FTBFS (Closes: #674400) + + -- Scott Kitterman <[email protected]> Thu, 05 Jul 2012 23:25:44 -0400 + pop-before-smtp (1.41-1.1) unstable; urgency=low * Non-maintainer upload to solve release goal.
signature.asc
Description: This is a digitally signed message part.
