r32041 - in /trunk/libapache-configfile-perl/debian: changelog compat control copyright patches/15globs.patch rules

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Fri Mar 13 22:50:22 UTC 2009 

Author: ryan52-guest
Date: Fri Mar 13 22:50:18 2009
New Revision: 32041

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=32041
Log:
* add myself to uploaders
* improve gregoa's 15globs.patch patch
* policy 3.8.1
* dh 7
* remove duplicate Prriority and Section fields in debian/control
* fix machine readable copyright format

Modified:
    trunk/libapache-configfile-perl/debian/changelog
    trunk/libapache-configfile-perl/debian/compat
    trunk/libapache-configfile-perl/debian/control
    trunk/libapache-configfile-perl/debian/copyright
    trunk/libapache-configfile-perl/debian/patches/15globs.patch
    trunk/libapache-configfile-perl/debian/rules

Modified: trunk/libapache-configfile-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/changelog?rev=32041&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/changelog (original)
+++ trunk/libapache-configfile-perl/debian/changelog Fri Mar 13 22:50:18 2009
@@ -1,5 +1,6 @@
 libapache-configfile-perl (1.18-7) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * Add debian/README.source to document quilt usage, as required by
     Debian Policy since 3.8.0.
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
@@ -9,7 +10,15 @@
     thanks to Stefan Schlesinger for the bug report (closes: #519271). Refresh
     other patches.
 
- -- gregor herrmann <gregoa at debian.org>  Wed, 06 Aug 2008 21:33:13 -0300
+  [ Ryan Niebur ]
+  * add myself to uploaders
+  * improve gregoa's 15globs.patch patch
+  * policy 3.8.1
+  * dh 7
+  * remove duplicate Prriority and Section fields in debian/control
+  * fix machine readable copyright format
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Fri, 13 Mar 2009 15:48:13 -0700
 
 libapache-configfile-perl (1.18-6) unstable; urgency=low
 

Modified: trunk/libapache-configfile-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/compat?rev=32041&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/compat (original)
+++ trunk/libapache-configfile-perl/debian/compat Fri Mar 13 22:50:18 2009
@@ -1,1 +1,1 @@
-6
+7

Modified: trunk/libapache-configfile-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/control?rev=32041&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/control (original)
+++ trunk/libapache-configfile-perl/debian/control Fri Mar 13 22:50:18 2009
@@ -1,20 +1,18 @@
 Source: libapache-configfile-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>,
- Damyan Ivanov <dmn at debian.org>
+ Damyan Ivanov <dmn at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>
 Priority: optional
 Section: perl
-Build-Depends: debhelper (>= 6), quilt
+Build-Depends: debhelper (>= 7), quilt
 Build-Depends-Indep: perl (>= 5.6.0-17)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 Homepage: http://search.cpan.org/dist/Apache-ConfigFile/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libapache-configfile-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libapache-configfile-perl/
 
 Package: libapache-configfile-perl
 Architecture: all
-Priority: optional
-Section: perl
 Depends: ${misc:Depends}, ${perl:Depends}
 Description: Parse an Apache style httpd.conf configuration file
  Apache::ConfigFile parses the Apache httpd.conf, or any compatible config

Modified: trunk/libapache-configfile-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/copyright?rev=32041&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/copyright (original)
+++ trunk/libapache-configfile-perl/debian/copyright Fri Mar 13 22:50:18 2009
@@ -1,12 +1,12 @@
-This is Debian GNU/Linux's prepackaged version of Apache::ConfigFile
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Name: Apache::ConfigFile
+Upstream-Source: http://search.cpan.org/dist/Apache-ConfigFile/
+Upstream-Maintainer: Nathan Wiger <nate at wiger.org>
 
-Upstream source can be downloaded from
-http://search.cpan.org/dist/Apache-ConfigFile/
-
-The Apache::ConfigFile copyright is as follows:
 Files: *
 Copyright: (c) 1999-2001, Nathan Wiger <nate at wiger.org>. All Rights Reserved.
-License: GPL-1+|Artistic
+License: GPL-1+ | Artistic
  This module is free software; you may copy this under the terms of the GNU
  General Public License, or the Artistic License, copies of which should have
  accompanied your Perl kit.
@@ -17,7 +17,7 @@
 
 Files: debian/*
 Copyright: © 2002,2003 Michael Alan Dorman <mdorman at debian.org>
-Copyright: © 2004,2005,2006,2008 Debian Perl Group <debian-perl at lists.debian.org>
+ © 2004,2005,2006,2008 Debian Perl Group <debian-perl at lists.debian.org>
 License: other
  It is assumed that all maintainers of this package license their work under
  terms, compatible with upstream's license

Modified: trunk/libapache-configfile-perl/debian/patches/15globs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/patches/15globs.patch?rev=32041&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/patches/15globs.patch (original)
+++ trunk/libapache-configfile-perl/debian/patches/15globs.patch Fri Mar 13 22:50:18 2009
@@ -4,21 +4,25 @@
 
 --- a/ConfigFile.pm
 +++ b/ConfigFile.pm
-@@ -181,6 +181,17 @@
-         return @conf;
-     }
+@@ -168,6 +168,21 @@
+     # add the server root unless it's a /full/path/name
+     $file = "$server_root/$file" if $file !~ m!^/! && $server_root;
  
 +    # Handling for wildcards
-+    if ($file =~ /\/\*/) {
-+        my @files = glob($file)
-+            || croak("Cannot glob '$file': $!");
++    my @files = glob($file)
++        || croak("Cannot glob '$file': $!");
++    if (length(@files) > 1) {
 +        my @conf;
 +        foreach (@files) {
 +            push @conf, _include($_);
 +        }
 +        return @conf;
++    } elsif(length(@files) == 1) {
++        $file = $files[0];
++    } else {
++        return;
 +    }
 +
-     open(CONF, "<$file")
-         || croak("Cannot read '$file': $! (do you need to define ServerRoot?)");
-     chomp(my @conf = <CONF>);
+     # Handling for directories
+     if (-d $file) {
+         opendir(DIR, $file)

Modified: trunk/libapache-configfile-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/rules?rev=32041&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/rules (original)
+++ trunk/libapache-configfile-perl/debian/rules Fri Mar 13 22:50:18 2009
@@ -1,51 +1,25 @@
 #!/usr/bin/make -f
 
-PERL ?= /usr/bin/perl
-
 include /usr/share/quilt/quilt.make
-
-b := $(CURDIR)/debian/libapache-configfile-perl
 
 binary: binary-indep binary-arch
 
 binary-arch:
 
 binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installdocs README
-	dh_installchangelogs Changes
-	dh_fixperms
-	dh_installdeb
-	dh_perl
-	dh_compress
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh binary-indep
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
-	$(MAKE) test
+	dh build
 	touch $@
 
 clean: unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+	dh clean
 
 install: install-stamp
 install-stamp: build-stamp
-	dh_testdir
-	$(MAKE) pure_install DESTDIR=$(b) PREFIX=/usr
-
-	#As this is a architecture independent package, we are not supposed to install
-	#stuff to /usr/lib. MakeMaker creates the dirs, we delete them from the deb:
-	[ ! -d $(b)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(b)/usr/lib/perl5
-
+	dh install
 	touch $@
 
 .PHONY: binary binary-arch binary-indep clean

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