[SCM] Debian packaging of libcatalyst-perl branch, master, updated. debian/5.90013-1-7-g51232b2

intrigeri intrigeri at boum.org
Tue Jun 26 04:04:20 UTC 2012


The following commit has been merged in the master branch:
commit d4515d6064264b86c7c747863f9ca358087f71ff
Merge: f17e10be56850a0e1998caa9df43a0f49a72a840 3d3ced5aff83cf9834ede2b4be3297d26c51ef14
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Jun 26 05:44:30 2012 +0200

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b903124,95718f2..591d7aa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,19 @@@
 -libcatalyst-perl (5.90013-1) UNRELEASED; urgency=low
++libcatalyst-perl (5.90013-2) UNRELEASED; urgency=low
+ 
+   * New upstream release:
+     - Merge Catalyst::Controller::ActionRole into Catalyst::Controller.
+   * Add Conflicts/Replaces/Provides on libcatalyst-controller-actionrole-
+     perl to get rid of the package.
+ 
+  -- gregor herrmann <gregoa at debian.org>  Mon, 25 Jun 2012 19:33:51 +0200
+ 
 +libcatalyst-perl (5.90013-1) unstable; urgency=low
 +
 +  * Team upload.
 +  * Imported Upstream version 5.90013
 +
 + -- intrigeri <intrigeri at debian.org>  Sat, 23 Jun 2012 21:32:20 +0200
 +
  libcatalyst-perl (5.90012-1) unstable; urgency=low
  
    * Imported Upstream version 5.90012.

-- 
Debian packaging of libcatalyst-perl



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