--- trac-git-0.0.20080710/debian/changelog 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/changelog 2009-05-11 11:32:43.000000000 -0400 @@ -1,3 +1,40 @@ +trac-git (0.0.20090320-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #374946), remaining changes: + - debian/rules: Python 2.6 transition + + Include /usr/share/python/python.mk. + + Pass $(py_setup_install_args) macro to setup.py install. + + -- Michael Terry Mon, 11 May 2009 11:23:53 -0400 + +trac-git (0.0.20090320-1) unstable; urgency=low + + * New upstream snapshot. + * debian/gbp.conf: Removed no-create-orig line. + * debian/rules: Upped DATE. + * debian/README.source: Added. + * debian/control: Bumped Standards-Version to 3.8.1. (No changes) + * debian/patches/: + + 0002-Prevent-leaving-processes-open-and-running.patch: Removed, fixed + upstream. + + 0001-Make-setup.py-by-not-installing-COPYING-or-README.patch: Updated. + + -- Jonny Lamb Fri, 20 Mar 2009 16:31:31 +0000 + +trac-git (0.0.20090217-1) unstable; urgency=low + + * New upstream release. + * debian/gbp.conf: Added git-buildpackage config file. + * debian/README.Debian: Use my debian.org email address. + * debian/update-patches.mk: Added. + * debian/rules: + + Include update-patches.mk. + + Added get-orig-source target. + * debian/patches/01-r4147-add-previous_rev_argument.diff: Removed: already + upstream. + + -- Jonny Lamb Tue, 17 Feb 2009 20:17:52 +0000 + trac-git (0.0.20080710-3ubuntu1) jaunty; urgency=low * Python 2.6 transition: --- trac-git-0.0.20080710/debian/control 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/control 2009-05-11 11:32:43.000000000 -0400 @@ -5,7 +5,7 @@ Priority: optional Build-Depends: debhelper (>= 5.0), quilt (>= 0.40) Build-Depends-Indep: python, python-central (>= 0.5), python-setuptools -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 XS-Python-Version: 2.5 Homepage: http://trac-hacks.org/wiki/GitPlugin Vcs-Git: git://git.jonnylamb.com/git/packaging/trac-git.git --- trac-git-0.0.20080710/debian/gbp.conf 1969-12-31 19:00:00.000000000 -0500 +++ trac-git-0.0.20090320/debian/gbp.conf 2009-05-11 11:32:43.000000000 -0400 @@ -0,0 +1,8 @@ +[DEFAULT] +debian-branch = debian +upstream-branch = upstream +pristine-tar = True + +[git-buildpackage] +tarball-dir = ../tarballs/ +export-dir = ../build-area/ --- trac-git-0.0.20080710/debian/patches/0001-Make-setup.py-by-not-installing-COPYING-or-README.patch 1969-12-31 19:00:00.000000000 -0500 +++ trac-git-0.0.20090320/debian/patches/0001-Make-setup.py-by-not-installing-COPYING-or-README.patch 2009-05-11 11:32:43.000000000 -0400 @@ -0,0 +1,22 @@ +From 89f443e93dd6d980b4ff2384562547aef8e5014e Mon Sep 17 00:00:00 2001 +From: Jonny Lamb +Date: Tue, 17 Feb 2009 19:59:51 +0000 +Subject: [PATCH] Make setup.py by not installing COPYING or README. + +debhelper does this for us automatically. + +Signed-off-by: Jonny Lamb +--- + 0.11/setup.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/0.11/setup.py b/0.11/setup.py +index 1c7c0f4..54856d5 100755 +--- a/0.11/setup.py ++++ b/0.11/setup.py +@@ -20,4 +20,4 @@ setup( + packages=['tracext', 'tracext.git'], + namespace_packages=['tracext'], + entry_points = {'trac.plugins': 'git = tracext.git.git_fs'}, +- data_files=['COPYING','README']) ++ exclude_package_data={'':['COPYING','README']}) --- trac-git-0.0.20080710/debian/patches/00-fix-setup.py.diff 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/patches/00-fix-setup.py.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -diff -Nruad -Nruad trac-git-0.0.20080710.orig/0.11/setup.py trac-git-0.0.20080710/0.11/setup.py ---- trac-git-0.0.20080710.orig/0.11/setup.py 2008-09-30 17:00:21.000000000 +0100 -+++ trac-git-0.0.20080710/0.11/setup.py 2008-09-30 17:29:09.000000000 +0100 -@@ -20,4 +20,4 @@ - packages=['tracext', 'tracext.git'], - namespace_packages=['tracext'], - entry_points = {'trac.plugins': 'git = tracext.git.git_fs'}, -- data_files=['COPYING','README']) -+ exclude_package_data={'':['COPYING','README']}) --- trac-git-0.0.20080710/debian/patches/01-r4147-add-previous_rev_argument.diff 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/patches/01-r4147-add-previous_rev_argument.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,14 +0,0 @@ -http://trac-hacks.org/changeset/4147 - -diff -Nruad -Nruad trac-git-0.0.20080710.orig/0.11/tracext/git/git_fs.py trac-git-0.0.20080710/0.11/tracext/git/git_fs.py ---- trac-git-0.0.20080710.orig/0.11/tracext/git/git_fs.py 2008-09-30 17:00:21.000000000 +0100 -+++ trac-git-0.0.20080710/0.11/tracext/git/git_fs.py 2008-09-30 17:01:03.000000000 +0100 -@@ -249,7 +249,7 @@ - def next_rev(self, rev, path=''): - return self.git.hist_next_revision(rev) - -- def previous_rev(self, rev): -+ def previous_rev(self, rev, path=''): - return self.git.hist_prev_revision(rev) - - def rev_older_than(self, rev1, rev2): --- trac-git-0.0.20080710/debian/patches/02-508019-defunct-processes.diff 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/patches/02-508019-defunct-processes.diff 1969-12-31 19:00:00.000000000 -0500 @@ -1,47 +0,0 @@ -See http://trac-hacks.org/ticket/3675 - -diff -Nruad -x .git -Nruad trac-git-0.0.20080710.orig/0.11/tracext/git/PyGIT.py trac-git-0.0.20080710/0.11/tracext/git/PyGIT.py ---- trac-git-0.0.20080710.orig/0.11/tracext/git/PyGIT.py 2008-12-09 22:25:33.000000000 +0000 -+++ trac-git-0.0.20080710/0.11/tracext/git/PyGIT.py 2008-12-09 22:27:33.000000000 +0000 -@@ -15,6 +15,8 @@ - from __future__ import with_statement - - import os, re, sys, time, weakref -+from StringIO import StringIO -+from subprocess import * - from collections import deque - from functools import partial - from threading import Lock -@@ -40,12 +42,16 @@ - cmd.append('--git-dir=%s' % self.__git_dir) - cmd.append(gitcmd) - cmd.extend(args) -+ strcmd = " ".join(cmd) - - #print >>sys.stderr, "GitCore '%s'" % str(cmd) -- return os.popen3(cmd) # (input, output, error) -+ return Popen(strcmd, shell=True, bufsize=0, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True) - - def __execute(self, git_cmd, *cmd_args): -- return self.__execute2(git_cmd, *cmd_args)[1] -+ file = self.__execute2(git_cmd, *cmd_args) -+ str = StringIO(file.stdout.read()) -+ file.wait() -+ return str - - def __getattr__(self, name): - return partial(self.__execute, name.replace('_','-')) -@@ -469,8 +475,11 @@ - rev = str(rev) # paranoia - if path.startswith('/'): - path = path[1:] -- return [e.split(None, 3) for e in \ -- self.repo.ls_tree("-z", rev, "--", path).read().split('\0') if e] -+ if path == "": -+ tree = self.repo.ls_tree("-z", rev) -+ else: -+ tree = self.repo.ls_tree("-z", rev, "--", path) -+ return [e.split(None, 3) for e in tree.read().split('\0') if e] - - def read_commit(self, commit_id): - if not commit_id: --- trac-git-0.0.20080710/debian/patches/series 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/patches/series 2009-05-11 11:32:43.000000000 -0400 @@ -1,3 +1 @@ -00-fix-setup.py.diff -01-r4147-add-previous_rev_argument.diff -02-508019-defunct-processes.diff +0001-Make-setup.py-by-not-installing-COPYING-or-README.patch --- trac-git-0.0.20080710/debian/README.Debian 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/README.Debian 2009-05-11 11:32:43.000000000 -0400 @@ -71,4 +71,4 @@ # default: 'git' git_bin = /usr/src/git-dev/git - -- Jonny Lamb Fri, 11 Jul 2008 01:59:37 +0100 + -- Jonny Lamb Fri, 11 Jul 2008 01:59:37 +0100 --- trac-git-0.0.20080710/debian/README.source 1969-12-31 19:00:00.000000000 -0500 +++ trac-git-0.0.20090320/debian/README.source 2009-05-11 11:32:43.000000000 -0400 @@ -0,0 +1,58 @@ +Patches +======= + +This package occasionally uses quilt to store modifications to the upstream +source, although in most uploads no patches are needed. + +To get the fully patched source: make -f debian/rules patch + +To revert to what's in git: make -f debian/rules unpatch + +To add a patch: obtain a diff and put it in debian/patches, or see below + +To remove an existing patch: delete it from debian/patches + +Packaging using git +=================== + +The repository contains an appropriate debian/gbp.conf to build this package +using git-buildpackage. The debian branch contains the latest upstream versions +(for unstable, or experimental while a freeze is in progress). The debian- +branch contains versions targeted for a specific release (lenny, squeeze, etc.) + +Here's how to build it: + + git clone git://git.jonnylamb.com/git/packaging/trac-git.git + cd trac-git + git checkout debian + git-buildpackage -us -uc + +or for testing/stable branches like debian-lenny: + + git clone git://git.jonnylamb.com/git/packaging/trac-git.git + cd trac-git + git checkout debian-lenny + git-buildpackage -us -uc --git-debian-branch=debian-lenny + +The branch 'upstream' is a copy of the contents of upstream tarballs. To import +upstream tarballs use: + + git checkout debian + git-import-orig ~/trac-git-0.7.x.tar.gz + +The branch 'debian-patches' is 'upstream' plus any patches needed for Debian. +It should be rebased on 'upstream' after each upstream release: + + git checkout debian-patches + git rebase upstream + +The preferred way of adding patches is to make a commit to the debian-patches +branch: + + git checkout debian-patches + + git commit + git checkout debian + fakeroot debian/rules update-patches + + -- Jonny Lamb , Sat, 7 Mar 2009 17:55:11 +0000 --- trac-git-0.0.20080710/debian/rules 2009-05-11 11:32:43.000000000 -0400 +++ trac-git-0.0.20090320/debian/rules 2009-05-11 11:32:43.000000000 -0400 @@ -3,6 +3,7 @@ PYVER=$(shell python -c 'import sys; print sys.version[:3]') include /usr/share/python/python.mk +include $(CURDIR)/debian/update-patches.mk include /usr/share/quilt/quilt.make clean: unpatch @@ -31,8 +32,8 @@ dh_installdirs cd 0.11 && python setup.py install \ --root=$(CURDIR)/debian/trac-git \ - --single-version-externally-managed - $(py_setup_install_args) \&& cd .. + --single-version-externally-managed \ + $(py_setup_install_args) && cd .. binary-indep: build install dh_testdir @@ -51,4 +52,10 @@ binary: binary-indep binary-arch +DATE := 20090320 +get-orig-source: + svn export http://trac-hacks.org/svn/gitplugin ../trac-git-0.0.$(DATE) + tar pczf ../trac-git_0.0.$(DATE).orig.tar.gz ../trac-git-0.0.$(DATE) + rm -rf ../trac-git-0.0.$(DATE) + .PHONY: build clean binary-indep binary-arch binary install configure --- trac-git-0.0.20080710/debian/update-patches.mk 1969-12-31 19:00:00.000000000 -0500 +++ trac-git-0.0.20090320/debian/update-patches.mk 2009-05-11 11:32:43.000000000 -0400 @@ -0,0 +1,12 @@ +update-patches: + mkdir -p $(CURDIR)/debian/patches + rm -f $(CURDIR)/debian/patches/*.patch + rm $(CURDIR)/debian/patches/series + git format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream + for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \ + do \ + lines=$$(cat $$patch | wc -l) ; \ + head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \ + mv $${patch}.chomped $$patch ; \ + echo $$(basename $${patch}) >> $(CURDIR)/debian/patches/series ; \ + done