[libchart-perl] 01/01: Create samples directory via patch, not Makefile.PL

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository libchart-perl.

commit 64107e4afd53269076368861afca2abd23aa5d66
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Sep 22 15:22:26 2014 +0200

    Create samples directory via patch, not Makefile.PL
    
    Needed to run test suite via autopkgtest.
    
    Only remove samples contents (without dot files) in clean target. Use
    debian/clean for that instead of override_dh_clean.
---
 debian/changelog                                   |  8 ++++++++
 debian/clean                                       |  1 +
 ...te-samples-directory-before-package-build.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 ----
 debian/tests/pkg-perl/test-files                   |  2 ++
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbef5e7..12c3b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libchart-perl (2.4.6-3) UNRELEASED; urgency=medium
+
+  * Create samples directory via patch, not Makefile.PL
+    + Needed to run test suite via autopkgtest.
+    + Only remove samples contents (without dot files) in clean target
+
+ -- Axel Beckert <abe at debian.org>  Mon, 22 Sep 2014 15:20:38 +0200
+
 libchart-perl (2.4.6-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/clean b/debian/clean
index f3c7a7c..ae018b4 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 Makefile
+samples/*
diff --git a/debian/patches/create-samples-directory-before-package-build.patch b/debian/patches/create-samples-directory-before-package-build.patch
new file mode 100644
index 0000000..b39aaa0
--- /dev/null
+++ b/debian/patches/create-samples-directory-before-package-build.patch
@@ -0,0 +1,23 @@
+Description: Create samples directory via patch so it's available for autopkgtest
+Author: Axel Beckert
+Forwarded: not-needed
+
+Index: libchart-perl/Makefile.PL
+===================================================================
+--- libchart-perl.orig/Makefile.PL	2014-09-22 15:20:13.000000000 +0200
++++ libchart-perl/Makefile.PL	2014-09-22 15:20:13.000000000 +0200
+@@ -1,8 +1,5 @@
+ use ExtUtils::MakeMaker;
+ 
+-#  make the samples directory
+-mkdir ('samples', 00755);
+-
+ #  write the makefile
+ WriteMakefile ( 'NAME' => 'Chart',
+ 		'PREREQ_PM' => { 'GD' => 2.0 },
+Index: libchart-perl/samples/.non-empty-directory
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libchart-perl/samples/.non-empty-directory	2014-09-22 15:20:51.000000000 +0200
+@@ -0,0 +1 @@
++needed to create the samples directory via patch for making autopkgtest to work properly
diff --git a/debian/patches/series b/debian/patches/series
index 222b793..11a4b7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 pod.patch
 debian-bug-709533.patch
 fix-defined- at array-is-deprecated-warning.patch
+create-samples-directory-before-package-build.patch
diff --git a/debian/rules b/debian/rules
index a5e8a71..ee4c912 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,3 @@ override_dh_installchangelogs:
 
 override_dh_installdocs:
 	dh_installdocs -X.map -X.md5
-
-override_dh_clean:
-	dh_clean
-	$(RM) -r $(CURDIR)/samples
diff --git a/debian/tests/pkg-perl/test-files b/debian/tests/pkg-perl/test-files
new file mode 100644
index 0000000..097c168
--- /dev/null
+++ b/debian/tests/pkg-perl/test-files
@@ -0,0 +1,2 @@
+t
+samples

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libchart-perl.git