r68509 - in /trunk/perlipq: ./ debian/ debian/patches/ debian/source/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Feb 13 16:40:14 UTC 2011
Author: gregoa
Date: Sun Feb 13 16:39:41 2011
New Revision: 68509
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68509
Log:
* Add /me to Uploaders. Add Homepage.
* Switch to debhelper 7.
* Switch to source format 3.0 (quilt).
* Install example scripts.
* Set Standards-Version to 3.9.1; drop version from perl build dependency.
* debian/copyright: use DEP5 formatting.
* Split put changes in Makefile.PL into a patch.
* Add a patch to fix a POD error.
Added:
trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.docs
trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.examples
trunk/perlipq/debian/patches/
trunk/perlipq/debian/patches/libipq.patch
trunk/perlipq/debian/patches/pod.patch
trunk/perlipq/debian/patches/series
trunk/perlipq/debian/source/
trunk/perlipq/debian/source/format
Modified:
trunk/perlipq/Makefile.PL
trunk/perlipq/debian/changelog
trunk/perlipq/debian/compat
trunk/perlipq/debian/control
trunk/perlipq/debian/copyright
trunk/perlipq/debian/rules
Modified: trunk/perlipq/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/Makefile.PL?rev=68509&op=diff
==============================================================================
--- trunk/perlipq/Makefile.PL (original)
+++ trunk/perlipq/Makefile.PL Sun Feb 13 16:39:41 2011
@@ -7,7 +7,7 @@
#
# Defaults
#
-my $IPTABLES_DIR = '/usr/include/libipq';
+my $IPTABLES_DIR = '/usr/local';
#
# Query user to override defaults.
@@ -28,6 +28,6 @@
WriteMakefile('NAME' => 'IPTables::IPv4::IPQueue',
'DISTNAME' => 'perlipq',
'VERSION_FROM' => 'IPQueue.pm',
- 'LIBS' => ["-lipq"],
+ 'LIBS' => ["-L$IPTABLES_DIR/libipq -lipq"],
'DEFINE' => '',
- 'INC' => "-I$IPTABLES_DIR");
+ 'INC' => "-I$IPTABLES_DIR/include");
Modified: trunk/perlipq/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/changelog?rev=68509&op=diff
==============================================================================
--- trunk/perlipq/debian/changelog (original)
+++ trunk/perlipq/debian/changelog Sun Feb 13 16:39:41 2011
@@ -1,13 +1,18 @@
-perlipq (1.25-3) UNRELEASED; urgency=low
+perlipq (1.25-2) UNRELEASED; urgency=low
- * NOT RELEASED YET
- * Take over for the Debian Perl Group; Closes: #56112 -- RFA/ITA
+ * Take over for the Debian Perl Group; Closes: #572957 -- ITA
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
field (source stanza). Changed: Maintainer set to Debian Perl Group
<pkg-perl-maintainers at lists.alioth.debian.org> (was: Yann Dirson
- <dirson at debian.org>); Yann Dirson <dirson at debian.org> moved to
- Uploaders.
+ <dirson at debian.org>). Add /me to Uploaders. Add Homepage.
* debian/watch: use dist-based URL.
+ * Switch to debhelper 7.
+ * Switch to source format 3.0 (quilt).
+ * Install example scripts.
+ * Set Standards-Version to 3.9.1; drop version from perl build dependency.
+ * debian/copyright: use DEP5 formatting.
+ * Split put changes in Makefile.PL into a patch.
+ * Add a patch to fix a POD error.
-- gregor herrmann <gregoa at debian.org> Sun, 13 Feb 2011 16:29:45 +0100
Modified: trunk/perlipq/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/compat?rev=68509&op=diff
==============================================================================
--- trunk/perlipq/debian/compat (original)
+++ trunk/perlipq/debian/compat Sun Feb 13 16:39:41 2011
@@ -1,1 +1,1 @@
-4
+7
Modified: trunk/perlipq/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/control?rev=68509&op=diff
==============================================================================
--- trunk/perlipq/debian/control (original)
+++ trunk/perlipq/debian/control Sun Feb 13 16:39:41 2011
@@ -1,16 +1,19 @@
Source: perlipq
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 4.0.2), iptables-dev, perl (>= 5.8.0-7)
+Build-Depends: debhelper (>= 7.0.50~),
+ iptables-dev,
+ perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Yann Dirson <dirson at debian.org>
-Standards-Version: 3.6.1
+Uploaders: gregor herrmann <gregoa at debian.org>
+Standards-Version: 3.9.1
+Homepage: http://search.cpan.org/dist/perlipq/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/perlipq/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/perlipq/
Package: libiptables-ipv4-ipqueue-perl
Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
Description: Perl extension for libipq
Perlipq (IPTables::IPv4::IPQueue) is a Perl extension for iptables userspace
packet queuing via libipq.
Modified: trunk/perlipq/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/copyright?rev=68509&op=diff
==============================================================================
--- trunk/perlipq/debian/copyright (original)
+++ trunk/perlipq/debian/copyright Sun Feb 13 16:39:41 2011
@@ -1,28 +1,39 @@
-This is the debian package for the perl ipq module.
-It was created by Yann Dirson <dirson at debian.org> with help of
-dh-make-perl.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: James Morris <jmorris at intercode.com.au>
+Source: http://search.cpan.org/dist/perlipq/
+Name: perlipq
-The upstream author is:
+Files: *
+Copyright: 2000-2002, James Morris <jmorris at intercode.com.au>
+License: GPL-2+
-James Morris <jmorris at intercode.com.au>.
+Files: debian/*
+Copyright: 2004, Yann Dirson <dirson at debian.org>
+ 2008, Frank Lichtenheld <djpig at debian.org>
+ 2011, gregor herrmann <gregoa at debian.org>
+License: GPL-2+ or Artistic or GPL-1+
+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; version 2 dated June, 1991, or (at your
+ option) any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-Copyright (c) 2000-2002 James Morris <jmorris at intercode.com.au>
+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'.
-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 of the License, or
-(at your option) any later version.
-
-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. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
-
-On Debian systems, the text of the GPL 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 systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
Added: trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.docs?rev=68509&op=file
==============================================================================
--- trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.docs (added)
+++ trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.docs Sun Feb 13 16:39:41 2011
@@ -1,0 +1,1 @@
+README
Added: trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.examples?rev=68509&op=file
==============================================================================
--- trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.examples (added)
+++ trunk/perlipq/debian/libiptables-ipv4-ipqueue-perl.examples Sun Feb 13 16:39:41 2011
@@ -1,0 +1,1 @@
+*.pl
Added: trunk/perlipq/debian/patches/libipq.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/patches/libipq.patch?rev=68509&op=file
==============================================================================
--- trunk/perlipq/debian/patches/libipq.patch (added)
+++ trunk/perlipq/debian/patches/libipq.patch Sun Feb 13 16:39:41 2011
@@ -1,0 +1,27 @@
+Description: Fixed Makefile.PL to find libipq components.
+Origin: vendor
+Forwarded: not-needed
+Author: Yann Dirson <dirson at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-02-13
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -7,7 +7,7 @@
+ #
+ # Defaults
+ #
+-my $IPTABLES_DIR = '/usr/local';
++my $IPTABLES_DIR = '/usr/include/libipq';
+
+ #
+ # Query user to override defaults.
+@@ -28,6 +28,6 @@
+ WriteMakefile('NAME' => 'IPTables::IPv4::IPQueue',
+ 'DISTNAME' => 'perlipq',
+ 'VERSION_FROM' => 'IPQueue.pm',
+- 'LIBS' => ["-L$IPTABLES_DIR/libipq -lipq"],
++ 'LIBS' => ["-lipq"],
+ 'DEFINE' => '',
+- 'INC' => "-I$IPTABLES_DIR/include");
++ 'INC' => "-I$IPTABLES_DIR");
Added: trunk/perlipq/debian/patches/pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/patches/pod.patch?rev=68509&op=file
==============================================================================
--- trunk/perlipq/debian/patches/pod.patch (added)
+++ trunk/perlipq/debian/patches/pod.patch Sun Feb 13 16:39:41 2011
@@ -1,0 +1,21 @@
+Description: fix POD errors
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-02-13
+
+--- a/IPQueue.pm
++++ b/IPQueue.pm
+@@ -328,8 +328,12 @@
+
+ =head1 CHANGES
+
++=over
++
+ =item * Support for timeouts in get_message() was added in version 1.24.
+
++=back
++
+ =head1 BUGS
+
+ None known.
Added: trunk/perlipq/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/patches/series?rev=68509&op=file
==============================================================================
--- trunk/perlipq/debian/patches/series (added)
+++ trunk/perlipq/debian/patches/series Sun Feb 13 16:39:41 2011
@@ -1,0 +1,2 @@
+libipq.patch
+pod.patch
Modified: trunk/perlipq/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/rules?rev=68509&op=diff
==============================================================================
--- trunk/perlipq/debian/rules (original)
+++ trunk/perlipq/debian/rules Sun Feb 13 16:39:41 2011
@@ -1,100 +1,7 @@
#!/usr/bin/make -f
-# 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
+%:
+ dh $@
-# 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
-
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
-
-# Allow disabling build optimation by setting noopt in
-# $DEB_BUILD_OPTIONS
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add commands to compile the package here
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
-
- # Add commands to clean up after the build process here
- -$(MAKE) realclean
-
- dh_clean build-stamp install-stamp
-
-install: install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_clean -k
-
- # Add here commands to install the package into debian/tmp.
- #$(MAKE) test
- $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
- # As this is a architecture dependent package, we are not supposed to install
- # stuff to /usr/share/perl5. MakeMaker creates the dirs, we delete them from
- # the deb:
- [ ! -d $(TMP)/usr/share/perl5 ] || \
- rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/share/perl5
-
- touch install-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installexamples
-# dh_installmenu
-# dh_installcron
-# dh_installman
- dh_installchangelogs Changes
- dh_link
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- dh_strip
-endif
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_perl
- dh_shlibdeps
- 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
+override_dh_auto_test:
+ # don't run tests
Added: trunk/perlipq/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/perlipq/debian/source/format?rev=68509&op=file
==============================================================================
--- trunk/perlipq/debian/source/format (added)
+++ trunk/perlipq/debian/source/format Sun Feb 13 16:39:41 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-perl-cvs-commits
mailing list