sync with gpoo, two separate packages.
--- a/changelog Thu Jul 17 20:22:26 2008 +0200
+++ b/changelog Tue Jul 29 11:33:39 2008 -0400
@@ -1,4 +1,28 @@
-tortoisehg (0.4.0~rc2-0ppa1) hardy; urgency=low
+tortoisehg (0.4.0rc3-0ubuntu1~ppa4) hardy; urgency=low
+
+ * debian/control:
+ + Added build dependency of mercurial
+
+ -- Germán Poo Caamaño <gpoo@calcifer.org> Sat, 26 Jul 2008 13:41:57 -0400
+
+tortoisehg (0.4.0rc3gpoo-0~ppa3) hardy; urgency=low
+
+ * debian/patches:
+ + Removed 02-fix-setup-for-linux.diff
+ + Added 02-fix-path-nautilus-thg.diff, to find hgtk in the path.
+ * debian/control:
+ + Build two packages
+ + Fixed homepage information
+ + Added extra Python headers (XB-Python-Version)
+ * debian/dirs:
+ + Removed all entries
+ * Added install files:
+ + debian/mercurial-tortoisehg.install
+ + debian/nautilus-mercurial-tortoisehg.install
+
+ -- German Poo-Caaman~o <gpoo@calcifer.org> Fri, 25 Jul 2008 11:01:39 -0400
+
+tortoisehg (0.4.0rc3gpoo-0~ppa2) hardy; urgency=low
* debian/control:
+ Removed the quilt dependency (now using simple patch system).
--- a/control Thu Jul 17 20:22:26 2008 +0200
+++ b/control Tue Jul 29 11:33:39 2008 -0400
@@ -1,23 +1,32 @@
Source: tortoisehg
Section: devel
Priority: optional
-Maintainer: Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
+Maintainer: Germán Poo Caamaño <gpoo@calcifer.org>
+XSBC-Original-Maintainer: Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Build-Depends: debhelper (>= 5.0.37.2), patchutils (>= 0.2.25),
- cdbs (>= 0.4.27-1), python-support (>= 0.4.3), python-all-dev
-Standards-Version: 3.7.2
+ cdbs (>= 0.4.49), python-support (>= 0.5.3), python-all-dev,
+ mercurial
+Standards-Version: 3.8.0
+Homepage: http://tortoisehg.sourceforge.net/
-Package: tortoisehg
+Package: mercurial-tortoisehg
+Architecture: all
+Depends: ${python:Depends}, python-gtk2, mercurial
+Provides: ${python:Provides}
+Suggests:
+Description: Graphical interface for Mercurial, a scalable distributed version control system
+ Mercurial is a fast, lightweight Source Control Management system designed
+ for efficient handling of very large distributed projects. TortoiseHg
+ adds a graphical interface based on PyGTK to it.
+
+Package: nautilus-mercurial-tortoisehg
Architecture: all
Depends: ${python:Depends}, python-gtk2, mercurial,
- python-nautilus (>= 0.5.0)
+ python-nautilus (>= 0.5.0), mercurial-tortoisehg
Provides: ${python:Provides}
Recommends: nautilus-open-terminal
Suggests:
-Description: Graphical interface for Mercurial, a scalable distributed version control system
+Description: Nautilus extension for Mercurial, which provides a graphical interface for Mercurial
Mercurial is a fast, lightweight Source Control Management system designed
- for efficient handling of very large distributed projects. TortoiseHg
- adds a graphical interface based on PyGTK to it.
- .
- Homepage: http://tortoisehg.sourceforge.net/
- .
- Mercurial: http://www.selenic.com/mercurial/
+ for efficient handling of very large distributed projects.
+ TortoiseHg adds a graphical interface based on PyGTK to it.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tortoisehg.install Tue Jul 29 11:33:39 2008 -0400
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/hgtk
+debian/tmp/usr/lib/python*
+debian/tmp/usr/share
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nautilus-mercurial-tortoisehg.install Tue Jul 29 11:33:39 2008 -0400
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/hgproc.py
+debian/tmp/usr/lib/nautilus
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/02-fix-path-nautilus-thg.diff Tue Jul 29 11:33:39 2008 -0400
@@ -0,0 +1,11 @@
+--- a/contrib/nautilus-thg.py 2008-07-25 11:30:29.000000000 -0400
++++ b/contrib/nautilus-thg.py 2008-07-25 11:37:51.000000000 -0400
+@@ -22,7 +22,7 @@
+ import time
+ import urllib
+
+-TORTOISEHG_PATH = '~/tools/tortoisehg-dev'
++TORTOISEHG_PATH = '/usr/bin'
+ TERMINAL_KEY = '/desktop/gnome/applications/terminal/exec'
+
+ class HgExtension(nautilus.MenuProvider,
--- a/patches/02-fix-setup-for-linux.diff Thu Jul 17 20:22:26 2008 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -8,15 +8,23 @@
- import time
- import sys
- import os
-+from distutils.core import setup
-
--# non-Win32 platforms doesn't require setup
--if os.name != 'nt':
-- sys.stderr.write("abort: %s is for Win32 platforms only" % sys.argv[0])
-- sys.exit(1)
-+_description = 'Graphical interface for Mercurial VCS'
-+_scripts = []
-+_packages = []
-+_data_files = []
-+_extra = {}
-+_options = {}
-
--# ModuleFinder can't handle runtime changes to __path__, but win32com uses them
-+if os.name == 'nt':
-+ _description = 'Windows shell extension for Mercurial VCS'
-+ _packages = ['tortoise', 'hggtk', 'hggtk.vis', 'hggtk.iniparse']
-+ _data_files = [(root, [os.path.join(root, file_) for file_ in files])
-+ for root, dirs, files in os.walk('icons')]
-
--try:
-+ # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
-+
- # if this doesn't work, try import modulefinder
- import py2exe.mf as modulefinder
- import win32com
-@@ -27,48 +35,55 @@
- m = sys.modules[extra]
- for p in m.__path__[1:]:
- modulefinder.AddPackagePath(extra, p)
--except ImportError:
-- # no build path setup, no worries.
-- pass
-
--from distutils.core import setup
--import py2exe
-+ try:
-+ import py2exe
-+ except ImportError:
-+ pass
-
--_data_files = []
--extra = {}
--hgextmods = []
-+ hgextmods = []
-
--if 'py2exe' in sys.argv:
-- # FIXME: quick hack to include installed hg extensions in py2exe binary
-- import hgext
-- hgextdir = os.path.dirname(hgext.__file__)
-- hgextmods = set(["hgext." + os.path.splitext(f)[0]
-- for f in os.listdir(hgextdir)])
-- _data_files = [(root, [os.path.join(root, file_) for file_ in files])
-- for root, dirs, files in os.walk('icons')]
-- extra['windows'] = [
-- {"script":"hgproc.py",
-- "icon_resources": [(1, "icons/tortoise/hg.ico")]},
-- {"script":"hggtk/tracelog.py",
-- "icon_resources": [(1, "icons/tortoise/python.ico")]}
-- ]
-- extra['com_server'] = ["tortoisehg"]
-- extra['console'] = ["contrib/hg"]
-+ if 'py2exe' in sys.argv:
-+ # FIXME: quick hack to include installed hg extensions in py2exe binary
-+ import hgext
-+ hgextdir = os.path.dirname(hgext.__file__)
-+ hgextmods = set(["hgext." + os.path.splitext(f)[0]
-+ for f in os.listdir(hgextdir)])
-+ _data_files = [(root, [os.path.join(root, file_) for file_ in files])
-+ for root, dirs, files in os.walk('icons')]
-+ extra['windows'] = [
-+ {"script":"hgproc.py",
-+ "icon_resources": [(1, "icons/tortoise/hg.ico")]},
-+ {"script":"hggtk/tracelog.py",
-+ "icon_resources": [(1, "icons/tortoise/python.ico")]}
-+ ]
-+ extra['com_server'] = ["tortoisehg"]
-+ extra['console'] = ["contrib/hg"]
-
--opts = {
-- "py2exe" : {
-- # Don't pull in all this MFC stuff used by the makepy UI.
-- "excludes" : "pywin,pywin.dialogs,pywin.dialogs.list",
-+ _options = {
-+ "py2exe" : {
-+ # Don't pull in all this MFC stuff used by the makepy UI.
-+ "excludes" : "pywin,pywin.dialogs,pywin.dialogs.list",
-+ # add library files to support PyGtk-based dialogs/windows
-+ # Note:
-+ # after py2exe build, copy GTK's etc and lib directories into
-+ # the dist directory created by py2exe.
-+ # also needed is the GTK's share/themes (as dist/share/themes),
-+ # for dialogs to display in MS-Windows XP theme.
-+ "includes" : "pango,atk,pangocairo,cairo,gobject," + ",".join(hgextmods),
-+ }
-+ }
-+ _extra['options'] = _options
-
-- # add library files to support PyGtk-based dialogs/windows
-- # Note:
-- # after py2exe build, copy GTK's etc and lib directories into
-- # the dist directory created by py2exe.
-- # also needed is the GTK's share/themes (as dist/share/themes),
-- # for dialogs to display in MS-Windows XP theme.
-- "includes" : "pango,atk,pangocairo,cairo,gobject," + ",".join(hgextmods),
-- }
--}
-+else: # non-NT; assume Unixish
-+
-+ _scripts = ['contrib/hgtk']
-+ _packages = ['hggtk', 'hggtk.vis', 'hggtk.iniparse']
-+ _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),
-+ [os.path.join(root, file_) for file_ in files])
-+ for root, dirs, files in os.walk('icons')]
-+ _data_files += [('lib/nautilus/extensions-2.0/python', ['contrib/nautilus-thg.py'])]
-+
-
- # specify version string, otherwise 'hg identify' will be used:
- version = ''
-@@ -80,11 +95,11 @@
- version=tortoise.version.get_version(),
- author='TK Soh',
- author_email='teekaysoh@gmail.com',
-- url='http://tortoisehg.sourceforge.net',
-- description='Windows shell extension for Mercurial VCS',
-+ url='http://tortoisehg.sourceforge.net/',
-+ description=_description,
- license='GNU GPL2',
-- packages=['tortoise', 'hggtk', 'hggtk.vis', 'hggtk.iniparse'],
-- data_files = _data_files,
-- options=opts,
-- **extra
-+ scripts=_scripts,
-+ packages=_packages,
-+ data_files=_data_files,
-+ **_extra
- )
--- a/rules Thu Jul 17 20:22:26 2008 +0200
+++ b/rules Tue Jul 29 11:33:39 2008 -0400
@@ -3,15 +3,13 @@
DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-DEB_INSTALL_MANPAGES_tortoisehg=
-binary-install/tortoisehg::
- # fix bugs in cdbs/dh_python: hgtk will use python and not pythonX.Y
- sed -i -e 's/python[0-9.]*/python/' $(DEB_DESTDIR)usr/bin/hgtk
-
-clean::
- $(RM) -v hggtk/*.pyc
-
+#binary-install/mercurial-tortoisehg::
+# # fix bugs in cdbs/dh_python: hgtk will use python and not pythonX.Y
+# sed -i -e 's/python[0-9.]*/python/' $(DEB_DESTDIR)usr/bin/hgtk
+#
+#clean::
+# $(RM) -v hggtk/*.pyc
+#
\ No newline at end of file