r32254 - in /trunk/libwww-curl-perl/debian: changelog clean compat control copyright rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Mar 21 16:13:19 UTC 2009
Author: gregoa
Date: Sat Mar 21 16:13:14 2009
New Revision: 32254
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=32254
Log:
* Set debhelper compatibility level to 7; adapt
debian/{control,compat,rules}.
* Set Standards-Version to 3.8.1 (no changes).
* debian/copyright: update formatting and information about several files.
Added:
trunk/libwww-curl-perl/debian/clean
Modified:
trunk/libwww-curl-perl/debian/changelog
trunk/libwww-curl-perl/debian/compat
trunk/libwww-curl-perl/debian/control
trunk/libwww-curl-perl/debian/copyright
trunk/libwww-curl-perl/debian/rules
Modified: trunk/libwww-curl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/changelog?rev=32254&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/changelog (original)
+++ trunk/libwww-curl-perl/debian/changelog Sat Mar 21 16:13:14 2009
@@ -5,6 +5,10 @@
* debian/control: Added: ${misc:Depends} to Depends: field.
* Build against libcurl4-gnutls-dev instead of libcurl4-openssl-dev, thanks
to Adrian Bunk for the bug report (closes: #520595).
+ * Set debhelper compatibility level to 7; adapt
+ debian/{control,compat,rules}.
+ * Set Standards-Version to 3.8.1 (no changes).
+ * debian/copyright: update formatting and information about several files.
-- gregor herrmann <gregoa at debian.org> Sun, 16 Nov 2008 20:48:57 +0100
Added: trunk/libwww-curl-perl/debian/clean
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/clean?rev=32254&op=file
==============================================================================
--- trunk/libwww-curl-perl/debian/clean (added)
+++ trunk/libwww-curl-perl/debian/clean Sat Mar 21 16:13:14 2009
@@ -1,0 +1,4 @@
+Makefile.old
+curlopt-constants.c
+lib/WWW/Curl/Easy.pm
+lib/WWW/Curl/Share.pm
Modified: trunk/libwww-curl-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/compat?rev=32254&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/compat (original)
+++ trunk/libwww-curl-perl/debian/compat Sat Mar 21 16:13:14 2009
@@ -1,1 +1,1 @@
-6
+7
Modified: trunk/libwww-curl-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/control?rev=32254&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/control (original)
+++ trunk/libwww-curl-perl/debian/control Sat Mar 21 16:13:14 2009
@@ -6,10 +6,10 @@
MartÃn Ferrari <tincho at debian.org>,
Jose Luis Rivas <ghostbar38 at gmail.com>,
gregor herrmann <gregoa at debian.org>
-Build-Depends: debhelper (>= 6), perl (>= 5.8.0-19), libcurl4-gnutls-dev,
+Build-Depends: debhelper (>= 7), perl (>= 5.8.0-19), libcurl4-gnutls-dev,
libmodule-install-perl, libtest-pod-coverage-perl (>= 1.04),
libtest-pod-perl (>= 1.14)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://curl.haxx.se/libcurl/perl/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libwww-curl-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libwww-curl-perl/
Modified: trunk/libwww-curl-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/copyright?rev=32254&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/copyright (original)
+++ trunk/libwww-curl-perl/debian/copyright Sat Mar 21 16:13:14 2009
@@ -1,15 +1,12 @@
-This package was debianized by Domenico Andreoli <cavok at debian.org> on
-Sun, 22 Apr 2001 19:45:56 +0200.
-
-It was downloaded from http://curl.haxx.se/libcurl/perl/
-
-Upstream Authors: Cris Bailiff <c.bailiff at awayweb.com>
- Georg Horn <horn at koblenz-net.de>
- Forrest Cahoon <forrest.cahoon at merrillcorp.com>
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Cris Bailiff <c.bailiff+curl at devsecure.com>
+Upstream-Source: http://search.cpan.org/dist/WWW-Curl/
+Upstream-Name: WWW-Curl
Files: *
-Copyright: (C) 2003,2004,2005 Cris Bailiff
-License: other
+Copyright: (C) 2000-2005, 2008 Daniel Stenberg, Cris Bailiff , et al.
+License: MIT | MPL-1.0
You may opt to use, copy, modify, merge, publish, distribute and/or sell
copies of the Software, and permit persons to whom the Software is furnished
to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
@@ -21,35 +18,47 @@
This program is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
-On Debian GNU/Linux systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL' and the Artistic License in
-`/usr/share/common-licenses/Artistic'.
-
Files: lib/WWW/Curl/Multi.pm
Copyright: (C) 2004 Sebastian Riedel, et al.
-License: other
+License: MIT | MPL-1.0
You may opt to use, copy, modify, merge, publish, distribute and/or sell
copies of the Software, and permit persons to whom the Software is furnished
to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
pick one of these licenses.
-Files: Curl.xs:
-Copyright: (C) 2000, 2001, 2002 Daniel Stenberg, Cris Bailiff, et al.
-License: other
- You may opt to use, copy, modify, merge, publish, distribute and/or
- sell copies of the Software, and permit persons to whom the
- Software is furnished to do so, under the terms of the MPL or
- the MIT/X-derivate licenses. You may pick one of these licenses.
-
-Files: Easy.pm.in
-Copyright: (C) 2000,2001,2002,2003,2004 Daniel Stenberg, Cris Bailiff, Sebastian Riedel, et al.
-License: other
+Files: lib/WWW/Curl/Easy.pm, template/Easy.pm.tmpl
+Copyright: (C) 2000-2005,2008 Daniel Stenberg, Cris Bailiff, Sebastian Riedel, et al.
+License: MIT | MPL-1.0
You may opt to use, copy, modify, merge, publish, distribute and/or sell
copies of the Software, and permit persons to whom the Software is furnished
to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
pick one of these licenses.
-The MIT License
+Files: lib/WWW/Curl/Share.pm, template/Share.pm.tmpl
+Copyright: (C) 2008, Anton Fedorov (datacompboy <at> mail.ru)
+License: MIT | MPL-1.0
+ You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ copies of the Software, and permit persons to whom the Software is furnished
+ to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
+ pick one of these licenses.
+
+Files: lib/WWW/Curl.pm
+Copyright: (C) 2000-2005,2008 Daniel Stenberg, Cris Bailiff, Sebastian Riedel, Balint Szilakszi et al.
+License: MIT | MPL-1.0
+ You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ copies of the Software, and permit persons to whom the Software is furnished
+ to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
+ pick one of these licenses.
+
+Files: debian/*
+Copyright:
+ 2001-2003, Domenico Andreoli <cavok at debian.org>
+ 2003, Deedra Waters <dmwaters at linuxpowered.com>
+ 2004-2009, various members of the Debian Perl Group, cf. debian/changelog
+License: MIT | MPL-1.0 | Artistic | GPL-1+
+
+License: MIT
+ The MIT License
Copyright (c) <year> <copyright holders>
@@ -72,7 +81,8 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Mozilla Public License Version 1.0
+License: MPL-1.0
+ Mozilla Public License Version 1.0
1. Definitions.
1.1. "Contributor" means each entity that creates or contributes to
@@ -406,3 +416,16 @@
_______________________. All Rights Reserved.
Contributor(s): ______________________________________."
+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'
+
+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'
Modified: trunk/libwww-curl-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/rules?rev=32254&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/rules (original)
+++ trunk/libwww-curl-perl/debian/rules Sat Mar 21 16:13:14 2009
@@ -1,69 +1,25 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# 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
-
-PERL ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
-
-# Allow disabling build optimisation 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
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
- $(MAKE) test TEST_FILES="t/00constants.t t/pod-coverage.t t/pod.t"
+ dh build --before dh_auto_test
+ dh_auto_test -- TEST_FILES="t/00constants.t t/pod-coverage.t t/pod.t"
+ dh build --after dh_auto_test
touch $@
clean:
- dh_testdir
- dh_testroot
- dh_clean build-stamp configure-stamp install-stamp Makefile.old curlopt-constants.c lib/WWW/Curl/Easy.pm lib/WWW/Curl/Share.pm
- [ ! -f Makefile ] || $(MAKE) clean
+ dh $@
install: install-stamp
install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- $(MAKE) PREFIX=/usr DESTDIR=$(TMP) install
- [ ! -d $(TMP)/usr/share/perl5 ] || \
- rmdir --ignore-fail-on-non-empty --parents --verbose \
- $(TMP)/usr/share/perl5
+ dh install
touch $@
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do here for an architecture-dependent package
+binary-arch: install
+ dh $@
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs Changes
- dh_shlibdeps
- dh_strip
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+binary-indep:
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build
More information about the Pkg-perl-cvs-commits
mailing list