r8496 - in /trunk/libdbi-perl/debian: ./ patches/

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Tue Oct 23 08:29:07 UTC 2007 

Author: dmn
Date: Tue Oct 23 08:29:07 2007
New Revision: 8496

URL: http://svn.debian.org/wsvn/?sc=1&rev=8496
Log:
* Convert from cdbs to debhelper. Add dependency on quilt
* Refresh patches
* Drop unneeded lintian override
  description-synopsis-starts-with-a-capital-letter
* Drop unneeded "chmod -x DBI/Roadmap,pm"

Added:
    trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.patch
      - copied, changed from r8491, trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.diff
    trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.patch
      - copied, changed from r8491, trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.diff
    trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.patch
      - copied, changed from r8491, trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.diff
    trunk/libdbi-perl/debian/patches/t__85gofer.t__timeout.patch
      - copied unchanged from r8491, trunk/libdbi-perl/debian/patches/t__85gofer.t__timeout.diff
Removed:
    trunk/libdbi-perl/debian/libdbi-perl.docs
    trunk/libdbi-perl/debian/libdbi-perl.lintian-overrides
    trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.diff
    trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.diff
    trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.diff
    trunk/libdbi-perl/debian/patches/t__85gofer.t__timeout.diff
Modified:
    trunk/libdbi-perl/debian/changelog
    trunk/libdbi-perl/debian/control
    trunk/libdbi-perl/debian/rules

Modified: trunk/libdbi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdbi-perl/debian/changelog?rev=8496&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/changelog (original)
+++ trunk/libdbi-perl/debian/changelog Tue Oct 23 08:29:07 2007
@@ -11,8 +11,13 @@
     + update years
     + state upstream URL
     + quote licensing terms
-
- -- Damyan Ivanov <dmn at debian.org>  Tue, 23 Oct 2007 10:55:54 +0300
+  * Convert from cdbs to debhelper. Add dependency on quilt
+  * Refresh patches
+  * Drop unneeded lintian override
+    description-synopsis-starts-with-a-capital-letter
+  * Drop unneeded "chmod -x DBI/Roadmap,pm"
+
+ -- Damyan Ivanov <dmn at debian.org>  Tue, 23 Oct 2007 11:18:59 +0300
 
 libdbi-perl (1.59-1) unstable; urgency=low
 

Modified: trunk/libdbi-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libdbi-perl/debian/control?rev=8496&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/control (original)
+++ trunk/libdbi-perl/debian/control Tue Oct 23 08:29:07 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Christian Hammers <ch at debian.org>,
  Damyan Ivanov <dmn at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, perl-modules
+Build-Depends: debhelper (>= 5), perl-modules, quilt
 Standards-Version: 3.7.2
 Homepage: http://search.cpan.org/dist/DBI/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdbi-perl/

Copied: trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.patch (from r8491, trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.diff)
URL: http://svn.debian.org/wsvn/trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.patch?rev=8496&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.diff (original)
+++ trunk/libdbi-perl/debian/patches/t__06attrs.t__localefix.patch Tue Oct 23 08:29:07 2007
@@ -1,5 +1,7 @@
---- old/t/06attrs.t.orig	2004-10-11 21:47:35.000000000 +0200
-+++ new/t/06attrs.t	2004-10-11 21:48:08.000000000 +0200
+Index: libdbi-perl/t/06attrs.t
+===================================================================
+--- libdbi-perl.orig/t/06attrs.t	2007-09-12 10:30:08.000000000 +0300
++++ libdbi-perl/t/06attrs.t	2007-10-23 11:18:35.000000000 +0300
 @@ -3,6 +3,7 @@
  use strict;
  
@@ -16,5 +18,5 @@
 +# For the error messages in the statement handle tests.
 +setlocale(LC_ALL, "C");
  
