[Python-apps-commits] r2402 - in packages/mercurial/trunk/debian (8 files)
vt-guest at users.alioth.debian.org
vt-guest at users.alioth.debian.org
Mon Feb 16 07:07:27 UTC 2009
Date: Monday, February 16, 2009 @ 07:07:26
Author: vt-guest
Revision: 2402
Updating for current mercurial snapshot
Added:
packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/control
packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
packages/mercurial/trunk/debian/patches/deb_specific__mergetools
packages/mercurial/trunk/debian/patches/series
Deleted:
packages/mercurial/trunk/debian/patches/backport__zeroconf-doc
packages/mercurial/trunk/debian/patches/convert-darc-doc.patch
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2009-02-15 23:02:24 UTC (rev 2401)
+++ packages/mercurial/trunk/debian/changelog 2009-02-16 07:07:26 UTC (rev 2402)
@@ -1,20 +1,31 @@
-mercurial (1.1.2-3) UNRELEASED; urgency=low
+mercurial (1.1.2+hg20090215-7774-3b8f2750efcf-1) experimental; urgency=low
+ [ Vernon Tang ]
+ * New snapshot for feature freeze before next major release.
+
+ * debian/patches:
+ - deb_specific__mergetools: remove RCS merge from merge tools
+ - Added:
+ - proposed_upstream__dont-install-i18n
+ - Dropped:
+ - convert-darc-doc.patch: dropping for now to avoid fuzzing translations
+ - backport__zeroconf-doc
+ - Refreshed:
+ - deb_specific__install-templates-separately
+ - deb_specific__mergetools
+
+ * debian/control:
+ - Add gettext to build dependencies for compiling translations
+ - Remove RCS merge from Recommends
+ - Change merge tool Recommends to Suggests, add xxdiff
+
[ Vincent Danjean ]
* swich to debhelper 7.
Debhelper 5.0.37.2 is not enought: 6.0.7 at least is required for
dh_lintian to be called.
- TO REMOVE BEFORE UPLOAD: no need to upload for now. The only effect is
- a lintian warning not overwritten in the backported package.
- [ Vernon Tang ]
- * debian/patches/deb_specific__mergetools, debian/control:
- remove merge from mergetools.rc and rcs from Recommends
- * debian/control: change merge tool Recommends to Suggests,
- add xxdiff merge tool to Suggests
+ -- Vernon Tang <vt at foilhead.net> Mon, 16 Feb 2009 15:02:06 +0800
- -- Vernon Tang <vt at foilhead.net> Tue, 20 Jan 2009 13:49:13 +0800
-
mercurial (1.1.2-2) unstable; urgency=low
* debian/mercurial.postinst: symlink /usr/share/doc/mercurial if dpkg didn't
Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control 2009-02-15 23:02:24 UTC (rev 2401)
+++ packages/mercurial/trunk/debian/control 2009-02-16 07:07:26 UTC (rev 2402)
@@ -4,7 +4,7 @@
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>,
Vernon Tang <vt at foilhead.net>
-Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25),
+Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25), gettext,
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/
Deleted: packages/mercurial/trunk/debian/patches/backport__zeroconf-doc
===================================================================
--- packages/mercurial/trunk/debian/patches/backport__zeroconf-doc 2009-02-15 23:02:24 UTC (rev 2401)
+++ packages/mercurial/trunk/debian/patches/backport__zeroconf-doc 2009-02-16 07:07:26 UTC (rev 2402)
@@ -1,40 +0,0 @@
-# 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
Deleted: packages/mercurial/trunk/debian/patches/convert-darc-doc.patch
===================================================================
--- packages/mercurial/trunk/debian/patches/convert-darc-doc.patch 2009-02-15 23:02:24 UTC (rev 2401)
+++ packages/mercurial/trunk/debian/patches/convert-darc-doc.patch 2009-02-16 07:07:26 UTC (rev 2402)
@@ -1,15 +0,0 @@
-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
-+++ mercurial-1.1.2/hgext/convert/__init__.py
-@@ -18,7 +18,7 @@
- Accepted source formats [identifiers]:
- - Mercurial [hg]
- - CVS [cvs]
-- - Darcs [darcs]
-+ - Darcs [darcs] (legacy Darcs 1 format only)
- - git [git]
- - Subversion [svn]
- - Monotone [mtn]
Modified: packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2009-02-15 23:02:24 UTC (rev 2401)
+++ packages/mercurial/trunk/debian/patches/deb_specific__install-templates-separately 2009-02-16 07:07:26 UTC (rev 2402)
@@ -1,9 +1,8 @@
Support installation of templates handled by mercurial-common.install.
-Index: mercurial-1.1.2/mercurial/templater.py
-===================================================================
---- mercurial-1.1.2.orig/mercurial/templater.py
-+++ mercurial-1.1.2/mercurial/templater.py
+diff -r 10dbbca89519 mercurial/templater.py
+--- a/mercurial/templater.py
++++ b/mercurial/templater.py
@@ -9,7 +9,7 @@
import re, sys, os
from mercurial import util
@@ -13,17 +12,15 @@
def parsestring(s, quoted=True):
'''parse a string using simple c-like syntax.
-Index: mercurial-1.1.2/setup.py
-===================================================================
---- mercurial-1.1.2.orig/setup.py
-+++ mercurial-1.1.2/setup.py
-@@ -132,9 +132,6 @@
- scripts=scripts,
- packages=packages,
- ext_modules=ext_modules,
-- data_files=[(os.path.join('mercurial', root),
-- [os.path.join(root, file_) for file_ in files])
-- for root, dirs, files in os.walk('templates')],
- cmdclass=cmdclass,
- options=dict(py2exe=dict(packages=['hgext', 'email']),
- bdist_mpkg=dict(zipdist=True,
+diff -r 10dbbca89519 setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -222,7 +222,7 @@
+ pass
+
+ datafiles = []
+-for root in ('templates',):
++for root in ():
+ for dir, dirs, files in os.walk(root):
+ datafiles.append((os.path.join('mercurial', dir),
+ [os.path.join(dir, file_) for file_ in files]))
Modified: packages/mercurial/trunk/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/trunk/debian/patches/deb_specific__mergetools 2009-02-15 23:02:24 UTC (rev 2401)
+++ packages/mercurial/trunk/debian/patches/deb_specific__mergetools 2009-02-16 07:07:26 UTC (rev 2402)
@@ -1,7 +1,6 @@
-Add non-graphical vimdiff to and remove tools irrelevant to a Debian system
-(especially filemerge, see Issue1459) from mergetools.hgrc
+Remove merge tools irrelevant to a Debian system and RCS merge and add vimdiff
-diff -r 11a4eb81fb4f contrib/mergetools.hgrc
+diff -r 9f73bddb9d0b contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -12,8 +12,8 @@
@@ -15,18 +14,30 @@
gpyfm.gui=True
-@@ -38,14 +38,6 @@
+@@ -38,26 +38,11 @@
p4merge.gui=True
p4merge.priority=-8
--tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output
+-tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
-tortoisemerge.regkey=Software\TortoiseSVN
+-tortoisemerge.checkchanged=True
-tortoisemerge.gui=True
-
ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True
--
+
-filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
-filemerge.args=-left $other -right $local -ancestor $base -merge $output
-filemerge.gui=True
+-
+ beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts
+ beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
+ beyondcompare3.regname=ExePath
+ beyondcompare3.gui=True
+-
+-winmerge.args=/e /u /dl local /dr other /wr $local $other $output
+-winmerge.regkey=Software\Thingamahoochie\WinMerge
+-winmerge.regname=Executable
+-winmerge.checkchanged=True
+-winmerge.gui=True
Added: packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n
===================================================================
--- packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n (rev 0)
+++ packages/mercurial/trunk/debian/patches/proposed_upstream__dont-install-i18n 2009-02-16 07:07:26 UTC (rev 2402)
@@ -0,0 +1,15 @@
+Don't install the i18n folder; it's pointless to do so since the compiled
+translations are in the locale folder.
+
+diff -r 8c9d9d659637 setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -222,7 +222,7 @@
+ pass
+
+ datafiles = []
+-for root in ('templates', 'i18n'):
++for root in ('templates',):
+ for dir, dirs, files in os.walk(root):
+ datafiles.append((os.path.join('mercurial', dir),
+ [os.path.join(dir, file_) for file_ in files]))
Modified: packages/mercurial/trunk/debian/patches/series
===================================================================
--- packages/mercurial/trunk/debian/patches/series 2009-02-15 23:02:24 UTC (rev 2401)
+++ packages/mercurial/trunk/debian/patches/series 2009-02-16 07:07:26 UTC (rev 2402)
@@ -1,9 +1,8 @@
deb_specific__mergetools
+proposed_upstream__dont-install-i18n
deb_specific__install-templates-separately
proposed_upstream__python-module-not-script.patch
deb_specific__use_sensible-editor.patch
deb_specific__hgk.py.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