r28089 - in /trunk/libconfig-file-perl: Build.PL CHANGES LICENSE MANIFEST META.yml Makefile.PL README debian/changelog debian/control debian/rules lib/Config/File.pm t/pod.t t/pod_coverage.t

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Fri Dec 12 04:19:07 UTC 2008


Author: gwolf
Date: Fri Dec 12 04:19:03 2008
New Revision: 28089

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28089
Log:
Preparing new upstream upload

Added:
    trunk/libconfig-file-perl/Build.PL
      - copied unchanged from r28086, branches/upstream/libconfig-file-perl/current/Build.PL
    trunk/libconfig-file-perl/LICENSE
      - copied unchanged from r28086, branches/upstream/libconfig-file-perl/current/LICENSE
    trunk/libconfig-file-perl/README
      - copied unchanged from r28086, branches/upstream/libconfig-file-perl/current/README
    trunk/libconfig-file-perl/t/pod.t
      - copied unchanged from r28088, branches/upstream/libconfig-file-perl/current/t/pod.t
    trunk/libconfig-file-perl/t/pod_coverage.t
      - copied unchanged from r28088, branches/upstream/libconfig-file-perl/current/t/pod_coverage.t
Modified:
    trunk/libconfig-file-perl/CHANGES
    trunk/libconfig-file-perl/MANIFEST
    trunk/libconfig-file-perl/META.yml
    trunk/libconfig-file-perl/Makefile.PL
    trunk/libconfig-file-perl/debian/changelog
    trunk/libconfig-file-perl/debian/control
    trunk/libconfig-file-perl/debian/rules
    trunk/libconfig-file-perl/lib/Config/File.pm

Modified: trunk/libconfig-file-perl/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/CHANGES?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/CHANGES (original)
+++ trunk/libconfig-file-perl/CHANGES Fri Dec 12 04:19:03 2008
@@ -7,3 +7,9 @@
 1.42 (04-Mar-2008):
  - Explicitly closing the file after reading it, closing a bug on
    wperl.exe on win32. Thanks to Peter Valdemar Mørch for spotting it!
+
+1.45 (11-Dec-2008):
+ - Migrated from ExtUtils::MakeMaker to Module::Build, to properly
+   (and more easily) keep up-to-date and valid metadata
+ - Added Test::Pod, Test::Pod::Coverage
+ - Keeping CPANTS / Kwalitee happy! (hopefully)

Modified: trunk/libconfig-file-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/MANIFEST?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/MANIFEST (original)
+++ trunk/libconfig-file-perl/MANIFEST Fri Dec 12 04:19:03 2008
@@ -1,8 +1,13 @@
+Build.PL
 CHANGES
-Makefile.PL
-t/config
-t/test.t
-MANIFEST
 lib/Config/File.pm
 lib/ConfigFile.pm
-META.yml                                 Module meta-data (added by MakeMaker)
+LICENSE
+Makefile.PL
+MANIFEST
+META.yml
+README
+t/config
+t/pod.t
+t/pod_coverage.t
+t/test.t

Modified: trunk/libconfig-file-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/META.yml?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/META.yml (original)
+++ trunk/libconfig-file-perl/META.yml Fri Dec 12 04:19:03 2008
@@ -1,10 +1,22 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         Config-File
-version:      1.42
-version_from: lib/Config/File.pm
-installdirs:  site
-requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30_01
+---
+name: Config-File
+version: 1.46
+author:
+  - 'Gunnar Wolf <gwolf at gwolf.org>'
+abstract: Parse a simple configuration file
+license: gpl
+resources:
+  license: http://opensource.org/licenses/gpl-license.php
+build_requires:
+  Module::Build: 0
+  Test::Pod: 0
+provides:
+  Config::File:
+    file: lib/Config/File.pm
+    version: 1.46
+  ConfigFile:
+    file: lib/ConfigFile.pm
+generated_by: Module::Build version 0.280801
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.2.html
+  version: 1.2

Modified: trunk/libconfig-file-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/Makefile.PL?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/Makefile.PL (original)
+++ trunk/libconfig-file-perl/Makefile.PL Fri Dec 12 04:19:03 2008
@@ -1,7 +1,31 @@
-use ExtUtils::MakeMaker;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
-WriteMakefile(
-    'NAME'              => 'Config::File',
-    'VERSION_FROM'      => 'lib/Config/File.pm', # finds $VERSION
-);
+# Note: this file was auto-generated by Module::Build::Compat version 0.2808_01
+    
+    unless (eval "use Module::Build::Compat 0.02; 1" ) {
+      print "This module requires Module::Build to install itself.\n";
+      
+      require ExtUtils::MakeMaker;
+      my $yn = ExtUtils::MakeMaker::prompt
+	('  Install Module::Build now from CPAN?', 'y');
+      
+      unless ($yn =~ /^y/i) {
+	die " *** Cannot install without Module::Build.  Exiting ...\n";
+      }
+      
+      require Cwd;
+      require File::Spec;
+      require CPAN;
+      
+      # Save this 'cause CPAN will chdir all over the place.
+      my $cwd = Cwd::cwd();
+      
+      CPAN::Shell->install('Module::Build::Compat');
+      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
+	or die "Couldn't install Module::Build, giving up.\n";
+      
+      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
+    }
+    eval "use Module::Build::Compat 0.02; 1" or die $@;
+    
+    Module::Build::Compat->run_build_pl(args => \@ARGV);
+    require Module::Build;
+    Module::Build::Compat->write_makefile(build_class => 'Module::Build');