- # Connect to the example driver.
- my $dbh = DBI->connect('dbi:ExampleP:dummy', '', '',
+ my $using_autoproxy = ($ENV{DBI_AUTOPROXY});
+ my $dsn = 'dbi:ExampleP:dummy';

Copied: trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.patch (from r8491, trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.diff)
URL: http://svn.debian.org/wsvn/trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.patch?rev=8496&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.diff (original)
+++ trunk/libdbi-perl/debian/patches/t__40profile.t__NTP.patch Tue Oct 23 08:29:07 2007
@@ -1,9 +1,11 @@
 #
 # A NTP clock adjustment of -0.00967s lead to FTBFS.
 #
---- old/t/40profile.t.orig	2006-11-21 18:29:43.000000000 +0100
-+++ new/t/40profile.t	2006-11-21 18:29:50.000000000 +0100
-@@ -160,7 +160,7 @@
+Index: libdbi-perl/t/40profile.t
+===================================================================
+--- libdbi-perl.orig/t/40profile.t	2007-09-12 10:30:08.000000000 +0300
++++ libdbi-perl/t/40profile.t	2007-10-23 11:18:41.000000000 +0300
+@@ -162,7 +162,7 @@
  this kind of clock behaviour. Please retry.
  EOT
      # don't treat small negative values as failure

Copied: trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.patch (from r8491, trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.diff)
URL: http://svn.debian.org/wsvn/trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.patch?rev=8496&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.diff (original)
+++ trunk/libdbi-perl/debian/patches/t__80proxy.t___syslogd.patch Tue Oct 23 08:29:07 2007
@@ -1,6 +1,8 @@
---- old/t/80proxy.t.orig	2004-08-02 01:10:44.000000000 +0200
-+++ new/t/80proxy.t	2004-08-02 01:11:54.000000000 +0200
-@@ -9,6 +9,10 @@
+Index: libdbi-perl/t/80proxy.t
+===================================================================
+--- libdbi-perl.orig/t/80proxy.t	2007-10-23 10:45:09.000000000 +0300
++++ libdbi-perl/t/80proxy.t	2007-10-23 11:18:46.000000000 +0300
+@@ -10,6 +10,10 @@
  require VMS::Filespec if $^O eq 'VMS';
  require Cwd;
  

Modified: trunk/libdbi-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libdbi-perl/debian/rules?rev=8496&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/rules (original)
+++ trunk/libdbi-perl/debian/rules Tue Oct 23 08:29:07 2007
@@ -1,14 +1,93 @@
 #!/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.
 
-DH_VERBOSE=1
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-# Put perlmodule.mk last to dh_clean temporary files not in MANIFEST
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/perlmodule.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# 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
 
-DEB_INSTALL_EXAMPLES_libdbi-perl := test.pl
+PACKAGE=$(shell dh_listpackages)
 
-install/libdbi-perl ::
-	chmod -x debian/libdbi-perl/usr/lib/perl5/Roadmap.pod
-	install -m 0644 -D debian/libdbi-perl.lintian-overrides debian/libdbi-perl/usr/share/lintian/overrides/libdbi-perl
+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
+
+include /usr/share/quilt/quilt.make
+
+build: patch build-stamp
+build-stamp:
+	dh_testdir
+
+	# Add commands to compile the package here
+	$(PERL) Makefile.PL INSTALLDIRS=vendor \
+		INSTALLVENDORARCH=/usr/lib/perl5/ \
+		VENDORARCHEXP=/usr/lib/perl5/
+	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
+	$(MAKE) test
+
+	touch $@
+
+
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+
+	dh_clean build-stamp install-stamp
+
+	[ ! -f Makefile ] || $(MAKE) realclean
+
+install: build install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+
+	touch $@
+
+#install/libdbi-perl ::
+#	chmod -x debian/libdbi-perl/usr/lib/perl5/Roadmap.pod
+
+
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installexamples test.pl
+	dh_installdocs
+	dh_installchangelogs Changes
+	dh_shlibdeps
+	dh_strip
+	dh_perl
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	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

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