r35985 - in /trunk/libconfig-inihash-perl/debian: README.source changelog compat control patches/drop-test-44.patch patches/fix-tests patches/series rules
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Wed May 20 08:58:05 UTC 2009
Author: ryan52-guest
Date: Wed May 20 08:57:59 2009
New Revision: 35985
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35985
Log:
* debhelper 7
* use dos2unix on the test.ini
* fix README.source
* fix tests
* Add myself to Uploaders
Added:
trunk/libconfig-inihash-perl/debian/patches/fix-tests
Removed:
trunk/libconfig-inihash-perl/debian/patches/drop-test-44.patch
Modified:
trunk/libconfig-inihash-perl/debian/README.source
trunk/libconfig-inihash-perl/debian/changelog
trunk/libconfig-inihash-perl/debian/compat
trunk/libconfig-inihash-perl/debian/control
trunk/libconfig-inihash-perl/debian/patches/series
trunk/libconfig-inihash-perl/debian/rules
Modified: trunk/libconfig-inihash-perl/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/README.source?rev=35985&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/README.source (original)
+++ trunk/libconfig-inihash-perl/debian/README.source Wed May 20 08:57:59 2009
@@ -1,57 +1,5 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
+This package uses quilt for managing all modifications to the upstream
+source. Changes are stored in the source package as diffs in
debian/patches and applied during the build.
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
+See /usr/share/doc/quilt/README.source for a detailed explaination.
Modified: trunk/libconfig-inihash-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/changelog?rev=35985&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/changelog (original)
+++ trunk/libconfig-inihash-perl/debian/changelog Wed May 20 08:57:59 2009
@@ -1,6 +1,5 @@
libconfig-inihash-perl (3.00.05-1) UNRELEASED; urgency=low
- *** ON HOLD: bug #516350 prevents the package from being built
[ Antonio Radici ]
* New upstream release
* debian/control:
@@ -10,8 +9,6 @@
+ added quilt to Build-Depends
+ Standars-Version upgrade to 3.8.0
* README.source: added for quilt
- * debian/patches/drop-test-44.patch:
- + remove a test which fails
* debian/copyright:
+ switched to the new copyright format
@@ -20,7 +17,14 @@
(source stanza).
* debian/control: Added: ${misc:Depends} to Depends: field.
- -- Antonio Radici <antonio at dyne.org> Thu, 19 Feb 2009 23:39:15 +0000
+ [ Ryan Niebur ]
+ * debhelper 7
+ * use dos2unix on the test.ini
+ * fix README.source
+ * fix tests
+ * Add myself to Uploaders
+
+ -- Ryan Niebur <ryanryan52 at gmail.com> Wed, 20 May 2009 01:54:24 -0700
libconfig-inihash-perl (3.00.00-1) unstable; urgency=low
Modified: trunk/libconfig-inihash-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/compat?rev=35985&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/compat (original)
+++ trunk/libconfig-inihash-perl/debian/compat Wed May 20 08:57:59 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/libconfig-inihash-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/control?rev=35985&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/control (original)
+++ trunk/libconfig-inihash-perl/debian/control Wed May 20 08:57:59 2009
@@ -1,10 +1,12 @@
Source: libconfig-inihash-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5.0.0), quilt
-Build-Depends-Indep: perl (>= 5.8.8-8), libio-stringy-perl, libhash-case-perl, libhash-withdefaults-perl
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
+Build-Depends-Indep: libhash-case-perl, libhash-withdefaults-perl,
+ libio-stringy-perl, perl (>= 5.8.8-8), tofrodos
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Damyan Ivanov <dmn at debian.org>, Antonio Radici <antonio at dyne.org>
+Uploaders: Damyan Ivanov <dmn at debian.org>, Antonio Radici <antonio at dyne.org>,
+ Ryan Niebur <ryanryan52 at gmail.com>
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libconfig-inihash-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libconfig-inihash-perl/
@@ -12,7 +14,8 @@
Package: libconfig-inihash-perl
Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libio-stringy-perl, libhash-case-perl, libhash-withdefaults-perl
+Depends: ${misc:Depends}, ${perl:Depends}, libhash-case-perl,
+ libhash-withdefaults-perl (>= 0.04), libio-stringy-perl
Description: Perl extension for reading and writing INI files
This module reads and writes INI files, useful for storing
settings.
Added: trunk/libconfig-inihash-perl/debian/patches/fix-tests
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/patches/fix-tests?rev=35985&op=file
==============================================================================
--- trunk/libconfig-inihash-perl/debian/patches/fix-tests (added)
+++ trunk/libconfig-inihash-perl/debian/patches/fix-tests Wed May 20 08:57:59 2009
@@ -1,0 +1,20 @@
+--- a/test.pl
++++ b/test.pl
+@@ -61,7 +61,7 @@
+ my $read_data = ReadINI( $filename);
+ ok( (defined($read_data) and ref($read_data)), "ReadINI '$filename' (different data)");
+
+- is( $read_data->{Two}{temp}, $ENV{temp}, "System variables are interpolated by default");
++ is( $read_data->{Two}{temp}, $ENV{TEMP}, "System variables are interpolated by default");
+ }
+
+ {
+@@ -75,7 +75,7 @@
+ my $read_data = ReadINI( $filename, {systemvars => 1});
+ ok( (defined($read_data) and ref($read_data)), "ReadINI '$filename', {systemvars => 1}");
+
+- is( $read_data->{Two}{temp}, $ENV{temp}, "System variables are interpolated if asked to");
++ is( $read_data->{Two}{temp}, $ENV{TEMP}, "System variables are interpolated if asked to");
+ }
+
+ {
Modified: trunk/libconfig-inihash-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/patches/series?rev=35985&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/patches/series (original)
+++ trunk/libconfig-inihash-perl/debian/patches/series Wed May 20 08:57:59 2009
@@ -1,1 +1,1 @@
-#drop-test-44.patch
+fix-tests
Modified: trunk/libconfig-inihash-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-inihash-perl/debian/rules?rev=35985&op=diff
==============================================================================
--- trunk/libconfig-inihash-perl/debian/rules (original)
+++ trunk/libconfig-inihash-perl/debian/rules Wed May 20 08:57:59 2009
@@ -1,71 +1,16 @@
#!/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
+include /usr/share/quilt/quilt.make
-# 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
+%:
+ dh --with quilt $@
-PACKAGE=$(shell dh_listpackages)
+override_dh_auto_configure: $(QUILT_STAMPFN)
+ dh_auto_configure
+ [ -f test.ini.original ] || cp -a test.ini test.ini.original
+ dos2unix test.ini
-ifndef PERL
-PERL = /usr/bin/perl
-endif
+override_dh_auto_clean: unpatch
+ dh_auto_clean
+ [ ! -f test.ini.original ] || mv test.ini.original test.ini
-TMP =$(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- $(PERL) Makefile.PL INSTALLDIRS=vendor \
- INSTALLVENDORARCH=/usr/share/perl5/ \
- VENDORARCHEXP=/usr/share/perl5/
- $(MAKE)
- $(MAKE) test
-
- touch $@
-
-clean:
- 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 $@
-
-binary-arch:
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installexamples
- dh_installdocs README
- dh_installchangelogs Changes
- 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