merge debian version 1.5.0-4

authorJulien Cristau <julien.cristau@logilab.fr>
changesete39ca4994b68
branchstable
phasepublic
hiddenno
parent revision#c27a1eb98cab [lib] do not swallow exception with ``--traceback`` (closes #89337), #c676c046ed56 Added tag hgview-debian-version-1.5.0-4 for changeset 8a812760e40d
child revision#c7f6a953ea26 [qt] fix: re-enable copy action in right click menu of the description (closes #93421)
files modified by this revision
.hgtags
debian/changelog
# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1338309734 -7200
# Tue May 29 18:42:14 2012 +0200
# Branch stable
# Node ID e39ca4994b683c2d2c01432d409243da785effa9
# Parent c27a1eb98cab82f1ca1eca82639cbc1ec52dd16d
# Parent c676c046ed562939c92a75acf7932f26a5e86556
merge debian version 1.5.0-4

diff --git a/.hgtags b/.hgtags
@@ -19,5 +19,6 @@
1  846104aaa0ceea947963bcc0c7d7abd3d2a3eee1 hgview-debian-version-1.4.0-2
2  9246f0e562415e89a9fcbcf8529564b22a63791d hgview-version-1.5.0
3  09ed7f71fac79b05e71611b85ef0da7dbd8327fa hgview-debian-version-1.5.0-1
4  ca12fd67dc852bc72a607348fabb1ac82e9cf4b7 hgview-debian-version-1.5.0-2
5  d67cbb4e5651605a679302653914cfe517fd6b16 hgview-debian-version-1.5.0-3
6 +8a812760e40d225204fb6ea289518908ac6893e3 hgview-debian-version-1.5.0-4
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,12 @@
7 +hgview (1.5.0-4) unstable; urgency=low
8 +
9 +  * Rebuild the source package with the .install files so Ubuntu doesn't get
10 +    empty binary packages (LP: #929741).  Oops.
11 +
12 + -- Julien Cristau <jcristau@debian.org>  Tue, 29 May 2012 18:13:58 +0200
13 +
14  hgview (1.5.0-3) unstable; urgency=low
15 
16    * Remove logilab.org ticket references from debian/changelog
17 
18   -- Julien Cristau <jcristau@debian.org>  Fri, 23 Dec 2011 17:39:27 +0100