r70495 - in /trunk/libhtml-mason-perl/debian: ./ patches/ po/ source/

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sat Mar 5 18:35:38 UTC 2011 

Author: gregoa
Date: Sat Mar  5 18:35:02 2011
New Revision: 70495

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70495
Log:
TODO:
- check remaining bugs
- add DEP3 headers to patches (quilt-patch-missing-description)
- add patch for spelling mistakes (spelling-error-in-manpage)
- cdbs -> dh?!
* Switch to source format 3.0 (quilt). Remove quilt framework.
* Switch to debhelper 7.
* Refresh patches.
* Add Danish debconf translation; thanks to Joe Dalton (closes: #605327).
* Convert debian/copyright to DEP5 format.
* Set Standards-Version to 3.9.1; remove version from perl build dependency.
* debian/control: update build and runtime dependencies (remove unneeded
  versions and packages that are in perl core, added ${misc:Depends},
  additiopnal build dependencies and Suggests).
* debian/rules: use /usr/share/cdbs/1/class/perl-makemaker.mk.
* Use "set -e" in maintainer scripts.

Added:
    trunk/libhtml-mason-perl/debian/po/da.po
    trunk/libhtml-mason-perl/debian/source/
    trunk/libhtml-mason-perl/debian/source/format
Removed:
    trunk/libhtml-mason-perl/debian/README.source
Modified:
    trunk/libhtml-mason-perl/debian/changelog
    trunk/libhtml-mason-perl/debian/compat
    trunk/libhtml-mason-perl/debian/control
    trunk/libhtml-mason-perl/debian/copyright
    trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.config
    trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postinst
    trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postrm
    trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postinst
    trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postrm
    trunk/libhtml-mason-perl/debian/libhtml-mason-perl.preinst
    trunk/libhtml-mason-perl/debian/patches/01_apachehandler.patch
    trunk/libhtml-mason-perl/debian/patches/02_cgihandler.patch
    trunk/libhtml-mason-perl/debian/rules

Modified: trunk/libhtml-mason-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/changelog?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/changelog (original)
+++ trunk/libhtml-mason-perl/debian/changelog Sat Mar  5 18:35:02 2011
@@ -1,4 +1,10 @@
 libhtml-mason-perl (1:1.45-1) UNRELEASED; urgency=low
+
+  TODO:
+  - check remaining bugs
+  - add DEP3 headers to patches (quilt-patch-missing-description)
+  - add patch for spelling mistakes (spelling-error-in-manpage)
+  - cdbs -> dh?!
 
   [ Ivan Kohler ]
   * Take over for the Debian Perl Group
@@ -7,14 +13,23 @@
     <pkg-perl-maintainers at lists.alioth.debian.org> (was: Ivan Kohler
     <ivan-debian at 420.am>); Ivan Kohler <ivan-debian at 420.am> moved to
     Uploaders.
-  * debian/rules: delete /usr/lib/perl5 only if it exists.
-  * Add debian/README.source to document quilt usage, as required by
-    Debian Policy since 3.8.0.
+
   * New upstream release
     + Fixes warnings under perl 5.12 (closes: Bug#615593)
 
   [ gregor herrmann ]
   * Fix watch file.
+  * Switch to source format 3.0 (quilt). Remove quilt framework.
+  * Switch to debhelper 7.
+  * Refresh patches.
+  * Add Danish debconf translation; thanks to Joe Dalton (closes: #605327).
+  * Convert debian/copyright to DEP5 format.
+  * Set Standards-Version to 3.9.1; remove version from perl build dependency.
+  * debian/control: update build and runtime dependencies (remove unneeded
+    versions and packages that are in perl core, added ${misc:Depends},
+    additiopnal build dependencies and Suggests).
+  * debian/rules: use /usr/share/cdbs/1/class/perl-makemaker.mk.
+  * Use "set -e" in maintainer scripts.
 
  -- Ivan Kohler <ivan-debian at 420.am>  Sun, 27 Feb 2011 10:08:56 -0800
 

Modified: trunk/libhtml-mason-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/compat?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/compat (original)
+++ trunk/libhtml-mason-perl/debian/compat Sat Mar  5 18:35:02 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libhtml-mason-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/control?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/control (original)
+++ trunk/libhtml-mason-perl/debian/control Sat Mar  5 18:35:02 2011
@@ -3,18 +3,36 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ivan Kohler <ivan-debian at 420.am>
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-mason-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhtml-mason-perl/
-Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: perl (>= 5.8.3), libparams-validate-perl (>= 0.69), libapache2-mod-perl2, libcache-cache-perl (>= 1.0), libexception-class-perl (>= 1.14), libclass-container-perl (>= 0.07), libmodule-build-perl, liblog-any-perl, libtest-deep-perl
+Build-Depends: cdbs, debhelper (>= 7)
+Build-Depends-Indep: perl,
+ libapache2-mod-perl2,
+ libcache-cache-perl,
+ libchi-perl,
+ libclass-container-perl,
+ libexception-class-perl,
+ liblog-any-perl,
+ libparams-validate-perl,
+ libtest-deep-perl,
+ libtest-memory-cycle-perl,
+ libtest-pod-perl
 Homepage: http://www.masonhq.com/
 
 Package: libhtml-mason-perl
 Architecture: all
-Depends: ${perl:Depends}, libparams-validate-perl (>= 0.69), libcache-cache-perl (>= 1.0), libexception-class-perl (>= 1.14), libclass-container-perl (>= 0.07), libscalar-list-utils-perl | perl-base (>= 5.8.3), libhtml-parser-perl, liblog-any-perl
-Recommends: libapache2-mod-perl2 (>= 2.0.0)
-Suggests: speedy-cgi-perl | libfcgi-perl, libhtml-mason-perl-doc
+Depends: ${perl:Depends}, ${misc:Depends},
+ libcache-cache-perl,
+ libclass-container-perl,
+ libexception-class-perl,
+ libhtml-parser-perl,
+ liblog-any-perl,
+ libparams-validate-perl
+Recommends: libapache2-mod-perl2
+Suggests: libchi-perl,
+ libhtml-mason-perl-doc,
+ speedy-cgi-perl | libfcgi-perl
 Description: HTML::Mason Perl module
  Mason allows web pages and sites to be constructed from shared,
  reusable building blocks called components. Components contain a mix
@@ -32,6 +50,7 @@
 Section: doc
 Architecture: all
 Priority: extra
+Depends: ${misc:Depends}
 Description: HTML::Mason documentation
  Mason allows web pages and sites to be constructed from shared,
  reusable building blocks called components. Components contain a mix
@@ -45,8 +64,10 @@
 
 Package: libhtml-mason-perl-examples
 Architecture: all
-Depends: ${misc:Depends}, libhtml-mason-perl (>= 1:1.25-3)
-Recommends: apache2, libapache2-mod-perl2 (>= 2.0.0)
+Depends: ${misc:Depends},
+ libhtml-mason-perl (>= ${source:Upstream-Version})
+Recommends: apache2,
+ libapache2-mod-perl2
 Priority: extra
 Description: HTML::Mason example setup
  Mason allows web pages and sites to be constructed from shared,

Modified: trunk/libhtml-mason-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/copyright?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/copyright (original)
+++ trunk/libhtml-mason-perl/debian/copyright Sat Mar  5 18:35:02 2011
@@ -1,28 +1,36 @@
-This package was debianized by Craig Sanders <cas at taz.net.au> on Mon,
-5 Jul 1999 10:45:54 +1000.  It was subsequently taken over by Michael
-Alan Dorman <mdorman at debian.org>.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Dave Rolsky <autarch at urth.org>
+Source: http://search.cpan.org/dist/HTML-Mason/
+Name: HTML-Mason
 
-It was downloaded from CPAN, the Comprehensive Perl Archive Network.
-Please see ftp://www.cpan.org/ or your most local CPAN mirror.
+Files: *
+Copyright: 1998-2005, Jonathan Swartz <swartz at pobox.com>
+License: Artistic or GPL-1+
 
-Upstream Authors (from README):
+Files: debian/*
+Copyright: 1999, 2000, 2001, Michael Alan Dorman <mdorman at debian.org>
+ 1999, Craig Sanders <cas at taz.net.au>
+ 2001, 2002, 2003, 2004, Steve Haslam <araqnid at debian.org>
+ 2003, 2004, Marc Brockschmidt <marc at dch-faq.de>
+ 2005, 2006, Charles Fry <debian at frogcircus.org>
+ 2006, 2007, 2008, Charles Fry <cfry at debian.org>
+ 2008, Peter Eisentraut <petere at debian.org>
+ 2009, 2010, 2011, Ivan Kohler <ivan-debian at 420.am>
+ 2011, gregor herrmann <gregoa at debian.org>
+License: Artistic or GPL-1+
 
-Jonathan Swartz
-swartz at pobox.com
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
 
-Dave Rolsky
-autarch at urth.org
-
-Ken Williams
-ken at mathforum.org
-
-Copyright:
-
-Copyright (c) 1998-2003 by Jonathan Swartz. All rights reserved.
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-
-Please see /usr/share/common-licenses/{Artistic,GPL} for copies of the
-Artistic and GNU General Public licenses.
-
-The hourglass icon in mason_examples is supplied with XEmacs.
+License: GPL-1+
+ 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 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.

Modified: trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.config
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.config?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.config (original)
+++ trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.config Sat Mar  5 18:35:02 2011
@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/bin/bash
+
+set -e
 
 dc_true() {
     db_get "$1"

Modified: trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postinst
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postinst?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postinst (original)
+++ trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postinst Sat Mar  5 18:35:02 2011
@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/bin/bash
+
+set -e
 
 ##DEBHELPER##
 

Modified: trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postrm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postrm?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postrm (original)
+++ trunk/libhtml-mason-perl/debian/libhtml-mason-perl-examples.postrm Sat Mar  5 18:35:02 2011
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 if [ -n "$_DEBIAN_DEBUG_MASON_EXAMPLES" ]; then
     vflag="-v"

Modified: trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postinst
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postinst?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postinst (original)
+++ trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postinst Sat Mar  5 18:35:02 2011
@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/bin/bash
+
+set -e
 
 ##DEBHELPER##
 

Modified: trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postrm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postrm?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postrm (original)
+++ trunk/libhtml-mason-perl/debian/libhtml-mason-perl.postrm Sat Mar  5 18:35:02 2011
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 case "$1" in
 purge)

Modified: trunk/libhtml-mason-perl/debian/libhtml-mason-perl.preinst
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/libhtml-mason-perl.preinst?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/libhtml-mason-perl.preinst (original)
+++ trunk/libhtml-mason-perl/debian/libhtml-mason-perl.preinst Sat Mar  5 18:35:02 2011
@@ -1,4 +1,6 @@
-#!/bin/bash -e
+#!/bin/bash
+
+set -e
 
 ##DEBHELPER##
 

Modified: trunk/libhtml-mason-perl/debian/patches/01_apachehandler.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/patches/01_apachehandler.patch?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/patches/01_apachehandler.patch (original)
+++ trunk/libhtml-mason-perl/debian/patches/01_apachehandler.patch Sat Mar  5 18:35:02 2011
@@ -1,7 +1,5 @@
-Index: libhtml-mason-perl-1.35.obsolete.0.43890935306354/lib/HTML/Mason/ApacheHandler.pm
-===================================================================
---- libhtml-mason-perl-1.35.obsolete.0.43890935306354.orig/lib/HTML/Mason/ApacheHandler.pm	2006-10-17 14:58:32.000000000 -0400
-+++ libhtml-mason-perl-1.35.obsolete.0.43890935306354/lib/HTML/Mason/ApacheHandler.pm	2007-03-31 08:09:30.000000000 -0400
+--- a/lib/HTML/Mason/ApacheHandler.pm
++++ b/lib/HTML/Mason/ApacheHandler.pm
 @@ -9,9 +9,6 @@
  
  package HTML::Mason::ApacheHandler;
@@ -33,7 +31,7 @@
  use base qw(HTML::Mason::Handler);
  
  BEGIN
-@@ -599,7 +601,11 @@
+@@ -598,7 +600,11 @@
      if (exists $allowed_params->{data_dir} and not exists $params{data_dir})
      {
          # constructs path to <server root>/mason

Modified: trunk/libhtml-mason-perl/debian/patches/02_cgihandler.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/patches/02_cgihandler.patch?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/patches/02_cgihandler.patch (original)
+++ trunk/libhtml-mason-perl/debian/patches/02_cgihandler.patch Sat Mar  5 18:35:02 2011
@@ -1,8 +1,6 @@
-Index: libhtml-mason-perl-1.35/lib/HTML/Mason/CGIHandler.pm
-===================================================================
---- libhtml-mason-perl-1.35.orig/lib/HTML/Mason/CGIHandler.pm	2007-03-31 08:09:56.000000000 -0400
-+++ libhtml-mason-perl-1.35/lib/HTML/Mason/CGIHandler.pm	2007-03-31 08:10:05.000000000 -0400
-@@ -99,6 +99,9 @@
+--- a/lib/HTML/Mason/CGIHandler.pm
++++ b/lib/HTML/Mason/CGIHandler.pm
+@@ -97,6 +97,9 @@
                  $sent_headers = 1;
              }
  

Added: trunk/libhtml-mason-perl/debian/po/da.po
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/po/da.po?rev=70495&op=file
==============================================================================
--- trunk/libhtml-mason-perl/debian/po/da.po (added)
+++ trunk/libhtml-mason-perl/debian/po/da.po Sat Mar  5 18:35:02 2011
@@ -1,0 +1,52 @@
+# Danish translation libhtml-mason-perl.
+# Copyright (C) 2010 libhtml-mason-perl & nedenstående oversættere.
+# This file is distributed under the same license as libhtml-mason-perl package.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libhtml-mason-perl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-25 10:29+0100\n"
+"PO-Revision-Date: 2010-11-28 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../libhtml-mason-perl-examples.templates:1001
+msgid "Install example Mason components in /var/www/mason_example?"
+msgstr "Installer eksempler på Masonkomponenter i /var/www/mason_example?"
+
+#. Type: boolean
+#. Description
+#: ../libhtml-mason-perl-examples.templates:1001
+msgid ""
+"To help you get started with HTML::Mason, some example components can be "
+"installed and enabled in /var/www/mason_example, and you can visit them at "
+"http://localhost/mason_example/ in your web browser."
+msgstr ""
+"For at hjælpe dig i gang med HTML::Mason, kan nogle eksempelkomponenter "
+"installeres og aktiveres i /var/www/mason_example, og du kan besøge dem på "
+"http://localhost/mason_example/ i din internetbrowser."
+
+#. Type: boolean
+#. Description
+#: ../libhtml-mason-perl-examples.templates:2001
+msgid "Automatically reload Apache configuration?"
+msgstr "Genindlæs automatisk Apachekonfiguration?"
+
+# de bliver vel ikke tilgængelige hvis de er fjernet!!! vist en lille engelsk fejl her.
+#. Type: boolean
+#. Description
+#: ../libhtml-mason-perl-examples.templates:2001
+msgid ""
+"After installing or removing the example Mason components, the Apache "
+"configuration needs to be reloaded for them to be accessible."
+msgstr ""
+"Efter installation eller fjernelse af eksempelkomponenterne i Mason "
+"skal Apachekonfigurationen genindlæses, for at de bliver tilgængelige."
+

Modified: trunk/libhtml-mason-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/rules?rev=70495&op=diff
==============================================================================
--- trunk/libhtml-mason-perl/debian/rules (original)
+++ trunk/libhtml-mason-perl/debian/rules Sat Mar  5 18:35:02 2011
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/perlmodule.mk
+include /usr/share/cdbs/1/class/perl-makemaker.mk
 
 # Make::Build doesn't support PREFIX
 DEB_MAKEMAKER_INVOKE = /usr/bin/perl Makefile.PL installdirs=vendor destdir=debian/libhtml-mason-perl noprompts=1
@@ -12,7 +11,7 @@
 binary-post-install/libhtml-mason-perl::
 	# don't install binaries or packlist
 	rm -rf debian/libhtml-mason-perl/usr/bin
-	[ ! -d debian/libhtml-mason-perl/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose debian/libhtml-mason-perl/usr/lib/perl5
+	rm -rf debian/libhtml-mason-perl/usr/lib
 
 install/libhtml-mason-perl::
 	cp debian/Apache*UserDirHandler.pm debian/libhtml-mason-perl/usr/share/perl5/HTML/Mason

Added: trunk/libhtml-mason-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-mason-perl/debian/source/format?rev=70495&op=file
==============================================================================
--- trunk/libhtml-mason-perl/debian/source/format (added)
+++ trunk/libhtml-mason-perl/debian/source/format Sat Mar  5 18:35:02 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the Pkg-perl-cvs-commits mailing list