r69175 - in /trunk/libpackage-stash-perl/debian: changelog control copyright patches/ patches/rm-package-stash-conflicts.patch patches/series rules

Sun Feb 20 23:58:46 UTC 2011

Author: jawnsy-guest
Date: Sun Feb 20 23:58:27 2011
New Revision: 69175

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=69175
Log:
* Add a patch to avoid testing Package::Stash::Conflicts and package-
  stash-conflicts (these are not needed, since Debian has a package
  management system)
* Do not install Package::Stash::Conflicts or package-stash-conflicts
* Rewrite control description
* Add myself to Uploaders and Copyright

Added:
    trunk/libpackage-stash-perl/debian/patches/
    trunk/libpackage-stash-perl/debian/patches/rm-package-stash-conflicts.patch
    trunk/libpackage-stash-perl/debian/patches/series
Modified:
    trunk/libpackage-stash-perl/debian/changelog
    trunk/libpackage-stash-perl/debian/control
    trunk/libpackage-stash-perl/debian/copyright
    trunk/libpackage-stash-perl/debian/rules

Modified: trunk/libpackage-stash-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpackage-stash-perl/debian/changelog?rev=69175&op=diff
==============================================================================

--- trunk/libpackage-stash-perl/debian/changelog (original)
+++ trunk/libpackage-stash-perl/debian/changelog Sun Feb 20 23:58:27 2011
@@ -1,12 +1,4 @@
 libpackage-stash-perl (0.25-1) UNRELEASED; urgency=low
-
-  WAITS-FOR: libpackage-stash-xs-perl 0.21
-
-  WAITS-FOR: libdist-checkconflicts-perl 0.02
-    or remove Package::Stash::Conflicts (at least from compile test)
-
-  TODO: bin/package-stash-conflicts not really useful with a package manger.
-  Maybe not install it?
 
   [ Ansgar Burchardt ]
   * New upstream release.
@@ -16,7 +8,15 @@
   * Add build-dep on libtest-leaktrace-perl, libtest-requires-perl.
   * Add (build-)dep on libpackage-deprecationmanager-perl.
 
- -- Jonathan Yu <jawnsy at cpan.org>  Sun, 13 Feb 2011 21:21:50 -0500
+  [ Jonathan Yu ]
+  * Add a patch to avoid testing Package::Stash::Conflicts and package-
+    stash-conflicts (these are not needed, since Debian has a package
+    management system)
+  * Do not install Package::Stash::Conflicts or package-stash-conflicts
+  * Rewrite control description
+  * Add myself to Uploaders and Copyright
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Sun, 20 Feb 2011 19:21:18 -0500
 
 libpackage-stash-perl (0.13-1) unstable; urgency=low
 

Modified: trunk/libpackage-stash-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpackage-stash-perl/debian/control?rev=69175&op=diff
==============================================================================
--- trunk/libpackage-stash-perl/debian/control (original)
+++ trunk/libpackage-stash-perl/debian/control Sun Feb 20 23:58:27 2011
@@ -1,13 +1,16 @@
 Source: libpackage-stash-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl, libpackage-deprecationmanager-perl,
- libtest-fatal-perl, libtest-leaktrace-perl, libtest-requires-perl,
+Build-Depends: debhelper (>= 7.0.50)
+Build-Depends-Indep: perl,
+ libpackage-deprecationmanager-perl,
+ libtest-fatal-perl,
+ libtest-leaktrace-perl,
+ libtest-requires-perl,
  perl (>= 5.10.1) | libtest-simple-perl (>= 0.88)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at debian.org>,
- gregor herrmann <gregoa at debian.org>
+ gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>
 Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/Package-Stash/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libpackage-stash-perl/
@@ -20,7 +23,7 @@
 Breaks: libclass-mop-perl (<< 1.09~),
  libmoosex-roles-withoverloading-perl (<< 0.09~),
  libnamespace-clean-perl (<< 0.19~)
-Description: Perl module providing routines for manipulating stashes
- Manipulating stashes (Perl's symbol tables) is occasionally necessary, but
- incredibly messy, and easy to get wrong. Package::Stash hides all of that
- behind a simple API.
+Description: module providing routines for manipulating stashes
+ Package::Stash is a Perl module that provides an interface for manipulating
+ stashes (Perl's symbol tables). These operations are occasionally necessary,
+ but often very messy and easy to get wrong.

Modified: trunk/libpackage-stash-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpackage-stash-perl/debian/copyright?rev=69175&op=diff
==============================================================================
--- trunk/libpackage-stash-perl/debian/copyright (original)
+++ trunk/libpackage-stash-perl/debian/copyright Sun Feb 20 23:58:27 2011
@@ -1,14 +1,15 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: Jesse Luehrs <doy at tozt dot net>
+Maintainer: Jesse Luehrs <doy at tozt.net>
 Source: http://search.cpan.org/dist/Package-Stash/
 Name: Package-Stash
 
-Copyright: 2010, Jesse Luehrs <doy at tozt dot net>
+Copyright: 2010, Jesse Luehrs <doy at tozt.net>
 License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: 2010, Ansgar Burchardt <ansgar at debian.org>
  2010, gregor herrmann <gregoa at debian.org>
+ 2011, Jonathan Yu <jawnsy at cpan.org>
 License: Artistic or GPL-1+
 
 License: Artistic

Added: trunk/libpackage-stash-perl/debian/patches/rm-package-stash-conflicts.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpackage-stash-perl/debian/patches/rm-package-stash-conflicts.patch?rev=69175&op=file
==============================================================================
--- trunk/libpackage-stash-perl/debian/patches/rm-package-stash-conflicts.patch (added)
+++ trunk/libpackage-stash-perl/debian/patches/rm-package-stash-conflicts.patch Sun Feb 20 23:58:27 2011
@@ -1,0 +1,19 @@
+Description: remove requirement for Package::Stash::Conflicts
+ This patch removes the requirements for Package::Stash::Conflicts
+ and friends, since these are handled by the package management
+ system.
+Author: Jonathan Yu <jawnsy at cpan.org>
+Origin: vendor
+Forwarded: not-needed
+--- a/t/00-compile.t
++++ b/t/00-compile.t
+@@ -23,6 +23,9 @@
+ 
+ my @scripts = glob "bin/*";
+ 
++ at modules = grep { !/^Package::Stash::Conflicts$/ } @modules;
++ at scripts = grep { !/^bin\/package-stash-conflicts$/ } @scripts;
++
+ my $plan = scalar(@modules) + scalar(@scripts);
+ $plan ? (plan tests => $plan) : (plan skip_all => "no tests to run");
+ 

Added: trunk/libpackage-stash-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpackage-stash-perl/debian/patches/series?rev=69175&op=file
==============================================================================
--- trunk/libpackage-stash-perl/debian/patches/series (added)
+++ trunk/libpackage-stash-perl/debian/patches/series Sun Feb 20 23:58:27 2011
@@ -1,0 +1,1 @@
+rm-package-stash-conflicts.patch

Modified: trunk/libpackage-stash-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpackage-stash-perl/debian/rules?rev=69175&op=diff
==============================================================================
--- trunk/libpackage-stash-perl/debian/rules (original)
+++ trunk/libpackage-stash-perl/debian/rules Sun Feb 20 23:58:27 2011
@@ -1,4 +1,14 @@
 #!/usr/bin/make -f
+
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 %:
 	dh $@
+
+override_dh_auto_install:
+	dh_auto_install
+	rm $(TMP)/usr/bin/package-stash-conflicts
+	rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/bin
+	rm $(TMP)/usr/share/perl5/Package/Stash/Conflicts.pm
+	rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5/Package/Stash


