r40845 - in /trunk/libclass-dbi-mysql-perl/debian: README.source changelog compat control copyright patches/ patches/disable-database-tests.patch patches/series rules

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Mon Jul 27 22:12:48 UTC 2009


Author: ansgar-guest
Date: Mon Jul 27 22:12:32 2009
New Revision: 40845

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40845
Log:
* Bump Standards-Version to 3.8.2.
* Refresh rules for debhelper.
* Add myself to Uploaders.
* Convert debian/copyright to proposed machine-readable format.
* debian/control: Mention module name in description.
* Only disable tests that require a database via a patch instead of running
  no tests at all.
  + new patch disable-database-tests.patch
  + Add quilt framework and README.source

Added:
    trunk/libclass-dbi-mysql-perl/debian/README.source
    trunk/libclass-dbi-mysql-perl/debian/patches/
    trunk/libclass-dbi-mysql-perl/debian/patches/disable-database-tests.patch
    trunk/libclass-dbi-mysql-perl/debian/patches/series
Modified:
    trunk/libclass-dbi-mysql-perl/debian/changelog
    trunk/libclass-dbi-mysql-perl/debian/compat
    trunk/libclass-dbi-mysql-perl/debian/control
    trunk/libclass-dbi-mysql-perl/debian/copyright
    trunk/libclass-dbi-mysql-perl/debian/rules

Added: trunk/libclass-dbi-mysql-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/README.source?rev=40845&op=file
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/README.source (added)
+++ trunk/libclass-dbi-mysql-perl/debian/README.source Mon Jul 27 22:12:32 2009
@@ -1,0 +1,6 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+

