r29770 - in /trunk/libdbd-odbc-perl/debian: changelog compat control copyright libdbd-odbc-perl.docs libdbd-odbc-perl.examples rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sat Jan 17 21:44:33 UTC 2009


Author: gregoa
Date: Sat Jan 17 21:44:30 2009
New Revision: 29770

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=29770
Log:
* debian/copyright: switch to new format.
* Set debhelper compatibility level to 7; adapt
  debian/{control,compat,rules}.

Added:
    trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.docs
    trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.examples
Modified:
    trunk/libdbd-odbc-perl/debian/changelog
    trunk/libdbd-odbc-perl/debian/compat
    trunk/libdbd-odbc-perl/debian/control
    trunk/libdbd-odbc-perl/debian/copyright
    trunk/libdbd-odbc-perl/debian/rules

Modified: trunk/libdbd-odbc-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-odbc-perl/debian/changelog?rev=29770&op=diff
==============================================================================
--- trunk/libdbd-odbc-perl/debian/changelog (original)
+++ trunk/libdbd-odbc-perl/debian/changelog Sat Jan 17 21:44:30 2009
@@ -5,6 +5,9 @@
   * debian/control: Added: ${misc:Depends} to Depends: field.
 
   * New upstream release.
+  * debian/copyright: switch to new format.
+  * Set debhelper compatibility level to 7; adapt
+    debian/{control,compat,rules}.
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:41:42 +0100
 

Modified: trunk/libdbd-odbc-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-odbc-perl/debian/compat?rev=29770&op=diff
==============================================================================
--- trunk/libdbd-odbc-perl/debian/compat (original)
+++ trunk/libdbd-odbc-perl/debian/compat Sat Jan 17 21:44:30 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libdbd-odbc-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-odbc-perl/debian/control?rev=29770&op=diff
==============================================================================
--- trunk/libdbd-odbc-perl/debian/control (original)
+++ trunk/libdbd-odbc-perl/debian/control Sat Jan 17 21:44:30 2009
@@ -4,7 +4,7 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Carlo Segre <segre at debian.org>, gregor herrmann <gregoa at debian.org>,
  Gunnar Wolf <gwolf at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libdbi-perl (>= 1.21), unixodbc-dev, 
+Build-Depends: debhelper (>= 7), libdbi-perl (>= 1.21), unixodbc-dev, 
  perl (>= 5.8.0)
 Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/DBD-ODBC/

Modified: trunk/libdbd-odbc-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-odbc-perl/debian/copyright?rev=29770&op=diff
==============================================================================
--- trunk/libdbd-odbc-perl/debian/copyright (original)
+++ trunk/libdbd-odbc-perl/debian/copyright Sat Jan 17 21:44:30 2009
@@ -1,23 +1,34 @@
-This is the Debian GNU/Linux libdbd-obdc-perl version of the DBD-ODBC package
-by Tim Bunce and Jeff Urlwin (with part by Thomas K. Wenrich).
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Tim Bunce, Jeff Urlwin, Martin J. Evans <mjevans at cpan.org>
+Upstream-Source: http://search.cpan.org/dist/DBD-ODBC/
+Upstream-Name: DBD-ODBC
 
-   Copyright (c) 1994,1995,1996,1997,1998  Tim Bunce
-   portions Copyright (c) 1997,1998,1999,2000,2001,2002 Jeff Urlwin
-   portions Copyright (c) 1997  Thomas K. Wenrich
-   portions Copyright (c) 2007,2008 Martin J. Evans
+Files: *
+Copyright:
+ Copyright (c) 1994,1995,1996,1997,1998  Tim Bunce
+ portions Copyright (c) 1997,1998,1999,2000,2001,2002 Jeff Urlwin
+ portions Copyright (c) 1997  Thomas K. Wenrich
+ portions Copyright (c) 2007,2008 Martin J. Evans
+License-Alias: Perl
+License: Artistic | GPL-1+
 
-This package was put together by Dirk Eddelbuettel <edd at debian.org>
-from sources obtained from 
-	http://www.cpan.org/authors/id/J/JU/JURL
-It is also available from every other CPAN mirror:
-http://search.cpan.org/dist/DBD-ODBC/
+Files: debian/*
+Copyright: 
+ 2000-2004, Dirk Eddelbuettel <edd at debian.org>
+ 2004-2009, various members of the Debian Perl Group, cf. debian/changelog
+License: Artistic | GPL-1+
 
-The only change for the Debian package was the addition of the debian/
-files. The package was renamed to match the Debian Policy which aims
-at consistent names for Perl Module packages.
+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'
 
-DBD-ODBC 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 these licenses can be found
-in /usr/share/common-licenses/GPL and /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'

Added: trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.docs?rev=29770&op=file
==============================================================================
--- trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.docs (added)
+++ trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.docs Sat Jan 17 21:44:30 2009
@@ -1,0 +1,2 @@
+README.adabas
+README

Added: trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.examples?rev=29770&op=file
==============================================================================
--- trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.examples (added)
+++ trunk/libdbd-odbc-perl/debian/libdbd-odbc-perl.examples Sat Jan 17 21:44:30 2009
@@ -1,0 +1,1 @@
+examples/*

Modified: trunk/libdbd-odbc-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-odbc-perl/debian/rules?rev=29770&op=diff
==============================================================================
--- trunk/libdbd-odbc-perl/debian/rules (original)
+++ trunk/libdbd-odbc-perl/debian/rules Sat Jan 17 21:44:30 2009
@@ -1,37 +1,11 @@
-#! /usr/bin/make -f
-#                                                       -*- makefile -*-
-# debian/rules file for the Debian Linux libdbd-odbc-perl package
-# Copyright (C) 2000 - 2003 by Dirk Eddelbuettel <edd at debian.org>
+#!/usr/bin/make -f
 
-# 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)
 
 # for test target, see below
 DBUSER  := $(shell whoami)
 DBNAME  := dbd_odbc_test_db
-
-# 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
-	#DBI_USER=$(DBUSER) 		
-	#DBI_DSN=dbi:ODBC:$(DBNAME) 	
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
-	touch $@
 
 # here is a test target -- it works for me under postgres
 # keeping it in a separate make target, and not actually invoking it
@@ -50,42 +24,28 @@
 	-dropdb $(DBNAME)
 	touch $@
 
+
+build: build-stamp
+build-stamp:
+	dh build --before dh_auto_test
+	dh build --after dh_auto_test
+	touch $@
+
 clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp test-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) realclean
-	dh_clean
+	dh $@
 
 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
+	dh install --until dh_installexamples
+	chmod -x $(CURDIR)/debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/examples/*
+	dh install --remaining
 	touch $@
 
-binary-indep: build install
+binary-arch: install
+	dh $@
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples examples/*
-	chmod -x $(CURDIR)/debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/examples/*
-	dh_installdocs README README.adabas
-	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