[Python-apps-commits] r2174 - in packages/mercurial/branches/1.1-vt/debian (13 files)

vt-guest at users.alioth.debian.org vt-guest at users.alioth.debian.org
Thu Jan 8 02:03:02 UTC 2009


    Date: Thursday, January 8, 2009 @ 02:03:00
  Author: vt-guest
Revision: 2174

* switched compat back to 5
* added python-openssl to suggests
* added headers to patches
* new patches:
  - add documentation for the zeroconf extension
  - suggest Debian packages for some optional dependencies
    (replaces deb_specific__ElementTree_for_darcs.patch)

Added:
  packages/mercurial/branches/1.1-vt/debian/patches/backport__zeroconf-doc
  packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies
    (from rev 2153, packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__ElementTree_for_darcs.patch)
  packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc
Modified:
  packages/mercurial/branches/1.1-vt/debian/changelog
  packages/mercurial/branches/1.1-vt/debian/compat
  packages/mercurial/branches/1.1-vt/debian/control
  packages/mercurial/branches/1.1-vt/debian/hgext.rc
  packages/mercurial/branches/1.1-vt/debian/patches/convert-darc-doc.patch
  packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__hgk.py.patch
  packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__use_sensible-editor.patch
  packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__python-module-not-script.patch
  packages/mercurial/branches/1.1-vt/debian/patches/series
Deleted:
  packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__ElementTree_for_darcs.patch

