Package: tortoisehg
Version: 2.4-2
Severity: normal
Please upload 2.5.1 version into experimental to match the latest
Mercurial. After uscan/uupdate the following patch needs to be applied.
It bumps some dependencies and drops an old patch already applied
upstream. Also, it adds dh_clean call absent for some reason from the rules
file.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.5-trunk-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages tortoisehg depends on:
ii mercurial 2.3.1-1
ii python 2.7.2-9
ii python-gobject 3.0.3-3
ii python-qscintilla2 2.6.2-3
ii python-qt4 4.9.5-1
ii python2.6 2.6.7-4
ii python2.7 2.7.2-9
Versions of packages tortoisehg recommends:
ii libjs-jquery 1.7-1
ii libjs-underscore 1.3.3-1
ii python-iniparse 0.4-2.1
ii python-pygments 1.5+dfsg-1
Versions of packages tortoisehg suggests:
pn tortoisehg-nautilus <none>
diff -Nru tortoisehg-2.4/debian/changelog tortoisehg-2.5.1/debian/changelog
--- tortoisehg-2.4/debian/changelog 2012-09-16 22:48:11.000000000 +0200
+++ tortoisehg-2.5.1/debian/changelog 2012-10-05 11:45:18.000000000 +0200
@@ -1,3 +1,9 @@
+tortoisehg (2.5.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Maintainer <email@here> Fri, 05 Oct 2012 11:45:18 +0200
+
tortoisehg (2.4-2) unstable; urgency=medium
* Add fix-config-path.patch to fix crash on new installations of
diff -Nru tortoisehg-2.4/debian/control tortoisehg-2.5.1/debian/control
--- tortoisehg-2.4/debian/control 2012-05-29 10:16:16.000000000 +0200
+++ tortoisehg-2.5.1/debian/control 2012-10-05 12:39:20.000000000 +0200
@@ -14,7 +14,7 @@
Package: tortoisehg
Architecture: all
-Depends: mercurial (>= 2.1~), mercurial (<< 2.3~), python-gobject (>= 2.12.1),
- python-qt4 (>= 4.7), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends},
+Depends: mercurial (>= 2.3~), mercurial (<< 2.4~), python-gobject (>= 2.12.1),
+ python-qt4 (>= 4.9.5), python-qscintilla2 (>= 2.6.2), ${shlibs:Depends}, ${misc:Depends},
${python:Depends}
Recommends: libjs-jquery, libjs-underscore, python-iniparse, python-pygments
diff -Nru tortoisehg-2.4/debian/patches/fix-config-path.patch tortoisehg-2.5.1/debian/patches/fix-config-path.patch
--- tortoisehg-2.4/debian/patches/fix-config-path.patch 2012-09-16 22:38:53.000000000 +0200
+++ tortoisehg-2.5.1/debian/patches/fix-config-path.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-Description: fix configuration path (and crash on startup)
-Origin: https://bitbucket.org/tortoisehg/thg/changeset/9635693f3b973702fdee4e8fa487afb4d93959be
-Bug-Debian: http://bugs.debian.org/678558
-
-# HG changeset patch
-# User Jairo Llopis <yajo....@gmail.com>
-# Date 1342020308 -7200
-# Node ID 9635693f3b973702fdee4e8fa487afb4d93959be
-# Parent b73053f7cacb5ca8679d09b81363cd62473f5496
-nautilus: Fix issue #869 [1]. Nautilus extension now works.
-
-The nautilus extension now uses $XDG_CONFIG_HOME like the rest of thg.
-
-Links:
- [1] https://bitbucket.org/tortoisehg/thg/issue/869/tortoisehg-nautilus-doesnt-work-at-all
-
-Index: tortoisehg-2.4/contrib/nautilus-thg.py
-===================================================================
---- tortoisehg-2.4.orig/contrib/nautilus-thg.py 2012-09-16 22:35:49.904065810 +0200
-+++ tortoisehg-2.4/contrib/nautilus-thg.py 2012-09-16 22:36:23.272376213 +0200
-@@ -66,10 +66,25 @@
- from tortoisehg.util import menuthg
- self.hgtk = paths.find_in_path(thg_main)
- self.menu = menuthg.menuThg()
-- self.notify = os.path.expanduser('~/.tortoisehg/notify')
-
-- f = open(self.notify, 'w')
-- f.close()
-+ # Get the configuration directory path
-+ try:
-+ self.notify = os.environ['XDG_CONFIG_HOME']
-+ except KeyError:
-+ self.notify = os.path.join('$HOME', '.config')
-+
-+ self.notify = os.path.expandvars(os.path.join(
-+ self.notify,
-+ 'TortoiseHg'))
-+
-+ # Create folder if it does not exist
-+ if not os.path.isdir(self.notify):
-+ os.makedirs(self.notify)
-+
-+ # Create the notify file
-+ self.notify = os.path.join(self.notify, 'notify')
-+ open(self.notify, 'w').close()
-+
- self.gmon = Gio.file_new_for_path(self.notify).monitor(Gio.FileMonitorFlags.NONE, None)
- self.gmon.connect('changed', self.notified)
-
diff -Nru tortoisehg-2.4/debian/patches/series tortoisehg-2.5.1/debian/patches/series
--- tortoisehg-2.4/debian/patches/series 2012-09-16 22:36:02.000000000 +0200
+++ tortoisehg-2.5.1/debian/patches/series 2012-10-05 11:47:02.000000000 +0200
@@ -1,2 +1 @@
add-config-file.patch
-fix-config-path.patch
diff -Nru tortoisehg-2.4/debian/rules tortoisehg-2.5.1/debian/rules
--- tortoisehg-2.4/debian/rules 2012-05-29 10:16:16.000000000 +0200
+++ tortoisehg-2.5.1/debian/rules 2012-10-05 12:38:54.000000000 +0200
@@ -23,6 +23,7 @@
rm -f debian/pycompat
rm -f debian/thg.1
rm -fr locale doc/build
+ dh_clean
override_dh_installdocs:
dh_installdocs --exclude=nautilus-thg.py --exclude=mergetools.rc
diff -Nru tortoisehg-2.4/debian/tortoisehg-nautilus.install tortoisehg-2.5.1/debian/tortoisehg-nautilus.install
--- tortoisehg-2.4/debian/tortoisehg-nautilus.install 2012-05-29 10:16:16.000000000 +0200
+++ tortoisehg-2.5.1/debian/tortoisehg-nautilus.install 2012-10-05 12:26:30.000000000 +0200
@@ -1 +1 @@
-usr/lib/nautilus/extensions-2.0/python/nautilus-thg.py usr/share/nautilus-python/extensions
+usr/share/nautilus-python/extensions/*
