--- svk-2.2.1.orig/debian/changelog +++ svk-2.2.1/debian/changelog @@ -0,0 +1,250 @@ +svk (2.2.1-0ubuntu1) jaunty; urgency=low + + * New upstream release (LP: #317090). + * Bump Standarts Version to 3.8.0. + * Updated Build Depends. + + -- Allisson Azevedo Wed, 14 Jan 2009 10:08:03 -0300 + +svk (2.0.2-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #297502), remaining changes: + - Fix up tab completion. + + -- Iulian Udrea Thu, 17 Nov 2008 19:22:13 +0000 + +svk (2.0.2-3) unstable; urgency=low + + * Ignore test failures. + * libfile-temp-perl has been merged into perl, remove dependency. + (closes: #497130) + + -- Bastian Blank Mon, 01 Sep 2008 18:19:34 +0200 + +svk (2.0.2-2ubuntu2) jaunty; urgency=low + + * Changed dependency from libfile-temp-perl -> perl-modules + to make package installable. Thank you to Max Bowsher for + the fix. (LP: #282793) + + -- Michael Casadevall Thu, 13 Nov 2008 05:39:07 -0500 + +svk (2.0.2-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable. Remaining changes: + - Fix up tab completion (LP #32312) + + -- Albin Tonnerre Sat, 02 Aug 2008 21:06:45 +0200 + +svk (2.0.2-2) unstable; urgency=low + + * liblocale-maketext-simple-perl and libversion-perl has been merged into + perl, accept it as alternative. (closes: #479763, #480917) + + -- Bastian Blank Fri, 04 Jul 2008 17:24:09 +0200 + +svk (2.0.2-1) unstable; urgency=low + + * New upstream version. + * Use external orig. + + -- Bastian Blank Sun, 20 Apr 2008 22:04:29 +0200 + +svk (2.0.1-1ubuntu3) gutsy; urgency=low + + * Depend on perl-modules instead of libfile-temp-perl + + -- Andy Price Thu, 09 Aug 2007 18:41:29 +0100 + +svk (2.0.1-1ubuntu2) gutsy; urgency=low + + * t/mirror/sync-crazy-replace.t - Fix build failure on some systems + caused by a buggy automated test. + + -- Andy Price Wed, 08 Aug 2007 23:41:15 +0100 + +svk (2.0.1-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Fix up tab completion (LP: #32312) + - Change Maintainer-address. + + -- Timo Aaltonen Mon, 21 May 2007 18:00:32 +0300 + +svk (2.0.1-1) unstable; urgency=low + + * New upstream version. (closes: #408306) + + -- Bastian Blank Mon, 7 May 2007 16:43:12 +0000 + +svk (1.08-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Fix up tab completion (Closes Malone: #32312) + + -- Timo Aaltonen Thu, 21 Dec 2006 18:37:05 +0200 + +svk (1.08-2) unstable; urgency=low + + * Depend against libsvn-perl. (closes: #390259) + + -- Bastian Blank Tue, 10 Oct 2006 17:44:03 +0000 + +svk (1.08-1ubuntu1) edgy; urgency=low + + * Fix up tab completion (Closes Malone: #32312) + * Kudos to Scott Bronson for the patch + + -- Barry deFreese Sun, 27 Aug 2006 21:59:25 -0400 + +svk (1.08-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Sun, 9 Jul 2006 12:54:29 +0000 + +svk (1.07-1) unstable; urgency=low + + * New upstream version. (closes: #336387) + - Fixes prototype mismatch warning caused by autouse and Perl 5.8.8. + (closes: #353455) + * Add a subversion Depends for svnadmin. (closes: #298224) + + -- Bastian Blank Sun, 12 Mar 2006 00:11:41 +0100 + +svk (1.06-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Fri, 30 Dec 2005 16:46:28 +0100 + +svk (1.04-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Wed, 24 Aug 2005 11:19:27 +0200 + +svk (1.03-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Fri, 19 Aug 2005 15:21:58 +0200 + +svk (1.02-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Wed, 03 Aug 2005 09:45:48 +0200 + +svk (1.01-1) unstable; urgency=low + + * New upstream version. (closes: #319267) + * Use editor as fallback. (closes: #315758) + + -- Bastian Blank Tue, 02 Aug 2005 14:42:57 +0200 + +svk (1.00-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Thu, 12 May 2005 14:06:33 +0200 + +svk (0.994-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Tue, 03 May 2005 15:12:09 +0200 + +svk (0.992-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Thu, 21 Apr 2005 21:11:48 +0200 + +svk (0.991-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Sun, 03 Apr 2005 10:01:03 +0200 + +svk (0.30-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Fri, 11 Mar 2005 08:47:07 +0100 + +svk (0.29-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Fri, 04 Feb 2005 15:39:02 +0100 + +svk (0.28-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Wed, 12 Jan 2005 16:41:06 +0100 + +svk (0.26-1) unstable; urgency=low + + * New upstream version. + + -- Bastian Blank Thu, 09 Dec 2004 14:09:36 +0100 + +svk (0.20-3) unstable; urgency=medium + + * debian/control + - Update dependencies. + + -- Bastian Blank Wed, 08 Sep 2004 21:25:03 +0200 + +svk (0.20-2) unstable; urgency=medium + + * debian/control + - Update dependencies. + + -- Bastian Blank Wed, 08 Sep 2004 10:11:03 +0200 + +svk (0.20-1) unstable; urgency=low + + * New upstream release. + + -- Bastian Blank Mon, 06 Sep 2004 18:47:21 +0200 + +svk (0.18-1) unstable; urgency=low + + * New upstream release. + - Sort output. (closes: #264457) + * debian/control + - Update dependencies. + + -- Bastian Blank Mon, 09 Aug 2004 14:00:43 +0200 + +svk (0.16-1) unstable; urgency=low + + * New upstream release. + + -- Bastian Blank Sun, 11 Jul 2004 15:28:51 +0200 + +svk (0.15-1) unstable; urgency=low + + * New upstream release. + * debian/control + - Fix dependencies. (closes: #251839) + + -- Bastian Blank Sun, 13 Jun 2004 20:36:46 +0200 + +svk (0.14-1) unstable; urgency=low + + * New upstream release. + * debian/control + - Fix dependencies. (closes: #245540) + + -- Bastian Blank Fri, 07 May 2004 16:11:44 +0200 + +svk (0.12-1) unstable; urgency=low + + * Initial Release. + + -- Bastian Blank Sun, 4 Apr 2004 00:26:44 +0200 + --- svk-2.2.1.orig/debian/compat +++ svk-2.2.1/debian/compat @@ -0,0 +1 @@ +4 --- svk-2.2.1.orig/debian/watch +++ svk-2.2.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.cpan.org/pub/CPAN/authors/id/C/CL/CLKAO/SVK-v(.*)\.tar.gz --- svk-2.2.1.orig/debian/copyright +++ svk-2.2.1/debian/copyright @@ -0,0 +1,20 @@ +This is the debian package for the SVK module. + +It was downloaded from the Comprehensive Perl Archive Network (CPAN). +Visit to find a CPAN site near you. + +The upstream author is: + +Chia-liang Kao . + +Copyright 2003-2004 by Chia-liang Kao . + +This program is free software; you can redistribute it and/or modify it +under the same terms as Perl itself. + +See http://www.perl.com/perl/misc/Artistic.html + +Perl is distributed under your choice of the GNU General Public License or +the Artistic License. On Debian GNU/Linux systems, the complete text of the +GNU General Public License can be found in `/usr/share/common-licenses/GPL' +and the Artistic Licence in `/usr/share/common-licenses/Artistic'. --- svk-2.2.1.orig/debian/control +++ svk-2.2.1/debian/control @@ -0,0 +1,20 @@ +Source: svk +Section: perl +Priority: optional +Build-Depends: debhelper (>= 4.0.2) +Build-Depends-Indep: perl (>> 5.10), gnupg, libalgorithm-annotate-perl, libalgorithm-diff-perl (>> 1.19.01), libapp-cli-perl, libclass-accessor-perl, libclass-autouse-perl (>> 1.15), libclass-data-inheritable-perl, libcompress-zlib-perl, libdata-hierarchy-perl (>> 0.30), libfile-spec-perl (>> 3.17), libfreezethaw-perl, libio-digest-perl, liblist-moreutils-perl, liblocale-maketext-lexicon-perl (>> 0.62), libpath-class-perl (>> 0.16), libperlio-eol-perl (>> 0.13), libperlio-via-dynamic-perl (>> 0.11), libperlio-via-symlink-perl (>> 0.02), libpod-escapes-perl, libpod-simple-perl, libsvn-mirror-perl (>> 0.71), libsvn-simple-perl (>> 0.27), libterm-readkey-perl, libuniversal-require-perl, liburi-perl, libyaml-syck-perl (>> 0.60), liblwp-useragent-determined-perl, liblog-log4perl-perl +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Bastian Blank +Standards-Version: 3.8.0 + +Package: svk +Architecture: all +Depends: ${perl:Depends}, ${misc:Depends}, subversion, perl (>> 5.10), libalgorithm-annotate-perl, libalgorithm-diff-perl (>> 1.19.01), libapp-cli-perl, libclass-accessor-perl, libclass-autouse-perl (>> 1.15), libclass-data-inheritable-perl, libcompress-zlib-perl, libdata-hierarchy-perl (>> 0.30), libfile-spec-perl (>> 3.17), libfreezethaw-perl, libio-digest-perl, liblist-moreutils-perl, liblocale-maketext-lexicon-perl (>> 0.62), libpath-class-perl (>> 0.16), libperlio-eol-perl (>> 0.13), libperlio-via-dynamic-perl (>> 0.11), libperlio-via-symlink-perl (>> 0.02), libpod-escapes-perl, libpod-simple-perl, libsvn-mirror-perl (>> 0.71), libsvn-simple-perl (>> 0.27), libterm-readkey-perl, libuniversal-require-perl, liburi-perl, libyaml-syck-perl (>> 0.60), liblwp-useragent-determined-perl, liblog-log4perl-perl +Suggests: gnupg +Description: A Distributed Version Control System + svk is a decentralized version control system written in Perl. + It uses the Subversion filesystem but provides additional features: + * Offline operations like checkin, log, merge. + * Distributed branches. + * Lightweight checkout copy management (no .svn directories). + * Advanced merge algorithms, like star-merge and cherry picking. --- svk-2.2.1.orig/debian/rules +++ svk-2.2.1/debian/rules @@ -0,0 +1,96 @@ +#!/usr/bin/make -f + +SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p') +VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p') +VERSION := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,^[0-9]*:,,' -e 's,-[^-]*$$,,') + +# If set to a true value then MakeMaker's prompt function will +# always return the default without waiting for user input. +export PERL_MM_USE_DEFAULT=1 +export PERL_EXTUTILS_AUTOINSTALL=--skip + +PACKAGE = $(shell dh_listpackages) + +ifndef PERL +PERL = /usr/bin/perl +endif + +TMP = $(CURDIR)/debian/$(PACKAGE) + +build: build-stamp +build-stamp: + dh_testdir + + $(PERL) Makefile.PL INSTALLDIRS=vendor + $(MAKE) + -$(MAKE) test + + touch $@ + +clean: + dh_testdir + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + + $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr + + cp contrib/svk-completion.pl $(TMP)/usr/bin/svk-completion + chmod 755 $(TMP)/usr/bin/svk-completion + mkdir -p $(TMP)/etc/bash_completion.d + echo "complete -C /usr/bin/svk-completion.pl -o default svk" > \ + $(TMP)/etc/bash_completion.d/svk + + [ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5 + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot +# dh_installcron +# dh_installmenu +# dh_installexamples + dh_installdocs README + dh_installchangelogs CHANGES + dh_perl + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +maintainerclean: + rm -rf $(filter-out .svn .svk debian, $(wildcard * .[^.]*)) + +DIR_ORIG = ../orig/$(SOURCE)-$(VERSION) +TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz +TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME))) + +orig: $(DIR_ORIG) + rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ . + +$(DIR_ORIG): +ifeq ($(TAR_ORIG),) + $(error Cannot find orig tarball $(TAR_ORIG_NAME)) +else + mkdir -p ../orig + tar -C ../orig -xzf $(TAR_ORIG) +endif + +.PHONY: build clean binary-indep binary-arch binary --- svk-2.2.1.orig/debian/bin/genorig.py +++ svk-2.2.1/debian/bin/genorig.py @@ -0,0 +1,116 @@ +#!/usr/bin/env python + +import os, os.path, re, shutil, sys + +class Changelog(list): + _rules = r""" +^ +(?P + \w[-+0-9a-z.]+ +) +\ +\( +(?P + [^\(\)\ \t]+ +) +\) +\s+ +(?P + [-+0-9a-zA-Z.]+ +) +\; +""" + _re = re.compile(_rules, re.X) + + class Entry(object): + __slot__ = 'distribution', 'source', 'version' + + def __init__(self, distribution, source, version): + self.distribution, self.source, self.version = distribution, source, version + + def __init__(self, dir): + f = file(os.path.join(dir, "debian/changelog")) + while True: + line = f.readline() + if not line: + break + match = self._re.match(line) + if not match: + continue + self.append(self.Entry(match.group('distribution'), match.group('source'), match.group('version'))) + +class GenOrig(object): + log = sys.stdout.write + + def __init__(self, root, orig, input_tar, version): + self.orig, self.input_tar, self.version = orig, input_tar, version + + changelog = Changelog(root) + self.source = changelog[0].source + + def __call__(self): + import tempfile + self.dir = tempfile.mkdtemp(prefix = 'genorig', dir = 'debian') + try: + self.orig_dir = "%s-%s" % (self.source, self.version) + self.orig_tar = "%s_%s.orig.tar.gz" % (self.source, self.version) + + self.do_upstream() + self.do_orig() + finally: + shutil.rmtree(self.dir) + + def do_upstream(self): + self.log("Extracting tarball %s\n" % self.input_tar) + match = re.match(r'(^|.*/)(?P[^/]+)\.(t|tar\.)(?P(gz|bz2))$', self.input_tar) + if not match: + raise RuntimeError("Can't identify name of tarball") + cmdline = ['tar -xf', self.input_tar, '-C', self.dir] + extension = match.group('extension') + if extension == 'bz2': + cmdline.append('-j') + elif extension == 'gz': + cmdline.append('-z') + if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]): + raise RuntimeError("Can't extract tarball") + os.rename(os.path.join(self.dir, match.group('dir')), os.path.join(self.dir, self.orig_dir)) + + def do_orig(self): + self.log("Generating tarball %s\n" % self.orig_tar) + out = os.path.join(self.orig, self.orig_tar) + + try: + os.mkdir(self.orig) + except OSError: pass + try: + os.stat(out) + except OSError: pass + else: + raise RuntimeError("Destination already exists (%s)" % out) + + cmdline = ['tar -czf', out, '-C', self.dir, self.orig_dir] + try: + if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' '.join(cmdline)]): + raise RuntimeError("Can't patch source") + os.chmod(out, 0644) + except: + try: + os.unlink(out) + except OSError: + pass + raise + +if __name__ == '__main__': + from optparse import OptionParser + p = OptionParser(usage = "%prog TAR VERSION") + options, args = p.parse_args(sys.argv) + + if len(args) < 2: + raise RuntimeError("Need more arguments") + + root = os.path.realpath(os.path.join(sys.path[0], '..', '..')) + orig = os.path.realpath(os.path.join(root, '..', 'orig')) + input_tar = args[1] + version = args[2] + + GenOrig(root, orig, input_tar, version)()