r13136 - in /trunk/libhtml-template-pro-perl: debian/changelog perl-HTML-Template-Pro.spec

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Mon Jan 21 12:33:27 UTC 2008


Author: dmn
Date: Mon Jan 21 12:33:27 2008
New Revision: 13136

URL: http://svn.debian.org/wsvn/?sc=1&rev=13136
Log:
* Revert strange change to perl-HTML-Template-Pro.spec

Modified:
    trunk/libhtml-template-pro-perl/debian/changelog
    trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec

Modified: trunk/libhtml-template-pro-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/debian/changelog?rev=13136&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/debian/changelog (original)
+++ trunk/libhtml-template-pro-perl/debian/changelog Mon Jan 21 12:33:27 2008
@@ -9,6 +9,7 @@
   [ Damyan Ivanov ]
   * s/This module/HTML::Template::Pro/ in long description
   * debian/rules: stop setting VENDORARCH variables
+  * Revert strange change to perl-HTML-Template-Pro.spec
 
  -- Jose Luis Rivas <ghostbar38 at gmail.com>  Tue, 08 Jan 2008 22:56:46 -0430
 

Modified: trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec?rev=13136&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec (original)
+++ trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec Mon Jan 21 12:33:27 2008
@@ -6,13 +6,8 @@
 %define module HTML-Template-Pro
 
 Name: perl-%module
-<<<<<<< .working
-Version: 0.67
-Release: alt1
-=======
 Version: 0.68
 Release: alt2
->>>>>>> .merge-right.r12268
 
 Packager: Igor Yu. Vlasenko <viy at altlinux.org>
 
@@ -59,11 +54,6 @@
 %perl_vendor_man3dir/*
 
 %changelog
-<<<<<<< .working
-* Sun Dec 02 2007 Igor Vlasenko <viy at altlinux.ru> 0.67-alt1
-- new version; see Changes
-
-=======
 * Tue Jan 08 2008 Igor Vlasenko <viy at altlinux.ru> 0.68-alt2
 - fix for ix86
 
@@ -73,7 +63,6 @@
 * Sun Dec 02 2007 Igor Vlasenko <viy at altlinux.ru> 0.67-alt1
 - new version; see Changes
 
->>>>>>> .merge-right.r12268
 * Thu Oct 04 2007 Igor Vlasenko <viy at altlinux.ru> 0.66-alt1
 - new version; see Changes
 




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