Modified: trunk/libclass-dbi-mysql-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/changelog?rev=40845&op=diff
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/changelog (original)
+++ trunk/libclass-dbi-mysql-perl/debian/changelog Mon Jul 27 22:12:32 2009
@@ -1,4 +1,4 @@
-libclass-dbi-mysql-perl (1.00-2) UNRELEASED; urgency=low
+libclass-dbi-mysql-perl (1.00-2) unstable; urgency=low
 
   [ Damyan Ivanov ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -19,7 +19,18 @@
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- Damyan Ivanov <dmn at debian.org>  Sat, 26 Jan 2008 10:13:59 +0200
+  [ Ansgar Burchardt ]
+  * Bump Standards-Version to 3.8.2.
+  * Refresh rules for debhelper.
+  * Add myself to Uploaders.
+  * Convert debian/copyright to proposed machine-readable format.
+  * debian/control: Mention module name in description.
+  * Only disable tests that require a database via a patch instead of running
+    no tests at all.
+    + new patch disable-database-tests.patch
+    + Add quilt framework and README.source
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Tue, 28 Jul 2009 00:07:53 +0200
 
 libclass-dbi-mysql-perl (1.00-1.1) unstable; urgency=low
 

Modified: trunk/libclass-dbi-mysql-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/compat?rev=40845&op=diff
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/compat (original)
+++ trunk/libclass-dbi-mysql-perl/debian/compat Mon Jul 27 22:12:32 2009
@@ -1,1 +1,1 @@
-4
+7

Modified: trunk/libclass-dbi-mysql-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/control?rev=40845&op=diff
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/control (original)
+++ trunk/libclass-dbi-mysql-perl/debian/control Mon Jul 27 22:12:32 2009
@@ -1,10 +1,12 @@
 Source: libclass-dbi-mysql-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Ben Hutchings <ben at decadentplace.org.uk>
+Uploaders: Ben Hutchings <ben at decadentplace.org.uk>,
+ Ansgar Burchardt <ansgar at 43-1.org>
 Section: perl
 Priority: extra
-Build-Depends-Indep: debhelper (>= 4), perl (>= 5.6.0-16), libclass-dbi-perl (>= 0.94), libdbd-mysql-perl, libtest-pod-perl (>= 1.00), libtest-pod-coverage-perl (>= 1.00), libtime-piece-mysql-perl, mysql-client
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
+Build-Depends-Indep: perl (>= 5.6.0-16), libclass-dbi-perl (>= 0.94), libdbd-mysql-perl, libtest-pod-perl (>= 1.00), libtest-pod-coverage-perl (>= 1.00), libtime-piece-mysql-perl
+Standards-Version: 3.8.2
 Homepage: http://search.cpan.org/dist/Class-DBI-mysql/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libclass-dbi-mysql-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/
@@ -13,6 +15,6 @@
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, libclass-dbi-perl (>= 0.94), libdbd-mysql-perl
 Recommends: libtime-piece-mysql-perl
-Description: Class::DBI::mysql - Extensions to Class::DBI for MySQL
- This is an extension to Class::DBI, containing several functions and
- optimisations for the MySQL database.
+Description: extensions to Class::DBI for MySQL
+ The Class::DBI::mysql module is an extension to Class::DBI, containing several
+ functions and optimisations for the MySQL database.

Modified: trunk/libclass-dbi-mysql-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/copyright?rev=40845&op=diff
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/copyright (original)
+++ trunk/libclass-dbi-mysql-perl/debian/copyright Mon Jul 27 22:12:32 2009
@@ -1,17 +1,38 @@
-This is the Debian-packaged version of Class::DBI::mysql put together
-by Ben Hutchings <ben at decadentplace.org.uk> using source from:
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: 
+Upstream-Source: http://search.cpan.org/dist/
+Upstream-Name: 
 
-  http://search.cpan.org/~tmtm/Class-DBI-mysql/
+Files: *
+Copyright:
+ © 2001-2005, Tony Bowden
+License: Artistic | GPL-2+
 
-Copyright 2001-2005 Tony Bowden.
+Files: debian/*
+Copyright:
+ © 2006, Ben Hutchings <ben at decadentplace.org.uk>
+ © 2009, Ansgar Burchardt <ansgar at 43-1.org>
+License: Artistic | GPL-1+
 
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License; either version 2 of the License,
-or (at your option) any later version.
+License: GPL-2+
+    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.
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'
 
-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.
+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 GNU/Linux systems, the complete text of the Artistic License
+    can be found in `/usr/share/common-licenses/Artistic'
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+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 GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'

Added: trunk/libclass-dbi-mysql-perl/debian/patches/disable-database-tests.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/patches/disable-database-tests.patch?rev=40845&op=file
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/patches/disable-database-tests.patch (added)
+++ trunk/libclass-dbi-mysql-perl/debian/patches/disable-database-tests.patch Mon Jul 27 22:12:32 2009
@@ -1,0 +1,23 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Subject: Disable tests that require a running database
+Date: Mon, 27 Jul 2009 23:42:21 +0200
+
+Disable tests that require a MySQL server.  Also add a test that makes sure the
+module can at least be loaded.
+--- libclass-dbi-mysql-perl.orig/t/mysql.t
++++ libclass-dbi-mysql-perl/t/mysql.t
+@@ -3,6 +3,8 @@
+ use strict;
+ use Test::More;
+ 
++plan skip_all => "Database tests disabled." unless $ENV{TEST_DATABASE};
++
+ my $HAVE_TP = eval { require Time::Piece::MySQL };
+ 
+ plan tests => 8;
+--- /dev/null
++++ libclass-dbi-mysql-perl/t/01use.t
+@@ -0,0 +1,3 @@
++#! /usr/bin/perl
++use Test::More tests => 1;
++use_ok "Class::DBI::mysql";

Added: trunk/libclass-dbi-mysql-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/patches/series?rev=40845&op=file
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/patches/series (added)
+++ trunk/libclass-dbi-mysql-perl/debian/patches/series Mon Jul 27 22:12:32 2009
@@ -1,0 +1,1 @@
+disable-database-tests.patch

Modified: trunk/libclass-dbi-mysql-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-mysql-perl/debian/rules?rev=40845&op=diff
==============================================================================
--- trunk/libclass-dbi-mysql-perl/debian/rules (original)
+++ trunk/libclass-dbi-mysql-perl/debian/rules Mon Jul 27 22:12:32 2009
@@ -1,31 +1,3 @@
 #!/usr/bin/make -f
-
-build : build-stamp
-
-build-stamp : Makefile.PL
-	perl Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
-	@# Only run the unit tests if we have access to a local test database
-	if mysql -h localhost test </dev/null >/dev/null 2>&1; then $(MAKE) test; fi
-	touch build-stamp
-
-binary : binary-arch binary-indep
-
-binary-arch :
-
-binary-indep : build-stamp
-	dh_testroot
-	$(MAKE) PREFIX=$(CURDIR)/debian/libclass-dbi-mysql-perl/usr install
-	dh_perl
-	dh_installchangelogs Changes
-	dh_installdocs README
-	dh_compress
-	dh_fixperms
-	dh_gencontrol
-	dh_builddeb
-
-clean : 
-	if [ -f Makefile ]; then $(MAKE) clean; fi
-	dh_clean Makefile Makefile.old build-stamp
-
-.PHONY : build binary binary-arch binary-dep clean
+%:
+	dh --with quilt $@




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