Package: fuzzyocr Version: 3.5.1+svn135-1 Severity: normal Tags: patch Dear maintainer,
I've prepared an NMU for fuzzyocr (versioned as 3.5.1+svn135-1.1) and since I haven't heard back from you in over a week, I have assumed that you did not have any objections to this upload to unstable. Cheers, Francois
reverted: --- fuzzyocr-3.5.1+svn135/debian/fuzzyocr.postinst +++ fuzzyocr-3.5.1+svn135.orig/debian/fuzzyocr.postinst @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -if [ -x "/etc/init.d/spamassassin" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d spamassassin restart || exit $? - else - /etc/init.d/spamassassin restart || exit $? - fi -fi - -#DEBHELPER# diff -u fuzzyocr-3.5.1+svn135/debian/copyright fuzzyocr-3.5.1+svn135/debian/copyright --- fuzzyocr-3.5.1+svn135/debian/copyright +++ fuzzyocr-3.5.1+svn135/debian/copyright @@ -10,12 +10,22 @@ -Copyright: Christian Holler and Jorge Valdes +Copyright: 2006-2008 Christian Holler and Jorge Valdes -The Debian packaging is (C) 2006-2008, A Mennucc <mennu...@debian.org> and -is licensed under the GPL, see `/usr/share/common-licenlses/GPL'. + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at: + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +On Debian systems, the complete text of the Apache License Version 2.0 +can be found in /usr/share/common-licenses/Apache-2.0 . -The fuzzyocr license is the - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ -See /usr/share/common-licenses/Apache-2.0 for the full text. - +The Debian packaging is copyright 2006-2008, A Mennucc <mennu...@debian.org> +and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff -u fuzzyocr-3.5.1+svn135/debian/control fuzzyocr-3.5.1+svn135/debian/control --- fuzzyocr-3.5.1+svn135/debian/control +++ fuzzyocr-3.5.1+svn135/debian/control @@ -3,7 +3,8 @@ Priority: extra Maintainer: A Mennucc1 <mennu...@debian.org> Build-Depends: debhelper (>= 5), quilt -Standards-Version: 3.8.0.0 +Standards-Version: 3.8.1 +Homepage: http://fuzzyocr.own-hero.net/ Package: fuzzyocr Architecture: all reverted: --- fuzzyocr-3.5.1+svn135/debian/fuzzyocr.postrm +++ fuzzyocr-3.5.1+svn135.orig/debian/fuzzyocr.postrm @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -if [ -x "/etc/init.d/spamassassin" ]; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d spamassassin restart || exit $? - else - /etc/init.d/spamassassin restart || exit $? - fi -fi - -#DEBHELPER# diff -u fuzzyocr-3.5.1+svn135/debian/watch fuzzyocr-3.5.1+svn135/debian/watch --- fuzzyocr-3.5.1+svn135/debian/watch +++ fuzzyocr-3.5.1+svn135/debian/watch @@ -11 +11,2 @@ -http://fuzzyocr.own-hero.net/wiki/Downloads http://users.own-hero.net/~decoder/fuzzyocr/fuzzyocr-(.*)\.tar\.gz +opts=uversionmangle=s/([0-9.]+)(-devel)?/$1/,dversionmangle=s/\+svn[0-9]+$// \ + http://fuzzyocr.own-hero.net/wiki/Downloads http://users.own-hero.net/~decoder/fuzzyocr/fuzzyocr-(.*)\.tar\.gz diff -u fuzzyocr-3.5.1+svn135/debian/changelog fuzzyocr-3.5.1+svn135/debian/changelog --- fuzzyocr-3.5.1+svn135/debian/changelog +++ fuzzyocr-3.5.1+svn135/debian/changelog @@ -1,3 +1,18 @@ +fuzzyocr (3.5.1+svn135-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix perl warning causing problems in FuzzyOcr preprocessor + (closes: #522285, #525413) + * Redo maintainer scripts from debhelper templates and split the + postinst into a preinst and a postinst (closes: #500950) + + * Add homepage field in debian/control + * Bump Standards-Version up to 3.8.1 + * Cleanup debian/copyright to fix lintian warnings + * Fix watch file to demangle upstream and debian versions + + -- Francois Marier <franc...@debian.org> Fri, 08 May 2009 12:46:29 +1200 + fuzzyocr (3.5.1+svn135-1) unstable; urgency=low * This version works with spamassassin 3.2 (Closes: #500426) diff -u fuzzyocr-3.5.1+svn135/debian/patches/fix_tesseract_ fuzzyocr-3.5.1+svn135/debian/patches/fix_tesseract_ --- fuzzyocr-3.5.1+svn135/debian/patches/fix_tesseract_ +++ fuzzyocr-3.5.1+svn135/debian/patches/fix_tesseract_ @@ -2,16 +2,13 @@ =================================================================== --- fuzzyocr-3+svn135.orig/FuzzyOcr/Preprocessor.pm 2008-09-28 11:12:08.000000000 +0200 +++ fuzzyocr-3+svn135/FuzzyOcr/Preprocessor.pm 2008-09-28 11:18:12.000000000 +0200 -@@ -31,7 +31,12 @@ - my ($self, $input) = @_; +@@ -32,6 +32,10 @@ my $tmpdir = FuzzyOcr::Config::get_tmpdir(); my $label = $self->{label}; -- my $output = "$tmpdir/prep.$label.out"; + my $output = "$tmpdir/prep.$label.out"; + + if ($label eq "maketiff") { + $output = "$tmpdir/prep.$label.tif"; -+ } else { -+ my $output = "$tmpdir/prep.$label.out"; + } my $stderr = ">$tmpdir/prep.$label.err"; only in patch2: unchanged: --- fuzzyocr-3.5.1+svn135.orig/debian/postrm +++ fuzzyocr-3.5.1+svn135/debian/postrm @@ -0,0 +1,43 @@ +#!/bin/sh +# postrm script for fuzzyocr +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove) + if [ -x "/etc/init.d/spamassassin" ]; then + invoke-rc.d spamassassin restart || exit $? + fi + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- fuzzyocr-3.5.1+svn135.orig/debian/postinst +++ fuzzyocr-3.5.1+svn135/debian/postinst @@ -0,0 +1,42 @@ +#!/bin/sh +# postinst script for fuzzyocr +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + if [ -x "/etc/init.d/spamassassin" ]; then + invoke-rc.d spamassassin start || exit $? + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- fuzzyocr-3.5.1+svn135.orig/debian/preinst +++ fuzzyocr-3.5.1+svn135/debian/preinst @@ -0,0 +1,38 @@ +#!/bin/sh +# preinst script for fuzzyocr +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + if [ -x "/etc/init.d/spamassassin" ]; then + invoke-rc.d spamassassin stop || exit $? + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0
