bzr-builddeb

Merge lp:~gz/bzr-builddeb/trivial_setup into lp:bzr-builddeb

  1. trivial_setup
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 614
Merged at revision: 617
Proposed branch: lp:~gz/bzr-builddeb/trivial_setup
Merge into: lp:bzr-builddeb
Diff against target: 16 lines (+2/-1)
2 files modified
.bzrignore (+1/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~gz/bzr-builddeb/trivial_setup
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+77576@code.launchpad.net

Description of the change

Trivial changes to work a little nicer when using setup.py to install rather than running straight from the directory. Changes python2.4 -> python in shebang, sets executable bit, and adds distutils build dir to the ignored list.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-01-28 14:18:07 +0000
3+++ .bzrignore 2011-09-29 17:49:17 +0000
4@@ -1,1 +1,2 @@
5 .testrepository
6+./build
7
8=== modified file 'setup.py' (properties changed: -x to +x)
9--- setup.py 2011-03-14 21:52:05 +0000
10+++ setup.py 2011-09-29 17:49:17 +0000
11@@ -1,4 +1,4 @@
12-#!/usr/bin/env python2.4
13+#!/usr/bin/env python
14 #
15 # setup.py -- Install the bzr-builddeb plugin
16 # Copyright (C) 2006 James Westby <jw+debian@jameswestby.net>

Subscribers

People subscribed via source and target branches