r21985 - in /trunk/libnet-ident-perl: Ident.pm Makefile.PL debian/TODO.Debian debian/changelog debian/control debian/patches/ debian/patches/export-hooks.patch debian/patches/makefile_mod-perl.patch debian/patches/series debian/rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri Jun 20 17:40:54 UTC 2008
Author: gregoa
Date: Fri Jun 20 17:40:54 2008
New Revision: 21985
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21985
Log:
* Refresh debian/rules, no functional changes.
* Split out changes to upstream code into patches; add quilt framework.
Added:
trunk/libnet-ident-perl/debian/patches/
trunk/libnet-ident-perl/debian/patches/export-hooks.patch
trunk/libnet-ident-perl/debian/patches/makefile_mod-perl.patch
trunk/libnet-ident-perl/debian/patches/series
Modified:
trunk/libnet-ident-perl/Ident.pm
trunk/libnet-ident-perl/Makefile.PL
trunk/libnet-ident-perl/debian/TODO.Debian
trunk/libnet-ident-perl/debian/changelog
trunk/libnet-ident-perl/debian/control
trunk/libnet-ident-perl/debian/rules
Modified: trunk/libnet-ident-perl/Ident.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/Ident.pm?rev=21985&op=diff
==============================================================================
--- trunk/libnet-ident-perl/Ident.pm (original)
+++ trunk/libnet-ident-perl/Ident.pm Fri Jun 20 17:40:54 2008
@@ -28,7 +28,7 @@
# put the export hooks in the standard Exporter structures
_export_hooks();
# for compatibility mode, uncomment the next line @@ s/^#\s*// @@
- at EXPORT = qw(_export_hook_fh);
+# @EXPORT = qw(_export_hook_fh);
$VERSION = sprintf("%d.%02d", q$Revision: 1.20 $ =~ /: (\d+)\.(\d+)/);
@@ -505,7 +505,7 @@
}
# provide import magic
-sub _export_hooks {
+sub _export_hooks () {
my($tag, $hook);
while ( ($tag, $hook) = each %EXPORT_HOOKS ) {
my $hookname = "_export_hook_$tag"; # pseudo-function name
@@ -683,18 +683,18 @@
# add a paragraph about compatibility mode if appropriate. The non-breaking
# spaces are to force a new paragraph.
# @@12 s/^#// @@
-
-=pod
-
-S< >
-
-Adding the B<ident_lookup> method to the B<FileHandle> class used to be
-automatic in previous version of B<Net::Ident>. During the installation
-of this B<Net::Ident> package, the system administrator choose to install
-it in a compatible way, meaning that on this machine, the B<ident_lookup>
-method is automatically added if you use just C<use Net::Ident;>
-
-=cut
+#
+#=pod
+#
+#S< >
+#
+#Adding the B<ident_lookup> method to the B<FileHandle> class used to be
+#automatic in previous version of B<Net::Ident>. During the installation
+#of this B<Net::Ident> package, the system administrator choose to install
+#it in a compatible way, meaning that on this machine, the B<ident_lookup>
+#method is automatically added if you use just C<use Net::Ident;>
+#
+#=cut
# end of extra paragraph
=pod
Modified: trunk/libnet-ident-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/Makefile.PL?rev=21985&op=diff
==============================================================================
--- trunk/libnet-ident-perl/Makefile.PL (original)
+++ trunk/libnet-ident-perl/Makefile.PL Fri Jun 20 17:40:54 2008
@@ -150,7 +150,6 @@
# initial checks to see if apache is possible at all
sub check_initial_apache ($) {
- return;
my $apinfo = shift;
print "\nChecking for Apache.pm... ";
eval { require Apache };
Modified: trunk/libnet-ident-perl/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/TODO.Debian?rev=21985&op=diff
==============================================================================
--- trunk/libnet-ident-perl/debian/TODO.Debian (original)
+++ trunk/libnet-ident-perl/debian/TODO.Debian Fri Jun 20 17:40:54 2008
@@ -1,2 +1,1 @@
- check why tests fail
-- split out patches
Modified: trunk/libnet-ident-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/changelog?rev=21985&op=diff
==============================================================================
--- trunk/libnet-ident-perl/debian/changelog (original)
+++ trunk/libnet-ident-perl/debian/changelog Fri Jun 20 17:40:54 2008
@@ -1,3 +1,10 @@
+libnet-ident-perl (1.20-6) UNRELEASED; urgency=low
+
+ * Refresh debian/rules, no functional changes.
+ * Split out changes to upstream code into patches; add quilt framework.
+
+ -- gregor herrmann <gregoa at debian.org> Fri, 20 Jun 2008 19:37:36 +0200
+
libnet-ident-perl (1.20-5) unstable; urgency=low
[ Damyan Ivanov ]
Modified: trunk/libnet-ident-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/control?rev=21985&op=diff
==============================================================================
--- trunk/libnet-ident-perl/debian/control (original)
+++ trunk/libnet-ident-perl/debian/control Fri Jun 20 17:40:54 2008
@@ -2,7 +2,7 @@
Section: perl
Priority: optional
Build-Depends-Indep: perl (>= 5.6.0-17)
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>
Standards-Version: 3.7.3
Added: trunk/libnet-ident-perl/debian/patches/export-hooks.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/patches/export-hooks.patch?rev=21985&op=file
==============================================================================
--- trunk/libnet-ident-perl/debian/patches/export-hooks.patch (added)
+++ trunk/libnet-ident-perl/debian/patches/export-hooks.patch Fri Jun 20 17:40:54 2008
@@ -1,0 +1,55 @@
+Author: Don Armstrong <don at debian.org>
+Description: Fix _export_hooks called to early to check prototype message.
+Bug: #320137
+
+--- libnet-ident-perl-1.20.orig/Ident.pm
++++ libnet-ident-perl-1.20/Ident.pm
+@@ -28,7 +28,7 @@
+ # put the export hooks in the standard Exporter structures
+ _export_hooks();
+ # for compatibility mode, uncomment the next line @@ s/^#\s*// @@
+-# @EXPORT = qw(_export_hook_fh);
++ at EXPORT = qw(_export_hook_fh);
+
+ $VERSION = sprintf("%d.%02d", q$Revision: 1.20 $ =~ /: (\d+)\.(\d+)/);
+
+@@ -505,7 +505,7 @@
+ }
+
+ # provide import magic
+-sub _export_hooks () {
++sub _export_hooks {
+ my($tag, $hook);
+ while ( ($tag, $hook) = each %EXPORT_HOOKS ) {
+ my $hookname = "_export_hook_$tag"; # pseudo-function name
+@@ -683,18 +683,18 @@
+ # add a paragraph about compatibility mode if appropriate. The non-breaking
+ # spaces are to force a new paragraph.
+ # @@12 s/^#// @@
+-#
+-#=pod
+-#
+-#S< >
+-#
+-#Adding the B<ident_lookup> method to the B<FileHandle> class used to be
+-#automatic in previous version of B<Net::Ident>. During the installation
+-#of this B<Net::Ident> package, the system administrator choose to install
+-#it in a compatible way, meaning that on this machine, the B<ident_lookup>
+-#method is automatically added if you use just C<use Net::Ident;>
+-#
+-#=cut
++
++=pod
++
++S< >
++
++Adding the B<ident_lookup> method to the B<FileHandle> class used to be
++automatic in previous version of B<Net::Ident>. During the installation
++of this B<Net::Ident> package, the system administrator choose to install
++it in a compatible way, meaning that on this machine, the B<ident_lookup>
++method is automatically added if you use just C<use Net::Ident;>
++
++=cut
+ # end of extra paragraph
+
+ =pod
Added: trunk/libnet-ident-perl/debian/patches/makefile_mod-perl.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/patches/makefile_mod-perl.patch?rev=21985&op=file
==============================================================================
--- trunk/libnet-ident-perl/debian/patches/makefile_mod-perl.patch (added)
+++ trunk/libnet-ident-perl/debian/patches/makefile_mod-perl.patch Fri Jun 20 17:40:54 2008
@@ -1,0 +1,13 @@
+Author: Matt Hope <dopey at debian.org>
+Description: Makefile.PL; no longer interactive when mod_perl is installed
+
+--- libnet-ident-perl-1.20.orig/Makefile.PL
++++ libnet-ident-perl-1.20/Makefile.PL
+@@ -150,6 +150,7 @@
+
+ # initial checks to see if apache is possible at all
+ sub check_initial_apache ($) {
++ return;
+ my $apinfo = shift;
+ print "\nChecking for Apache.pm... ";
+ eval { require Apache };
Added: trunk/libnet-ident-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/patches/series?rev=21985&op=file
==============================================================================
--- trunk/libnet-ident-perl/debian/patches/series (added)
+++ trunk/libnet-ident-perl/debian/patches/series Fri Jun 20 17:40:54 2008
@@ -1,0 +1,2 @@
+export-hooks.patch
+makefile_mod-perl.patch
Modified: trunk/libnet-ident-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/rules?rev=21985&op=diff
==============================================================================
--- trunk/libnet-ident-perl/debian/rules (original)
+++ trunk/libnet-ident-perl/debian/rules Fri Jun 20 17:40:54 2008
@@ -1,64 +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.
# 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
+include /usr/share/quilt/quilt.make
-TMP = $(CURDIR)/debian/$(PACKAGE)
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
-
$(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
# Tests fail. We are just adopting the package, so, for now, I expect
# it to work. Users, please file bugs if it's b0rked!
# $(MAKE) test
+ touch $@
- touch build-stamp
-
-clean:
+clean: unpatch
dh_testdir
dh_testroot
-
dh_clean build-stamp install-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
+ [ ! -f Makefile ] || ( touch Makefile && $(MAKE) realclean )
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
-
- touch install-stamp
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ 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_installchangelogs Changes
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-binary: binary-indep
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-perl-cvs-commits
mailing list