import from gpoo
authorPeter Arrenbrecht <peter.arrenbrecht@gmail.com>
Thu, 17 Jul 2008 17:58:41 +0200
changeset 0 8c87dc646df3
child 1 0723caf0dbf7
import from gpoo
changelog
compat
control
copyright
dirs
docs
files
patches/01-fix-path-shlib.diff
patches/02-fix-setup-for-linux.diff
pycompat
pyversions
rules
tortoisehg.postinst.debhelper
tortoisehg.prerm.debhelper
tortoisehg.substvars
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/changelog	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,30 @@
+tortoisehg (0.4.0~rc2-0ppa1) hardy; urgency=low
+
+  * debian/control:
+    + Removed the quilt dependency (now using simple patch system).
+    + Fixed the target arquitecture.
+    + Removed shlibs: and misc: dependencies
+  * New recommended packages:
+    + nautilus-open-terminal
+  * New required packages:
+    + python-nautilus
+    + python-gtk2
+  * debian/rules:
+    + Remove patchsys-quilt.
+    + Added simple-patchsys.
+  * debian/patches: Moved the patches inside debian/ directory.
+    + 01-fix-path-shlib.diff
+    + 02-fix-setup-for-linux.diff
+  * Fixes in patches:
+    + Readded tracelog.py
+    + Fixed path for hgtk in setup.py.  Now correctly invoked in contrib.
+    + Added contrib/nautilus-thg.py to be installed
+
+ -- Germán Póo-Caamaño <gpoo@calcifer.org>  Wed, 29 May 2008 01:58:26 -0400
+
+tortoisehg (0.4.0.rc2-1) unstable; urgency=low
+
+  * First attempt
+
+ -- Peter Arrenbrecht <peter.arrenbrecht@gmail.com>  Wed, 5 May 2008 22:00:00 +0200
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compat	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,1 @@
+5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/control	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,23 @@
+Source: tortoisehg
+Section: devel
+Priority: optional
+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
+
+Package: tortoisehg
+Architecture: all
+Depends: ${python:Depends}, python-gtk2, mercurial,
+ python-nautilus (>= 0.5.0)
+Provides: ${python:Provides}
+Recommends: nautilus-open-terminal
+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.
+ .
+ Homepage: http://tortoisehg.sourceforge.net/
+ .
+ Mercurial: http://www.selenic.com/mercurial/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/copyright	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,31 @@
+This package was debianized by Peter Arrenbrecht <peter.arrenbrecht@gmail.com> on
+Mon, 5 May 2008 22:20:00 +0200.
+
+It was downloaded from http://www.selenic.com/mercurial/
+
+Copyright 200x TK Soh <...>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is licensed under the GPL, see above, and has
+the following copyright:
+
+Copyright (C) 2008  Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dirs	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/tortoisehg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,2 @@
+ReleaseNotes.txt
+COPYING.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/files	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,1 @@
+tortoisehg_0.4.0~rc2-0ppa1_all.deb devel optional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/01-fix-path-shlib.diff	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,19 @@
+--- tortoisehg-0.4.0~rc2/hggtk/shlib.py	2008-05-29 00:37:24.000000000 -0400
++++ tortoisehg-test/hggtk/shlib.py	2008-05-28 13:42:21.000000000 -0400
+@@ -135,15 +135,7 @@
+     # The context menu should set this variable
+     var = os.environ.get('THG_ICON_PATH', None)
+     paths = var and [ var ] or []
+-    try:
+-        # Else try relative paths from hggtk, the repository layout
+-        dir = os.path.dirname(__file__)
+-        paths.append(os.path.join(dir, '..', 'icons'))
+-        # ... or the source installer layout
+-        paths.append(os.path.join(dir, '..', '..', '..',
+-            'share', 'tortoisehg', 'icons'))
+-    except NameError: # __file__ is not always available
+-        pass
++    paths.append('/usr/share/pixmaps/tortoisehg/icons')
+     for p in paths:
+         path = os.path.join(p, 'tortoise', icon)
+         if os.path.isfile(path):
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/02-fix-setup-for-linux.diff	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,151 @@
+--- a/setup.py	2008-05-30 00:29:56.000000000 -0400
++++ b/setup.py	2008-05-30 00:29:25.000000000 -0400
+@@ -7,17 +7,25 @@
+ 
+ import time
+ import sys
+ import os
++from distutils.core import setup
++
++_description = 'Graphical interface for Mercurial VCS'
++_scripts = []
++_packages = []
++_data_files = []
++_extra = {}
++_options = {}
+ 
+-# 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)
++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')]
+ 
+-# ModuleFinder can't handle runtime changes to __path__, but win32com uses them
++    # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
+ 
+-try:
+     # if this doesn't work, try import modulefinder
+     import py2exe.mf as modulefinder
+     import win32com
+     for p in win32com.__path__[1:]:
+@@ -26,50 +34,57 @@
+         __import__(extra)
+         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
+-
+-_data_files = []
+-extra = {}
+-hgextmods = []
++    try:
++        import py2exe
++    except ImportError:
++        pass
++
++    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"]
++
++    _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
++
++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'])]
+ 
+-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",
+-
+-       # 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),
+-   }
+-}
+ 
+ # specify version string, otherwise 'hg identify' will be used:
+ version = ''
+ 
+@@ -79,12 +94,12 @@
+ setup(name="TortoiseHg",
+         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
+     )
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pycompat	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,1 @@
+2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pyversions	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,1 @@
+2.4-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rules	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+DEB_PYTHON_SYSTEM=pysupport
+include /usr/share/cdbs/1/rules/debhelper.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
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tortoisehg.postinst.debhelper	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,5 @@
+# Automatically added by dh_pysupport
+if which update-python-modules >/dev/null 2>&1; then
+	update-python-modules  tortoisehg
+fi
+# End automatically added section
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tortoisehg.prerm.debhelper	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,5 @@
+# Automatically added by dh_pysupport
+if which update-python-modules >/dev/null 2>&1; then
+	update-python-modules -c  tortoisehg
+fi
+# End automatically added section
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tortoisehg.substvars	Thu Jul 17 17:58:41 2008 +0200
@@ -0,0 +1,2 @@
+python:Versions=2.4, 2.5
+python:Depends=python-support (>= 0.7.1), python (>= 2.4)