Control: tags -1 pending
Control: tags 915858 pending
Control: tags 909583 pending
Hi,
On 20/11/2018 15:01, Julien Cristau wrote:
> Package: tortoisehg
> Version: 4.7-0.1
> Severity: serious
>
> Hi,
>
> I just uploaded mercurial 4.8 to sid, tortoisehg will be uninstallable.
I have just uploaded the attached NMU to DELAYED/2 which upgrades
tortoisehg to 4.8.1 which will fix this (and the other two bugs above).
Please tell me if you want me to cancel it.
I've pushed my changes to salsa (and dgit repos), and I attach the full
debdiff and a shorter version containing just the changes to the debian/
directory.
Thanks,
James
diff -Nru tortoisehg-4.7/PKG-INFO tortoisehg-4.8.1/PKG-INFO
--- tortoisehg-4.7/PKG-INFO 2018-08-20 04:03:06.0 +0100
+++ tortoisehg-4.8.1/PKG-INFO 2018-12-10 15:10:00.0 +
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: tortoisehg
-Version: 4.7
+Version: 4.8.1
Summary: TortoiseHg dialogs for Mercurial VCS
Home-page: https://tortoisehg.bitbucket.io
Author: Steve Borho
diff -Nru tortoisehg-4.7/debian/changelog tortoisehg-4.8.1/debian/changelog
--- tortoisehg-4.7/debian/changelog 2018-09-01 16:37:37.0 +0100
+++ tortoisehg-4.8.1/debian/changelog 2018-12-22 11:21:56.0 +
@@ -1,3 +1,21 @@
+tortoisehg (4.8.1-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ James Cowgill ]
+ * New upstream version. (Closes: #909583)
+ * d/control:
+- Update mercurial dependency to allow 4.7 and 4.8. (Closes: #914200)
+
+ [ Ondřej Nový ]
+ * d/control: Remove ancient X-Python-Version field.
+ * d/copyright: Use https protocol in Format field.
+
+ [ Stéphane Blondon ]
+ * d/thg.1.xml: Uudate link to upstream BTS in the manpage. (Closes: #915858)
+
+ -- James Cowgill Sat, 22 Dec 2018 11:21:56 +
+
tortoisehg (4.7-0.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru tortoisehg-4.7/debian/control tortoisehg-4.8.1/debian/control
--- tortoisehg-4.7/debian/control 2018-09-01 16:36:09.0 +0100
+++ tortoisehg-4.8.1/debian/control 2018-12-22 11:21:56.0 +
@@ -14,11 +14,10 @@
Homepage: https://tortoisehg.bitbucket.io
Vcs-Git: https://salsa.debian.org/debian/tortoisehg.git
Vcs-Browser: https://salsa.debian.org/debian/tortoisehg
-X-Python-Version: >= 2.4
Package: tortoisehg
Architecture: all
-Depends: mercurial (>= 4.7~), mercurial (<< 4.8~), python-pyqt5,
+Depends: mercurial (>= 4.7~), mercurial (<< 4.9~), python-pyqt5,
python-pyqt5.qsci, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Recommends: libjs-jquery, libjs-underscore, python-iniparse, python-pygments
Suggests: tortoisehg-nautilus
diff -Nru tortoisehg-4.7/debian/copyright tortoisehg-4.8.1/debian/copyright
--- tortoisehg-4.7/debian/copyright 2018-08-30 09:14:34.0 +0100
+++ tortoisehg-4.8.1/debian/copyright 2018-12-22 11:21:56.0 +
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: TortoiseHg
Upstream-Contact: Maintainer: Steve Borho , TK Soh
Source: https://tortoisehg.bitbucket.io/download/source.html
diff -Nru tortoisehg-4.7/debian/thg.1.xml tortoisehg-4.8.1/debian/thg.1.xml
--- tortoisehg-4.7/debian/thg.1.xml 2018-08-30 09:14:34.0 +0100
+++ tortoisehg-4.8.1/debian/thg.1.xml 2018-12-22 11:21:56.0 +
@@ -453,7 +453,7 @@
BUGS
The upstreams BTS can be found
- at http://bitbucket.org/tortoisehg/stable/issues/"/>.
+ at https://bitbucket.org/tortoisehg/thg/issues"/>.
SEE ALSO
diff -Nru tortoisehg-4.7/doc/source/conf.py tortoisehg-4.8.1/doc/source/conf.py
--- tortoisehg-4.7/doc/source/conf.py 2018-02-02 17:35:52.0 +
+++ tortoisehg-4.8.1/doc/source/conf.py 2018-12-10 15:09:54.0 +
@@ -49,9 +49,9 @@
# built documents.
#
# The short X.Y version.
-version = '3.8'
+version = '4.7'
# The full version, including alpha/beta/rc tags.
-release = '3.8.0'
+release = '4.7.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -Nru tortoisehg-4.7/doc/source/preface.txt
tortoisehg-4.8.1/doc/source/preface.txt
--- tortoisehg-4.7/doc/source/preface.txt 2017-03-29 01:25:22.0
+0100
+++ tortoisehg-4.8.1/doc/source/preface.txt 2018-12-10 15:09:54.0
+
@@ -52,11 +52,9 @@
Community
=
-Mailing Lists:
+Mailing List::
-* `Users `_ -
Announcements, user Q, and feature discussions.
-* `Developers `_ - Patches, bug reports, development
discussions.
-* `Issues `_ -
Notifications from the issue tracker.
+ `Developers `_ - Patches, bug reports,
development discussions.
And our `wiki `_ on Bitbucket.
diff