Modified: packages/mercurial/branches/1.1-vt/debian/changelog
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/changelog	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/changelog	2009-01-08 02:03:00 UTC (rev 2174)
@@ -4,7 +4,7 @@
   * New upstream release (closes: #499846)
     Also resolves the following Debian bugs:
     - mq corrupts repository on file rename (closes: #503997)
-    - failing import breaks python help (closes: #476885)
+    - failing import breaks Python help (closes: #476885)
     - hg email doesn't use correct encoding (closes: #427854)
     - error when loading extensions twice (closes: #447088)
     - static-http does not work with old layout repositories (closes: #494889)
@@ -32,7 +32,7 @@
     + Add ${misc:Depends} to Depends to remove
       lintian warning.
 
- -- Vernon Tang <vt at foilhead.net>  Sat, 03 Jan 2009 17:00:16 +0800
+ -- Vernon Tang <vt at foilhead.net>  Thu, 08 Jan 2009 09:56:09 +0800
 
 mercurial (1.0.1-5.1) unstable; urgency=high
 

Modified: packages/mercurial/branches/1.1-vt/debian/compat
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/compat	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/compat	2009-01-08 02:03:00 UTC (rev 2174)
@@ -1 +1 @@
-7
+5

Modified: packages/mercurial/branches/1.1-vt/debian/control
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/control	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/control	2009-01-08 02:03:00 UTC (rev 2174)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Vincent Danjean <vdanjean at debian.org>, Gerardo Curiel <gcuriel at debian.org.ve>
-Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25), 
+Build-Depends: debhelper (>= 5.0.37.2), quilt, patchutils (>= 0.2.25), 
  cdbs (>= 0.4.27), python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc
 Standards-Version: 3.8.0
 Homepage: http://www.selenic.com/mercurial/
@@ -18,7 +18,7 @@
 Suggests: qct, 
  wish, 
  vim | emacs
-Description: Scalable distributed version control system
+Description: scalable distributed version control system
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.
  . 
@@ -41,10 +41,11 @@
 Recommends: mercurial (= ${binary:Version})
 Suggests: wish,
  python-mysqldb, 
- python-pygments
+ python-pygments,
+ python-openssl
 Conflicts: mercurial (<< ${binary:Version})
 Replaces: mercurial (<< 1.0)
-Description: Scalable distributed version control system (Common files)
+Description: scalable distributed version control system (common files)
  Mercurial is a fast, lightweight Source Control Management system designed
  for efficient handling of very large distributed projects.
  . 

Modified: packages/mercurial/branches/1.1-vt/debian/hgext.rc
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/hgext.rc	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/hgext.rc	2009-01-08 02:03:00 UTC (rev 2174)
@@ -36,7 +36,8 @@
 # - bzr to convert from Bazaar
 # - cvs to convert from CVS
 # - python-celementtree or python-elementtree to convert from Darcs
-# - git to convert from Git
+# - git-core to convert from Git
+# - tla to convert from GNU Arch
 # - monotone to convert from Monotone
 # - python-subversion to convert from Subversion
 hgext.convert =

Added: packages/mercurial/branches/1.1-vt/debian/patches/backport__zeroconf-doc
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/backport__zeroconf-doc	                        (rev 0)
+++ packages/mercurial/branches/1.1-vt/debian/patches/backport__zeroconf-doc	2009-01-08 02:03:00 UTC (rev 2174)
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User David Soria Parra <dsp at php.net>
+# Date 1231184952 -3600
+# Node ID e86ca711544d14aa1abb5afdd336f772bf45b110
+# Parent  3e592067515dcf3e9b027db089878f008a9f2550
+zeroconf: add extension documentation
+
+diff -r 3e592067515d -r e86ca711544d hgext/zeroconf/__init__.py
+--- a/hgext/zeroconf/__init__.py	Mon Jan 05 12:47:56 2009 -0500
++++ b/hgext/zeroconf/__init__.py	Mon Jan 05 20:48:48 2009 +0100
+@@ -6,6 +6,29 @@
+ # the GNU General Public License (version 2), incorporated herein by
+ # reference.
+ 
++'''zeroconf support for mercurial repositories
++
++Zeroconf enabled repositories will be announced in a network without the need
++to configure a server or a service. They can be discovered without knowing
++their actual IP address.
++
++To use the zeroconf extension add the following entry to your hgrc file:
++
++[extensions]
++hgext.zeroconf =
++
++To allow other people to discover your repository using run "hg serve" in your
++repository.
++
++ $ cd test
++ $ hg serve
++
++You can discover zeroconf enabled repositories by running "hg paths".
++
++ $ hg paths
++ zc-test = http://example.com:8000/test
++'''
++
+ import Zeroconf, socket, time, os
+ from mercurial import ui
+ from mercurial import extensions

Modified: packages/mercurial/branches/1.1-vt/debian/patches/convert-darc-doc.patch
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/convert-darc-doc.patch	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/patches/convert-darc-doc.patch	2009-01-08 02:03:00 UTC (rev 2174)
@@ -1,3 +1,5 @@
+Document that converting from darcs works only for the old format.
+
 Index: mercurial-1.1.2/hgext/convert/__init__.py
 ===================================================================
 --- mercurial-1.1.2.orig/hgext/convert/__init__.py

Deleted: packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__ElementTree_for_darcs.patch
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__ElementTree_for_darcs.patch	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__ElementTree_for_darcs.patch	2009-01-08 02:03:00 UTC (rev 2174)
@@ -1,13 +0,0 @@
-Index: mercurial-git/hgext/convert/darcs.py
-===================================================================
---- mercurial-git.orig/hgext/convert/darcs.py	2008-04-06 22:05:27.000000000 +0200
-+++ mercurial-git/hgext/convert/darcs.py	2008-04-06 22:11:01.000000000 +0200
-@@ -30,7 +30,7 @@
-         checktool('darcs')
- 
-         if ElementTree is None:
--            raise util.Abort(_("Python ElementTree module is not available"))
-+            raise util.Abort(_("Python ElementTree module is not available. Try installing the python-elementtree Debian package to convert from darcs"))
- 
-         if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
-             raise NoRepo("%s does not look like a darcs repo" % path)

Modified: packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__hgk.py.patch
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__hgk.py.patch	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__hgk.py.patch	2009-01-08 02:03:00 UTC (rev 2174)
@@ -1,3 +1,5 @@
+Set default hgk path for hgk outside bin.
+
 Index: mercurial-1.1.2/hgext/hgk.py
 ===================================================================
 --- mercurial-1.1.2.orig/hgext/hgk.py

Copied: packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies (from rev 2153, packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__ElementTree_for_darcs.patch)
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies	                        (rev 0)
+++ packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies	2009-01-08 02:03:00 UTC (rev 2174)
@@ -0,0 +1,157 @@
+Suggest Debian packages for some optional dependencies.
+
+diff -r eadf8bc60966 hgext/bugzilla.py
+--- a/hgext/bugzilla.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/bugzilla.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -308,7 +308,8 @@
+         global MySQLdb
+         MySQLdb = mysql
+     except ImportError, err:
+-        raise util.Abort(_('python mysql support not available: %s') % err)
++        raise util.Abort(_('python mysql support not available: %s') % err +
++                         _(' (try installing the %s package)') % 'python-mysqldb')
+ 
+     if node is None:
+         raise util.Abort(_('hook type %s does not pass a changeset id') %
+diff -r eadf8bc60966 hgext/convert/bzr.py
+--- a/hgext/convert/bzr.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/bzr.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -31,7 +31,8 @@
+             # access bzrlib stuff
+             branch
+         except NameError:
+-            raise NoRepo('Bazaar modules could not be loaded')
++            raise NoRepo('Bazaar modules could not be loaded' +
++                         _(' (try installing the %s package)') % 'bzr')
+ 
+         if not os.path.exists(os.path.join(path, '.bzr')):
+             raise NoRepo('%s does not look like a Bazaar repo' % path)
+diff -r eadf8bc60966 hgext/convert/common.py
+--- a/hgext/convert/common.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/common.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -20,11 +20,12 @@
+ 
+ class MissingTool(Exception): pass
+ 
+-def checktool(exe, name=None, abort=True):
++def checktool(exe, name=None, abort=True, debname=None):
+     name = name or exe
+     if not util.find_exe(exe):
+         exc = abort and util.Abort or MissingTool
+-        raise exc(_('cannot find required "%s" tool') % name)
++        raise exc(_('cannot find required "%s" tool') % name +
++                  (debname and _(' (try installing the %s package)') % debname or ''))
+ 
+ class NoRepo(Exception): pass
+ 
+diff -r eadf8bc60966 hgext/convert/cvs.py
+--- a/hgext/convert/cvs.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/cvs.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -16,7 +16,7 @@
+         if not os.path.exists(cvs):
+             raise NoRepo("%s does not look like a CVS checkout" % path)
+ 
+-        checktool('cvs')
++        checktool('cvs', debname='cvs')
+         self.cmd = ui.config('convert', 'cvsps', 'builtin')
+         cvspsexe = self.cmd.split(None, 1)[0]
+         self.builtin = cvspsexe == 'builtin'
+diff -r eadf8bc60966 hgext/convert/darcs.py
+--- a/hgext/convert/darcs.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/darcs.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -30,7 +30,8 @@
+         checktool('darcs')
+ 
+         if ElementTree is None:
+-            raise util.Abort(_("Python ElementTree module is not available"))
++            raise util.Abort(_("Python ElementTree module is not available") +
++                             _(" (try installing the %s package)") % 'python-celementtree')
+ 
+         if not os.path.exists(os.path.join(path, '_darcs', 'inventory')):
+             raise NoRepo("%s does not look like a darcs repo" % path)
+diff -r eadf8bc60966 hgext/convert/git.py
+--- a/hgext/convert/git.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/git.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -32,7 +32,7 @@
+         if not os.path.exists(path + "/objects"):
+             raise NoRepo("%s does not look like a Git repo" % path)
+ 
+-        checktool('git', 'git')
++        checktool('git', 'git', debname='git-core')
+ 
+         self.path = path
+ 
+diff -r eadf8bc60966 hgext/convert/gnuarch.py
+--- a/hgext/convert/gnuarch.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/gnuarch.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -33,7 +33,8 @@
+             if util.find_exe('tla'):
+                 self.execmd = 'tla'
+             else:
+-                raise util.Abort(_('cannot find a GNU Arch tool'))
++                raise util.Abort(_('cannot find a GNU Arch tool') +
++                                 _(' (try installing the %s package)') % 'tla')
+ 
+         commandline.__init__(self, ui, self.execmd)
+ 
+diff -r eadf8bc60966 hgext/convert/monotone.py
+--- a/hgext/convert/monotone.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/monotone.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -43,7 +43,7 @@
+         if not os.path.exists(path):
+             raise norepo
+ 
+-        checktool('mtn', abort=False)
++        checktool('mtn', abort=False, debname='monotone')
+ 
+         # test if there are any revisions
+         self.rev = None
+diff -r eadf8bc60966 hgext/convert/subversion.py
+--- a/hgext/convert/subversion.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/hgext/convert/subversion.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -155,16 +155,19 @@
+         try:
+             SubversionException
+         except NameError:
+-            raise MissingTool(_('Subversion python bindings could not be loaded'))
++            raise MissingTool(_('Subversion python bindings could not be loaded') +
++                              _(' (try installing the %s package)') % 'python-subversion')
+ 
+         try:
+             version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR
+             if version < (1, 4):
+                 raise MissingTool(_('Subversion python bindings %d.%d found, '
+-                                    '1.4 or later required') % version)
++                                    '1.4 or later required') % version +
++                                  _(' (try upgrading the %s package)') % 'python-subversion')
+         except AttributeError:
+             raise MissingTool(_('Subversion python bindings are too old, 1.4 '
+-                                'or later required'))
++                                'or later required') +
++                              _(' (try upgrading the %s package)') % 'python-subversion')
+ 
+         self.encoding = locale.getpreferredencoding()
+         self.lastrevs = {}
+@@ -960,6 +963,9 @@
+         return self.join('hg-authormap')
+ 
+     def __init__(self, ui, path):
++        checktool('svn', debname='subversion')
++        checktool('svnadmin', debname='subversion')
++
+         converter_sink.__init__(self, ui, path)
+         commandline.__init__(self, ui, 'svn')
+         self.delete = []
+diff -r eadf8bc60966 mercurial/hgweb/server.py
+--- a/mercurial/hgweb/server.py	Thu Jan 08 07:45:45 2009 +0800
++++ b/mercurial/hgweb/server.py	Thu Jan 08 09:14:25 2009 +0800
+@@ -259,7 +259,8 @@
+                     from OpenSSL import SSL
+                     ctx = SSL.Context(SSL.SSLv23_METHOD)
+                 except ImportError:
+-                    raise util.Abort(_("SSL support is unavailable"))
++                    raise util.Abort(_("SSL support is unavailable") +
++                                     _(" (try installing the python-openssl package)"))
+                 ctx.use_privatekey_file(ssl_cert)
+                 ctx.use_certificate_file(ssl_cert)
+                 sock = socket.socket(self.address_family, self.socket_type)


Property changes on: packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__optional-dependencies
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__use_sensible-editor.patch	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__use_sensible-editor.patch	2009-01-08 02:03:00 UTC (rev 2174)
@@ -1,3 +1,5 @@
+Use sensible-editor as default instead of vi.
+
 Index: mercurial-1.1.2/doc/hgrc.5.txt
 ===================================================================
 --- mercurial-1.1.2.orig/doc/hgrc.5.txt

Added: packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc	                        (rev 0)
+++ packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__correct-zeroconf-doc	2009-01-08 02:03:00 UTC (rev 2174)
@@ -0,0 +1,30 @@
+Correct the documentation for the zeroconf extension.
+
+diff -r 487d967407ca hgext/zeroconf/__init__.py
+--- a/hgext/zeroconf/__init__.py	Mon Jan 05 20:48:48 2009 +0100
++++ b/hgext/zeroconf/__init__.py	Thu Jan 08 09:29:56 2009 +0800
+@@ -6,11 +6,11 @@
+ # the GNU General Public License (version 2), incorporated herein by
+ # reference.
+ 
+-'''zeroconf support for mercurial repositories
++'''Zeroconf support for Mercurial repositories
+ 
+-Zeroconf enabled repositories will be announced in a network without the need
+-to configure a server or a service. They can be discovered without knowing
+-their actual IP address.
++The zeroconf extension will advertise "hg serve" instances over DNS-SD such
++that they can be discovered without knowing the server's hostname, and give
++the "hg paths" command the ability to discover such advertised repositories.
+ 
+ To use the zeroconf extension add the following entry to your hgrc file:
+ 
+@@ -23,7 +23,7 @@
+  $ cd test
+  $ hg serve
+ 
+-You can discover zeroconf enabled repositories by running "hg paths".
++You can discover Zeroconf-enabled repositories by running "hg paths".
+ 
+  $ hg paths
+  zc-test = http://example.com:8000/test

Modified: packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__python-module-not-script.patch
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__python-module-not-script.patch	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/patches/proposed_upstream__python-module-not-script.patch	2009-01-08 02:03:00 UTC (rev 2174)
@@ -1,3 +1,5 @@
+Remove shebang line from non-executable Python modules.
+
 Index: mercurial-git/mercurial/lsprof.py
 ===================================================================
 --- mercurial-git.orig/mercurial/lsprof.py	2008-04-06 20:12:23.000000000 +0200

Modified: packages/mercurial/branches/1.1-vt/debian/patches/series
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/series	2009-01-07 23:13:13 UTC (rev 2173)
+++ packages/mercurial/branches/1.1-vt/debian/patches/series	2009-01-08 02:03:00 UTC (rev 2174)
@@ -2,5 +2,7 @@
 proposed_upstream__python-module-not-script.patch
 deb_specific__use_sensible-editor.patch
 deb_specific__hgk.py.patch
-deb_specific__ElementTree_for_darcs.patch
+deb_specific__optional-dependencies
 convert-darc-doc.patch
+backport__zeroconf-doc
+proposed_upstream__correct-zeroconf-doc




More information about the Python-apps-commits mailing list