r61711 - in /trunk/libapache-db-perl/debian: changelog compat control copyright patches/ patches/hurd.patch patches/series rules source/ source/format
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Wed Aug 18 08:55:00 UTC 2010
Author: ansgar-guest
Date: Wed Aug 18 08:54:32 2010
New Revision: 61711
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=61711
Log:
* Fix FTBFS on GNU/Hurd.
+ new patch: hurd.patch
* Use source format 3.0 (quilt).
* Make dependency on libapache2-mod-perl2 unversioned as it is already
satisfied in stable.
* Make build-dep on perl unversioned.
* Use tiny debian/rules with debhelper 8.
* Convert debian/copyright to proposed machine-readable format.
* Bump Standards-Version to 3.9.1.
* Add myself to Uploaders.
Added:
trunk/libapache-db-perl/debian/patches/
trunk/libapache-db-perl/debian/patches/hurd.patch
trunk/libapache-db-perl/debian/patches/series
trunk/libapache-db-perl/debian/source/
trunk/libapache-db-perl/debian/source/format
Modified:
trunk/libapache-db-perl/debian/changelog
trunk/libapache-db-perl/debian/compat
trunk/libapache-db-perl/debian/control
trunk/libapache-db-perl/debian/copyright
trunk/libapache-db-perl/debian/rules
Modified: trunk/libapache-db-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/changelog?rev=61711&op=diff
==============================================================================
--- trunk/libapache-db-perl/debian/changelog (original)
+++ trunk/libapache-db-perl/debian/changelog Wed Aug 18 08:54:32 2010
@@ -1,4 +1,4 @@
-libapache-db-perl (0.14-2) UNRELEASED; urgency=low
+libapache-db-perl (0.14-2) unstable; urgency=low
[ gregor herrmann ]
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
@@ -8,7 +8,19 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- gregor herrmann <gregoa at debian.org> Sun, 16 Nov 2008 20:39:24 +0100
+ [ Ansgar Burchardt ]
+ * Fix FTBFS on GNU/Hurd.
+ + new patch: hurd.patch
+ * Use source format 3.0 (quilt).
+ * Make dependency on libapache2-mod-perl2 unversioned as it is already
+ satisfied in stable.
+ * Make build-dep on perl unversioned.
+ * Use tiny debian/rules with debhelper 8.
+ * Convert debian/copyright to proposed machine-readable format.
+ * Bump Standards-Version to 3.9.1.
+ * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Wed, 18 Aug 2010 17:51:05 +0900
libapache-db-perl (0.14-1) unstable; urgency=low
Modified: trunk/libapache-db-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/compat?rev=61711&op=diff
==============================================================================
--- trunk/libapache-db-perl/debian/compat (original)
+++ trunk/libapache-db-perl/debian/compat Wed Aug 18 08:54:32 2010
@@ -1,1 +1,1 @@
-5
+8
Modified: trunk/libapache-db-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/control?rev=61711&op=diff
==============================================================================
--- trunk/libapache-db-perl/debian/control (original)
+++ trunk/libapache-db-perl/debian/control Wed Aug 18 08:54:32 2010
@@ -1,18 +1,20 @@
Source: libapache-db-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5), perl (>= 5.8)
+Build-Depends: debhelper (>= 8), perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Ivan Kohler <ivan-debian at 420.am>, gregor herrmann <gregoa at debian.org>
-Standards-Version: 3.7.3
+Uploaders: Ivan Kohler <ivan-debian at 420.am>,
+ gregor herrmann <gregoa at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Standards-Version: 3.9.1
Homepage: http://search.cpan.org/dist/Apache-DB/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libapache-db-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libapache-db-perl/
Package: libapache-db-perl
Architecture: any
-Depends: ${misc:Depends}, libapache2-mod-perl2 (>= 1.999.22), ${perl:Depends}, ${shlibs:Depends}
-Description: Run the interactive Perl debugger under mod_perl
+Depends: ${misc:Depends}, libapache2-mod-perl2, ${perl:Depends}, ${shlibs:Depends}
+Description: run the interactive Perl debugger under mod_perl
Perl ships with a very useful interactive debugger, however, it does not run
"out-of-the-box" in the Apache/mod_perl environment. Apache::DB makes a few
adjustments so the two will cooperate.
Modified: trunk/libapache-db-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/copyright?rev=61711&op=diff
==============================================================================
--- trunk/libapache-db-perl/debian/copyright (original)
+++ trunk/libapache-db-perl/debian/copyright Wed Aug 18 08:54:32 2010
@@ -1,45 +1,34 @@
-This is the debian package for the Apache::DB module.
-It was created by Ivan Kohler <ivan-debian at 420.am> using dh-make-perl
-and is maintained by the Debian Perl Group now.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Frank Wiles <frank at wiles.org>
+Source: http://search.cpan.org/dist/Apache-DB/
+Name: Apache-DB
-***
+Copyright:
+ 1999, Doug MacEachern <dougm at pobox.com>
+ 2004-2008, Frank Wiles <frank at wiles.org>
+License: Artistic or GPL-1+
+X-Comment: Copyright holders as mentioned as authors in DB.pm, years of
+ copyright takes from uploads to CPAN.
-The official Apache::DB is missing a copyright statement. Doug MacEachern
-<dougm at pobox.com> wrote email in response to an inquiry:
+Files: debian/*
+Copyright:
+ 2001-2008, Ivan Kohler <ivan-debian at 420.am>
+ 2008, gregor herrmann <gregoa at debian.org>
+ 2010, Ansgar Burchardt <ansgar at 43-1.org>
+License: Artistic or GPL-1+
-> hi, you can distribute Apache::DB under the same terms as Perl itself. i
-> will add this license in the next version.
+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'.
-The current maintainer Frank Wiles <frank at wiles.org> also writes:
-> You're absolutely right that it was just an oversight. I took this
-> module over from Doug "in a hurry" to get ported for mod_perl 2.0
-> and I don't believe he ever mentioned it to me. It is definitely
-> licensed under the same terms as Perl itself.
-
-The next version is expected to contain a formal copyright statement.
-
-***
-
-DB.pm (0.14) still contains no formal copyright statement but at least
-Authors and License:
-
-AUTHOR
- Originally written by Doug MacEachern
- Currently maintained by Frank Wiles <frank at wiles.org>
-
-LICENSE
- This module is distributed under the same terms as Perl itself.
-
-***
-
-Assumed copyright:
-Copyright 1999 Doug MacEachern <dougm at pobox.com>
-Copyright 2004-2008 Frank Wiles <frank at wiles.org>
-
-***
-
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License. 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 Licence 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 version 1 of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.
Added: trunk/libapache-db-perl/debian/patches/hurd.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/patches/hurd.patch?rev=61711&op=file
==============================================================================
--- trunk/libapache-db-perl/debian/patches/hurd.patch (added)
+++ trunk/libapache-db-perl/debian/patches/hurd.patch Wed Aug 18 08:54:32 2010
@@ -1,0 +1,28 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Wed, 18 Aug 2010 17:43:32 +0900
+Origin: vendor
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=60458
+Subject: Fix FTBFS on GNU/Hurd
+
+Building Apache-DB on GNU/Hurd fails[1]:
+
+ DB.xs: In function 'XS_DB_ApacheSIGINT':
+ DB.xs:60: error: too many arguments to function 'ApacheSIGINT'
+
+In /usr/lib/perl/5.10/CORE/iperlsys.h, Sighandler_t is defined to take three
+arguments only when HAS_SIGACTION and SA_SIGINFO are defined. This patch adds
+these conditions to DB.xs as well.
+
+[1] <https://buildd.debian.org/fetch.cgi?pkg=libapache-db-perl&arch=hurd-i386&ver=0.14-1&stamp=1281706853&file=log&as=raw>
+
+--- libapache-db-perl.orig/DB.xs
++++ libapache-db-perl/DB.xs
+@@ -56,7 +56,7 @@
+ ApacheSIGINT(...)
+
+ CODE:
+-#if ((PERL_REVISION == 5) && (PERL_VERSION >= 10))
++#if ((PERL_REVISION == 5) && (PERL_VERSION >= 10)) && defined(HAS_SIGACTION) && defined(SA_SIGINFO)
+ if (ApacheSIGINT) (*ApacheSIGINT)(SIGINT, NULL, NULL);
+ #else
+ if (ApacheSIGINT) (*ApacheSIGINT)(SIGINT);
Added: trunk/libapache-db-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/patches/series?rev=61711&op=file
==============================================================================
--- trunk/libapache-db-perl/debian/patches/series (added)
+++ trunk/libapache-db-perl/debian/patches/series Wed Aug 18 08:54:32 2010
@@ -1,0 +1,1 @@
+hurd.patch
Modified: trunk/libapache-db-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/rules?rev=61711&op=diff
==============================================================================
--- trunk/libapache-db-perl/debian/rules (original)
+++ trunk/libapache-db-perl/debian/rules Wed Aug 18 08:54:32 2010
@@ -1,74 +1,4 @@
#!/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
-
-# 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=""
- # this module has no tests!
- # $(MAKE) test
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- [ ! -f 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/share/perl5 ] || \
- rmdir --ignore-fail-on-non-empty --parents --verbose \
- $(TMP)/usr/share/perl5
- touch $@
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do here for an architecture-dependent package
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installchangelogs Changes
- dh_shlibdeps
- dh_strip
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@
Added: trunk/libapache-db-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/source/format?rev=61711&op=file
==============================================================================
--- trunk/libapache-db-perl/debian/source/format (added)
+++ trunk/libapache-db-perl/debian/source/format Wed Aug 18 08:54:32 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-perl-cvs-commits
mailing list