[Python-modules-commits] r13395 - in packages/logilab-common/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Friday, June 11, 2010 @ 21:46:26
  Author: morph
Revision: 13395

debian/patches/*

Modified:
  packages/logilab-common/trunk/debian/changelog
Deleted:
  packages/logilab-common/trunk/debian/patches/d347bb3985e4
  packages/logilab-common/trunk/debian/patches/series

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2010-06-11 21:09:59 UTC (rev 13394)
+++ packages/logilab-common/trunk/debian/changelog	2010-06-11 21:46:26 UTC (rev 13395)
@@ -1,10 +1,10 @@
 logilab-common (0.50.3-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * debian/patches/2c61959ae407
+  * debian/patches/*
     - dropped, now merged in upstrem release
 
- -- Sandro Tosi <morph at debian.org>  Fri, 11 Jun 2010 23:09:12 +0200
+ -- Sandro Tosi <morph at debian.org>  Fri, 11 Jun 2010 23:11:05 +0200
 
 logilab-common (0.50.2-1) unstable; urgency=low
 

Deleted: packages/logilab-common/trunk/debian/patches/d347bb3985e4
===================================================================
--- packages/logilab-common/trunk/debian/patches/d347bb3985e4	2010-06-11 21:09:59 UTC (rev 13394)
+++ packages/logilab-common/trunk/debian/patches/d347bb3985e4	2010-06-11 21:46:26 UTC (rev 13395)
@@ -1,28 +0,0 @@
-
-# HG changeset patch
-# User Julien Jehannet <julien.jehannet at logilab.fr>
-# Date 1275035187 -7200
-# Node ID d347bb3985e4964940c2aaa6e91749d92316dbc4
-# Parent  7399b1f8cfa058a5acfbaa42c08adda708496288
-Rename short_desc attribute to description in __pkginfo__ format in man formatter
-
-Is a recent policy update for __pkginfo__ metadata. optik_ext need to be updated.
-
-diff -r 7399b1f8cfa0 -r d347bb3985e4 optik_ext.py
---- a/optik_ext.py	Wed May 26 11:51:39 2010 +0200
-+++ b/optik_ext.py	Fri May 28 10:26:27 2010 +0200
-@@ -317,10 +317,9 @@
-         except AttributeError:
-             # py >= 2.4.X (dunno which X exactly, at least 2)
-             pgm = optparser.get_prog_name()
--        short_desc = self.format_short_description(pgm, pkginfo.short_desc)
--        long_desc = self.format_long_description(pgm, pkginfo.long_desc)
--        return '%s\n%s\n%s\n%s' % (self.format_title(pgm, section), short_desc,
--                                   self.format_synopsis(pgm), long_desc)
-+        short_desc = self.format_short_description(pgm, pkginfo.description)
-+        return '%s\n%s\n%s' % (self.format_title(pgm, section), short_desc,
-+                               self.format_synopsis(pgm))
- 
-     def format_title(self, pgm, section):
-         date = '-'.join([str(num) for num in time.localtime()[:3]])
-

Deleted: packages/logilab-common/trunk/debian/patches/series
===================================================================
--- packages/logilab-common/trunk/debian/patches/series	2010-06-11 21:09:59 UTC (rev 13394)
+++ packages/logilab-common/trunk/debian/patches/series	2010-06-11 21:46:26 UTC (rev 13395)
@@ -1 +0,0 @@
-d347bb3985e4