Modified: trunk/libconfig-file-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/debian/changelog?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/debian/changelog (original)
+++ trunk/libconfig-file-perl/debian/changelog Fri Dec 12 04:19:03 2008
@@ -1,10 +1,16 @@
-libconfig-file-perl (1.42-2) UNRELEASED; urgency=low
+libconfig-file-perl (1.46-1) unstable; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
   * debian/control: Added: ${misc:Depends} to Depends: field.
-
- -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:40:50 +0100
+  * standards-version -> 3.8.0 (no changes)
+  
+  [ Gunnar Wolf ]
+  * New upstream release
+  * Switched the build system used to Module::Build
+  
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 11 Dec 2008 22:00:24 -0600
 
 libconfig-file-perl (1.42-1) unstable; urgency=low
 

Modified: trunk/libconfig-file-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/debian/control?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/debian/control (original)
+++ trunk/libconfig-file-perl/debian/control Fri Dec 12 04:19:03 2008
@@ -1,13 +1,13 @@
 Source: libconfig-file-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 6)
+Build-Depends: debhelper (>= 6), libmodule-build-perl
 Build-Depends-Indep: perl (>= 5.8.8-6)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>,
  gregor herrmann <gregor+debian at comodo.priv.at>,
  Damyan Ivanov <dmn at debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/Config-File/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconfig-file-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libconfig-file-perl/

Modified: trunk/libconfig-file-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/debian/rules?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/debian/rules (original)
+++ trunk/libconfig-file-perl/debian/rules Fri Dec 12 04:19:03 2008
@@ -1,65 +1,64 @@
 #!/usr/bin/make -f
-#-*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Christoph Lameter.
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
+#
+# It was later modified by Jason Kohles <email at jasonkohles.com>
+# http://www.jasonkohles.com/ to support Module::Build installed modules
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGE=$(shell dh_listpackages)
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
 
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
-	$(MAKE) test
-
+	# Add commands to compile the package here
+	$(PERL) Build.PL installdirs=vendor
+	$(PERL) Build
+	$(PERL) Build test
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+	# Add commands to clean up after the build process here
+	[ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
 
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	[ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
-
+	# Add commands to install the package into $(TMP) here
+	$(PERL) Build install destdir=$(TMP) create_packlist=0
 	touch $@
 
 binary-arch:
+# We have nothing to do here for an architecture-independent package
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs
-	dh_installman
-	dh_installchangelogs CHANGES
+	dh_installdocs 
+	dh_installexamples 
+	dh_installchangelogs 
+	dh_perl
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install

Modified: trunk/libconfig-file-perl/lib/Config/File.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-file-perl/lib/Config/File.pm?rev=28089&op=diff
==============================================================================
--- trunk/libconfig-file-perl/lib/Config/File.pm (original)
+++ trunk/libconfig-file-perl/lib/Config/File.pm Fri Dec 12 04:19:03 2008
@@ -1,7 +1,5 @@
-#!/usr/bin/perl -w
-
 package Config::File;
-
+use warnings;
 use strict;
 use Carp;
 use Exporter;
@@ -10,7 +8,7 @@
 use vars qw($VERSION @ISA @EXPORT_OK);
 @ISA = qw/Exporter/;
 @EXPORT_OK = qw/read_config_file/;
-$VERSION='1.42';
+$VERSION='1.46';
 
 
 sub read_config_file($) {
@@ -73,7 +71,7 @@
 
 C<read_config_file> parses a simple configuration file and stores its
 values in an anonymous hash reference. The syntax of the configuration
-file is quite simple:
+file is as follows:
 
     # This is a comment
     VALUE_ONE = foo
@@ -174,8 +172,8 @@
 
 Version 1.4
 Copyright (c) 2002 Sebastien J. Gross. All rights reserved.
-Copyright (c) 2003,2006 Gunnar Wolf. All rights reserved.
+Copyright (c) 2003-2008 Gunnar Wolf. All rights reserved.
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GPL.
+it under the terms of the GPL v2 (or later, at your choice).
 
 =cut




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