--- hgsvn-0.1.8.orig/debian/README.source +++ hgsvn-0.1.8/debian/README.source @@ -0,0 +1,4 @@ +This package uses quilt to apply and remove its patches. Please refer to +/usr/share/doc/quilt/README.source for information about how to use quilt +for source packages. + --- hgsvn-0.1.8.orig/debian/changelog +++ hgsvn-0.1.8/debian/changelog @@ -0,0 +1,192 @@ +hgsvn (0.1.8-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build using dh-python. Closes: #786169. + + -- Matthias Klose Sat, 22 Aug 2015 07:59:49 +0200 + +hgsvn (0.1.8-1) unstable; urgency=low + + * New Upstream Version (Closes: #568402) + + -- Vincent Danjean Thu, 04 Feb 2010 17:21:35 +0100 + +hgsvn (0.1.7-2) unstable; urgency=low + + * fix section (devel->vcs) + * update description (thanks Alexander Myodov) + * require python >= 2.5 (thanks Alexander Myodov again) + + -- Vincent Danjean Fri, 21 Aug 2009 12:47:58 +0200 + +hgsvn (0.1.7-1) unstable; urgency=low + + * New Upstream Version (Closes: #542674) + * Bump Standard-Version (no change needed) + * refresh manpage patch + + -- Vincent Danjean Thu, 20 Aug 2009 21:39:16 +0200 + +hgsvn (0.1.6-2) unstable; urgency=low + + * Fix copyright email (Closes: #485164) + * update standard version to 3.8.0 (no change needed) + + -- Vincent Danjean Mon, 09 Jun 2008 00:20:04 +0200 + +hgsvn (0.1.6-1) unstable; urgency=low + + * New Upstream Version + Improvements: + + Prefix commit messages with [svn r123] (where 123 is the corresponding + SVN revision number), rather than just [svn]. Also, trim leading + whitespace in the original commit message, to avoid blank changeset + summaries when the message begins with a carriage return. + + Introduce a .hgsvn private directory at the top of the working copy. + This will us to store various things in a common location without + polluting the base directory. + + Introduce a lock file (named .hgsvn/lock) to disallow running two + hgpullsvn instances in parallel on the same repository. The locking + mechanism is imported from mercurial's own mercurial.lock. If the + mercurial package is not available, a dummy lock is used instead. + Initial patch by Ori Peleg. + + Add a --no-hgignore option to hgimportsvn, for situations where the + source SVN repository already contains a versioned .hgignore file. + Patch by Ori Peleg. + + hgsvn can now be bundled as standalone executables using py2exe. Patch + by Paul Moore. + + More descriptive error message when either hg or svn cannot be executed + (e.g. not installed). Patch by Joonas Paalasmaa. + Bug fixes: + + Very long commit messages (> 16000 characters) are provided to Mercurial + through a temporary file rather than the command line, which could fail + on some platforms. The corresponding commit messages were generated by + svnmerge. Reported by Ralf Schmitt. + + Filenames starting with a hyphen were considered by hg and SVN as + command-line options. Report and patch by Mirko Friedenhagen. + + If the last hg changeset mapped to more than one SVN revision, trying to + update again with hgpullsvn failed. + + A replaced directory can have added and removed files without them being + mentioned in the SVN log; we must detect those files ourselves. + + More robust atomicity check for (hg commit, hg tag) sequence. Reported + by Florent Guillaume. + + Fix a bug when comparing local filesystem paths on Windows. We now + invoke os.path.normcase on both paths before comparing. Reported by + Pavol Murin. + * debian/control: change python-setuptools to python-pkg-resources + dependency (Closes: #468730) + + -- Vincent Danjean Sat, 31 May 2008 19:46:53 +0200 + +hgsvn (0.1.5-3) unstable; urgency=low + + * add build-depends on python (>= 2.5) | python-elementtree so that + elementtree will not be required at runtime (not needed with python2.5) + (Closes: #477075) + + -- Vincent Danjean Mon, 21 Apr 2008 09:17:59 +0200 + +hgsvn (0.1.5-2) unstable; urgency=low + + * [debian/control] depends on python-elementtree or python >= 2.5 (which + includes python-elementtree) (Closes: #462247) + + -- Vincent Danjean Wed, 13 Feb 2008 11:52:43 +0100 + +hgsvn (0.1.5-1) unstable; urgency=low + + * New upstream release + + Improvements: + - In the initial import, parse the svn:ignore property and add + suggestions to the .hgignore file accordingly. These suggestions are + commented by default because they are based on the latest version of + the svn:ignore property and could make us miss some files along the + SVN history, if enabled blindingly. + + Bug fixes: + - Critical fix for Mercurial 0.9.5, which is stricter with named + branches. This bug made hgimportsvn fail when cloning from an + auto-detected parent repository. + - Honor the SVN_ASP_DOT_NET_HACK environment variable when deciding the + name of private SVN folders (.svn or _svn). Thanks to Anton Daneika for + the report and the original patch. + * [debian/control] + + bump policy to 3.7.3 (no change needed) + + change to "Architecture: all" instead of "Architecture: any" + (Closes: #456107) Thanks to John Wright for reporting with patch + + add depends on subversion and mercurial (Closes: #456110) + Here again, thanks to John Wright for reporting with patch + + remove Homepages: from the description and add it to the source stanza + * [debian/patches] + + remove submitted_upstream__py_is_not_script.patch (applied upstream) + + remove submitted_upstream__manpages.patch (applied upstream) + * [debian/dirs] + + remove unused usr/sbin dir + + -- Vincent Danjean Mon, 21 Jan 2008 08:20:17 +0100 + +hgsvn (0.1.4-1) unstable; urgency=low + + * New upstream release + + Improvements: + - Be able to pull dead (removed) SVN branches by introducing a -p + (--svn-peg) option to specify the SVN "peg revision". The option + must be used with both hgimportsvn and hgpullsvn. Patch by + Cameron Hutchison. + + Bug fixes: + - Allow copying directories with non-ASCII names (reported by + Andre Klitzing). + - Make rmtree reliable under Windows. Thanks to Mark (mwatts42) + for finding both the bug and the solution. + - Fix a problem where there is a symbolic link in the SVN + repository that points to a directory. Patch by Cameron + Hutchison. + - svn log can output invalid XML when a commit message contains + control characters. Reported by Tim Wegener. + + Other: + - License upgraded to GNU GPL v3 (or later). + + -- Vincent Danjean Thu, 13 Sep 2007 21:05:38 +0200 + +hgsvn (0.1.3-2) unstable; urgency=low + + * Add dependency on python-setuptools (Closes: #425999) + + -- Vincent Danjean Sat, 26 May 2007 08:42:04 +0200 + +hgsvn (0.1.3-1) unstable; urgency=low + + * Initial release. (Closes: #421794: ITP: hgsvn -- Scripts to work + locally on Subversion checkouts using Mercurial) + * New upstream release + + Improvements: + * Performance improvement with svn log command in hgpullsvn + (suggested by Mads Kiilerich and Daniel Berlin). + * Less obscure error message when svn info fails while returning a + successful return code. + * Two simplistic man pages added for hgpullsvn and hgimportsvn (in + the man1/ directory). + + Bug fixes: + * Windows compatibility fix by Bill Baxter. + * hgimportsvn failed when used on a whole repository. + * Fix crash on empty commit message (also reported by Neil + Martinsen-Burrell and Walter Landry). + * Handle file and directory renames properly (reported by Bill + Baxter). + * SVN allows copying from a deleted file by having mixed revisions + inside the working copy at commit time, but Mercurial doesn't + accept it (reported by Neil Martinsen-Burrell). + + -- Vincent Danjean Mon, 14 May 2007 16:37:31 +0200 + +hgsvn (0.1.2-1) unstable; urgency=low + + * New upstream release + + -- Vincent Danjean Tue, 08 May 2007 10:48:16 +0200 + +hgsvn (0.1.1-1) unstable; urgency=low + + * Initial release + + -- Vincent Danjean Tue, 1 May 2007 16:41:00 +0200 + --- hgsvn-0.1.8.orig/debian/compat +++ hgsvn-0.1.8/debian/compat @@ -0,0 +1 @@ +5 --- hgsvn-0.1.8.orig/debian/control +++ hgsvn-0.1.8/debian/control @@ -0,0 +1,34 @@ +Source: hgsvn +Section: vcs +Priority: extra +Maintainer: Vincent Danjean +Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5), quilt, + patchutils (>= 0.2.25), dh-python, python-all, + python-setuptools (>= 0.6c9), python (>= 2.5) | python-elementtree +XS-Python-Version: >= 2.5 +Standards-Version: 3.8.4 +Homepage: http://cheeseshop.python.org/pypi/hgsvn + +Package: hgsvn +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, + python-pkg-resources, mercurial, subversion, + python-elementtree | python (>= 2.5) +Provides: ${python:Provides} +Description: Scripts to work locally on Subversion checkouts using Mercurial + This set of scripts allows to work locally on Subversion-managed projects + using the Mercurial distributed version control system. + . + Why use Mercurial ? You can do local (disconnected) work, pull the latest + changes from the SVN server, manage private branches, submit patches to + project maintainers, etc. And of course you have fast local operations like + "hg log", "hg annotate"... + . + Currenly three scripts are provided: hgimportsvn, hgpullsvn, and hgpushsvn. + . + hgimportsvn initializes an SVN checkout which is also a Mercurial repository. + . + hgpullsvn pulls the latest changes from the SVN repository, and updates the + Mercurial repository accordingly. It can be run multiple times. + . + hgpushsvn pushes your local Mercurial commits back to the SVN repository. --- hgsvn-0.1.8.orig/debian/copyright +++ hgsvn-0.1.8/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Vincent Danjean on +Tue, 1 May 2007 16:41:00 +0200. + +It was downloaded from http://cheeseshop.python.org/pypi/hgsvn + +Upstream Author: + Antoine Pitrou + +Copyright: + Copyright (C) 2007 Antoine Pitrou + +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 3 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 Copyright (C) 2007, Vincent Danjean + and is licensed under the GPL, see above. --- hgsvn-0.1.8.orig/debian/dirs +++ hgsvn-0.1.8/debian/dirs @@ -0,0 +1 @@ +usr/bin --- hgsvn-0.1.8.orig/debian/patches/deb-specific_use-packaged-setup-tool.patch +++ hgsvn-0.1.8/debian/patches/deb-specific_use-packaged-setup-tool.patch @@ -0,0 +1,14 @@ +Do not try to download another version of setuptool +--- a/setup.py ++++ b/setup.py +@@ -14,8 +14,8 @@ + # ninth alpha of release 0.6. But the -r41475 is a post-release tag, so this + # version is newer than 0.6a9.dev." + +-from ez_setup import use_setuptools +-use_setuptools(version="0.6c9", download_delay=3) ++#from ez_setup import use_setuptools ++#use_setuptools(version="0.6c9", download_delay=3) + from setuptools import setup, find_packages + + from hgsvn import base_version, __doc__ as long_description --- hgsvn-0.1.8.orig/debian/patches/series +++ hgsvn-0.1.8/debian/patches/series @@ -0,0 +1,2 @@ +deb-specific_use-packaged-setup-tool.patch +submitted_upstream__manpages.patch --- hgsvn-0.1.8.orig/debian/patches/submitted_upstream__manpages.patch +++ hgsvn-0.1.8/debian/patches/submitted_upstream__manpages.patch @@ -0,0 +1,34 @@ +Replace boild help2man text by a real description of the command +--- a/man1/hgimportsvn.1 ++++ b/man1/hgimportsvn.1 +@@ -1,7 +1,7 @@ + .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. + .TH HGIMPORTSVN "1" "January 2010" "hgimportsvn 0.1.8" "User Commands" + .SH NAME +-hgimportsvn \- manual page for hgimportsvn 0.1.8 ++hgimportsvn \- import a subversion (svn) repository into a mercurial (hg) one + .SH SYNOPSIS + .B hgimportsvn + [\fI-r SVN rev\fR] [\fI-p SVN peg rev\fR] \fI \fR[\fIlocal checkout\fR] +--- a/man1/hgpullsvn.1 ++++ b/man1/hgpullsvn.1 +@@ -1,7 +1,7 @@ + .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. + .TH HGPULLSVN "1" "January 2010" "hgpullsvn 0.1.8" "User Commands" + .SH NAME +-hgpullsvn \- manual page for hgpullsvn 0.1.8 ++hgpullsvn \- pull new svn revisions in a subversion/mercurial repository + .SH SYNOPSIS + .B hgpullsvn + [\fI-p SVN peg rev\fR] [\fI--help\fR] +--- a/man1/hgpushsvn.1 ++++ b/man1/hgpushsvn.1 +@@ -1,7 +1,7 @@ + .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. + .TH HGPUSHSVN "1" "January 2010" "hgpushsvn 0.1.8" "User Commands" + .SH NAME +-hgpushsvn \- manual page for hgpushsvn 0.1.8 ++hgpushsvn \- push mercurial changesets back into svn + .SH SYNOPSIS + .B hgpushsvn + [\fI-cf\fR] --- hgsvn-0.1.8.orig/debian/pycompat +++ hgsvn-0.1.8/debian/pycompat @@ -0,0 +1 @@ +2 --- hgsvn-0.1.8.orig/debian/rules +++ hgsvn-0.1.8/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/python-distutils.mk + +DEB_INSTALL_MANPAGES_hgsvn=man1/hgimportsvn.1 man1/hgpullsvn.1 man1/hgpushsvn.1 + + --- hgsvn-0.1.8.orig/debian/watch +++ hgsvn-0.1.8/debian/watch @@ -0,0 +1,11 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://cheeseshop.python.org/packages/source/h/hgsvn/ hgsvn-(.*)\.tar\.gz + +