Rob Browning [Sun, 5 Dec 2010 18:46:41 +0000 (12:46 -0600)]
Add "*.pyc" to .gitignore.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 5 Dec 2010 18:46:40 +0000 (12:46 -0600)]
Use "log -n1" instead of "show" to retrieve commit log information.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Rob Browning [Sun, 5 Dec 2010 18:46:38 +0000 (12:46 -0600)]
Remove unused commit_msg variable from git-dch.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Guido Günther [Fri, 3 Dec 2010 17:19:30 +0000 (18:19 +0100)]
Fix off by one error by not counting
Thanks: Olivier Aubert for pointing this out
Guido Günther [Thu, 25 Nov 2010 10:55:24 +0000 (11:55 +0100)]
Also allow for 'issue' as bugnumber prefix
as used in Grml.
Guido Günther [Tue, 16 Nov 2010 12:31:44 +0000 (13:31 +0100)]
Document changes and release 0.5.11
Guido Günther [Fri, 3 Sep 2010 11:07:10 +0000 (13:07 +0200)]
Add logging functions
This allows us to color and prefix the output.
Closes: #544332
Guido Günther [Mon, 8 Nov 2010 08:33:30 +0000 (09:33 +0100)]
Fix download location
Thanks: Rob Browning
Benoît Knecht [Tue, 26 Oct 2010 14:11:36 +0000 (16:11 +0200)]
Expand environment variables and '~' in gbp.conf paths
Options that expect a path in gbp.conf can now be given as
'~/path/to/dir' or '$HOME/path/to/dir' (or any other environment
variable for that matter).
Closes: #545692
Guido Günther [Thu, 14 Oct 2010 20:48:42 +0000 (22:48 +0200)]
Don't put generated gbp/gbp_version.py into the source package
Guido Günther [Thu, 7 Oct 2010 07:27:21 +0000 (09:27 +0200)]
Merge branch 'master' into experimental
Yaroslav Halchenko [Wed, 29 Sep 2010 18:56:09 +0000 (14:56 -0400)]
Document --git-overlay
Closes: #598530
Guido Günther [Wed, 29 Sep 2010 15:24:10 +0000 (17:24 +0200)]
Makes uscan options explicit
Closes; #596003
Thanks: Chris Butler
Guido Günther [Wed, 29 Sep 2010 15:09:02 +0000 (17:09 +0200)]
Fall back to source only changes file
if the architecture one doesn't exist.
Closes: #593598
Guido Günther [Mon, 27 Sep 2010 07:47:04 +0000 (09:47 +0200)]
Document changes and release 0.5.10
Guido Günther [Mon, 27 Sep 2010 07:46:16 +0000 (09:46 +0200)]
Cleanup generated manpage
Git-Dch: Ignore
Guido Günther [Mon, 27 Sep 2010 07:42:48 +0000 (09:42 +0200)]
Warn if not invoked by git-buildpackage
git-pbuilder is supposed to be invoked by git-buildpackage. Otherwise
things like export-dir aren't respected.
Closes: #596625
Guido Günther [Fri, 17 Sep 2010 17:52:32 +0000 (19:52 +0200)]
Add --[no]-interactive to avoid prompts
Matthijs Kooijman [Thu, 19 Aug 2010 10:33:02 +0000 (12:33 +0200)]
Let git-import-orig find the changelog when not on the debian-branch.
When no changelog file is available in the checkout, look for the
changelog in the repository. This allows for using git-import-orig when
the upstream branch is checked out, for example.
Matthijs Kooijman [Wed, 23 Dec 2009 09:01:49 +0000 (10:01 +0100)]
Ask the user for the package name and version if needed.
If there is no debian/changelog to find the source package name, and/or
the upstream version was not given on the commandline, ask the user for
them. The values guessed from the original tarball name are offered as
defaults to the user. Previously, this guessed version was used without
confirmation.
The source package name is now always taken from debian/changelog or
prompted for, even when it might not be used (when importing a directory
instead of a tarball, for example). This makes the code more
straightforward and less errorprone in the future.
Closes: #479172
Matthijs Kooijman [Thu, 19 Aug 2010 11:37:31 +0000 (13:37 +0200)]
Allow passing --quiet to git show.
Git-Dch: Ignore
Guido Günther [Fri, 17 Sep 2010 08:43:16 +0000 (10:43 +0200)]
Document changes and release 0.5.9
Guido Günther [Thu, 16 Sep 2010 07:49:42 +0000 (09:49 +0200)]
Don't fail on missing debian/rules
LP: #638371
Guido Günther [Tue, 14 Sep 2010 08:34:20 +0000 (10:34 +0200)]
Improve compression format detection
by checking if a version is already on the pristine-tar branch and use
it's compression type if found.
LP: #615212
Guido Günther [Tue, 14 Sep 2010 06:52:39 +0000 (08:52 +0200)]
Avoid unnecessary branch switch
when fixing the previous issues.
LP: #637286
Guido Günther [Mon, 13 Sep 2010 18:53:20 +0000 (20:53 +0200)]
Switch to debian branch before forcing the HEAD update
otherwise we might forward the current branch to another branch's ref.
Thanks: Rolf Leggewie for the testcase
Guido Günther [Thu, 2 Sep 2010 20:12:10 +0000 (22:12 +0200)]
Add --git-arch option
Guido Günther [Thu, 2 Sep 2010 06:48:40 +0000 (08:48 +0200)]
Resync with git-pbuilder 0.16
Closes: #595055
Guido Günther [Wed, 1 Sep 2010 08:57:48 +0000 (10:57 +0200)]
Document changes and release 0.5.8
Guido Günther [Tue, 31 Aug 2010 11:35:44 +0000 (13:35 +0200)]
Don't hardcode package name
Guido Günther [Tue, 31 Aug 2010 09:23:36 +0000 (11:23 +0200)]
Fix exception name
so we don't fail on repos without tags.
Guido Günther [Tue, 31 Aug 2010 08:15:41 +0000 (10:15 +0200)]
Remove file and commit ambiguity
Guido Günther [Sun, 29 Aug 2010 16:05:11 +0000 (18:05 +0200)]
Properly handle local only changes as no update needed
Svend Sorensen [Tue, 24 Aug 2010 22:15:48 +0000 (15:15 -0700)]
Fix --git-cleaner option name in git-buildpackage man page
git-cleaner option is misspelled as git-cleander in description of
git-pbuilder option in the git-buildpackage man page.
Closes: #594612
Guido Günther [Tue, 24 Aug 2010 17:24:06 +0000 (19:24 +0200)]
Simple helper to tag a version if using git-svn
Matthijs Kooijman [Thu, 19 Aug 2010 12:26:04 +0000 (14:26 +0200)]
Don't call stdout stdin.
Git-Dch: Ignore
Guido Günther [Wed, 18 Aug 2010 16:19:30 +0000 (18:19 +0200)]
Document changes and release 0.5.7
Guido Günther [Wed, 18 Aug 2010 16:02:40 +0000 (18:02 +0200)]
Use --pretty=format: instead of --format=
to support the git version in Lenny.
Guido Günther [Wed, 18 Aug 2010 15:54:26 +0000 (17:54 +0200)]
Check for greater not unequal when looking for a new upstream version
Guido Günther [Sun, 15 Aug 2010 18:19:41 +0000 (20:19 +0200)]
Catch KeyboardInterrupt
Guido Günther [Sun, 15 Aug 2010 18:17:43 +0000 (20:17 +0200)]
Don't fail on gbp_version import errors
This makes it easier to test from the source tree without starting a
build first.
Guido Günther [Sat, 14 Aug 2010 08:59:54 +0000 (10:59 +0200)]
Fix bug number
Git-Dch: Ignore
Guido Günther [Sat, 14 Aug 2010 08:36:38 +0000 (10:36 +0200)]
Update copyright file
Guido Günther [Sat, 14 Aug 2010 08:31:54 +0000 (10:31 +0200)]
Recommend cowbuilder
Guido Günther [Sat, 14 Aug 2010 08:31:28 +0000 (10:31 +0200)]
Check for cowbuilder
The cowbuilder package depends on pbuilder so this is enough.
Guido Günther [Sat, 14 Aug 2010 08:31:18 +0000 (10:31 +0200)]
Only output dist if set.
Guido Günther [Fri, 13 Aug 2010 23:27:03 +0000 (01:27 +0200)]
Document changes and release 0.5.6
Guido Günther [Fri, 13 Aug 2010 17:31:27 +0000 (19:31 +0200)]
When creating a new base image don't fail if it's missing
Guido Günther [Thu, 12 Aug 2010 21:37:32 +0000 (23:37 +0200)]
Document changes and release 0.5.5
Guido Günther [Thu, 12 Aug 2010 20:06:32 +0000 (22:06 +0200)]
Guess changelog version number from upstream version
Guido Günther [Thu, 12 Aug 2010 20:05:40 +0000 (22:05 +0200)]
Move DpkgCompareVersions and add compare_versions
Git-Dch: Ignore
Guido Günther [Thu, 12 Aug 2010 18:34:00 +0000 (20:34 +0200)]
Silence compression type detection
Git-Dch: Ignore
Guido Günther [Thu, 12 Aug 2010 18:32:48 +0000 (20:32 +0200)]
Missing manpage fix
Git-Dch: Ignore
Guido Günther [Thu, 12 Aug 2010 18:09:49 +0000 (20:09 +0200)]
Add --git-pbuilder and --git-dist=<dist> options
Guido Günther [Thu, 12 Aug 2010 16:37:06 +0000 (18:37 +0200)]
Build and install git-pbuilder manpage
Guido Günther [Thu, 12 Aug 2010 16:15:50 +0000 (18:15 +0200)]
Simplify example using --download
Guido Günther [Thu, 12 Aug 2010 16:05:40 +0000 (18:05 +0200)]
Use git-pbuilder in the pbuilder chapter
Guido Günther [Thu, 12 Aug 2010 15:55:12 +0000 (17:55 +0200)]
Deprecate our own pbuilder helpers
Guido Günther [Wed, 11 Aug 2010 13:48:00 +0000 (15:48 +0200)]
Add git-pbuilder
Thanks: Russ Allbery
Closes: #583078
Guido Günther [Tue, 10 Aug 2010 15:47:24 +0000 (17:47 +0200)]
Check for legacy tags where necessary.
Guido Günther [Thu, 5 Aug 2010 02:26:44 +0000 (22:26 -0400)]
Better version number replacement
Closes: #534494
Guido Günther [Mon, 9 Aug 2010 14:56:29 +0000 (16:56 +0200)]
Pass dch_options to all calls of spawn_dch
This fixes the problem of an empty [maintainer] at the end of the
changelog section.
Thanks: Michael Prokop
Guido Günther [Thu, 5 Aug 2010 00:26:41 +0000 (20:26 -0400)]
Support --nmu, --bpo and --qa
Closes; #534494
Guido Günther [Tue, 10 Aug 2010 15:44:51 +0000 (17:44 +0200)]
Catch GitRepositoryErrors
for less Python exceptions
Git-Dch: Ignore
Guido Günther [Tue, 10 Aug 2010 15:37:27 +0000 (17:37 +0200)]
Remove duplicate check
Git-Dch: Ignore
Guido Günther [Fri, 6 Aug 2010 21:09:47 +0000 (17:09 -0400)]
Document changes and release 0.5.4
Guido Günther [Fri, 6 Aug 2010 17:55:53 +0000 (13:55 -0400)]
Pass --multimaint-merge on to dch
Closes: #586165
Guido Günther [Fri, 6 Aug 2010 14:42:56 +0000 (10:42 -0400)]
Don't add superflous parents to imports on the Debian branch
Only set a parent on the first import per upstream version.
Guido Günther [Wed, 4 Aug 2010 20:41:55 +0000 (16:41 -0400)]
We don't only support .gz tarballs
Guido Günther [Wed, 4 Aug 2010 19:26:13 +0000 (15:26 -0400)]
Don't update already up to date branches
Guido Günther [Wed, 4 Aug 2010 13:50:39 +0000 (09:50 -0400)]
Bump standards version
Guido Günther [Wed, 4 Aug 2010 01:41:23 +0000 (21:41 -0400)]
Drop git_load_dirs reference
we're not using it anymore.
Guido Günther [Wed, 4 Aug 2010 00:09:53 +0000 (20:09 -0400)]
Use the maintainer of the Debian package as fallback patch author
Guido Günther [Mon, 2 Aug 2010 20:10:26 +0000 (22:10 +0200)]
Document changes and release 0.5.3
Guido Günther [Mon, 2 Aug 2010 20:12:31 +0000 (22:12 +0200)]
Don't compress example scripts
Git-Dch: Ignore
Guido Günther [Mon, 2 Aug 2010 19:58:04 +0000 (21:58 +0200)]
Don't insert a dot if the second line starts with a punctuation
Git-Dch: Ignore
Guido Günther [Mon, 2 Aug 2010 18:29:44 +0000 (20:29 +0200)]
Fetch all snapshots from snapshots.debian.org
using debsnap and import them
Closes: #591218
Guido Günther [Fri, 30 Jul 2010 09:18:49 +0000 (11:18 +0200)]
Simple helper to create remote repos
based on dom-new-git-repo from the OCaml maintainers as well as
aa-create-repo.
Closes: #540185
Guido Günther [Tue, 27 Jul 2010 18:23:52 +0000 (20:23 +0200)]
Adjust for zeitgeist 0.4.0
Guido Günther [Fri, 23 Jul 2010 10:50:36 +0000 (12:50 +0200)]
Set author information from git on --release when using --git-author
Thanks: Boleslaw Tokarski for his feedback
Guido Günther [Fri, 23 Jul 2010 09:43:49 +0000 (11:43 +0200)]
Use repo.rev_parse
Git-Dch: Ignore
Guido Günther [Fri, 23 Jul 2010 09:35:57 +0000 (11:35 +0200)]
Add git-author
Git-Dch: Ignore
Guido Günther [Thu, 22 Jul 2010 18:04:31 +0000 (20:04 +0200)]
Better document the default config file
Guido Günther [Wed, 21 Jul 2010 16:26:29 +0000 (18:26 +0200)]
Terminate the patch description with a dot
in case of multiline commits where the second line starts with a
uppercase letter. Heavily based on a patch by Jonathan Nieder.
Guido Günther [Tue, 20 Jul 2010 20:14:06 +0000 (22:14 +0200)]
Document changes and release 0.5.2
Guido Günther [Tue, 20 Jul 2010 19:31:38 +0000 (21:31 +0200)]
Document changes and release 0.5.1
Guido Günther [Tue, 20 Jul 2010 19:14:13 +0000 (21:14 +0200)]
Bump standards version
Jonathan Nieder [Tue, 6 Jul 2010 08:22:51 +0000 (03:22 -0500)]
Add prebuild hook
Can be used to add an upstream changelog generated from the
git repository to the build dir.
Closes: #587652
Guido Günther [Mon, 5 Jul 2010 20:02:29 +0000 (22:02 +0200)]
Document changes and release 0.5.0
Guido Günther [Sun, 4 Jul 2010 18:03:15 +0000 (20:03 +0200)]
Use commit_dir instead of replace_tree
Closes: #526022, #569031
Guido Günther [Sat, 3 Jul 2010 21:33:50 +0000 (23:33 +0200)]
Drop --no-merge
We don't invoke 'git merge' anymore.
Guido Günther [Fri, 2 Jul 2010 18:05:04 +0000 (20:05 +0200)]
Use commit_dir
to write directly commit the content of the unpacked orig tarball and the
patched Debian tree instead of using replace_tree.
Closes: #506211, #588061
Thanks: Roger Leigh for his nice explantion on howto do this.
Guido Günther [Sat, 3 Jul 2010 21:30:38 +0000 (23:30 +0200)]
Add force_head
Git-Dch: Ignore
Guido Günther [Fri, 2 Jul 2010 18:02:29 +0000 (20:02 +0200)]
Add commit_dir and helpers
Allows to commit an unpacked tree to a specific branch with any number
of parents.
Git-Dch: Ignore
Guido Günther [Fri, 2 Jul 2010 17:56:01 +0000 (19:56 +0200)]
Allow git_write_tree to use an alternate index file
Git-Dch: Ignore
Guido Günther [Fri, 2 Jul 2010 17:54:10 +0000 (19:54 +0200)]
Allow to pass extra_env to __git_getoutput and __git_inout
Git-Dch: Ignore
Guido Günther [Fri, 2 Jul 2010 17:54:43 +0000 (19:54 +0200)]
Add __git_inout
to send data to stdin of a git command and receive it's output. Only for
small amounts of output data such as a SHA1.
Git-Dch: Ignore
Guido Günther [Fri, 2 Jul 2010 17:52:47 +0000 (19:52 +0200)]
Add extra_env to GitTag
Git-Dch: Ignore
Guido Günther [Fri, 2 Jul 2010 17:53:26 +0000 (19:53 +0200)]
Import GbpError since we're using it
Git-Dch: Ignore
twerner@debian.org [Wed, 30 Jun 2010 19:24:19 +0000 (21:24 +0200)]
fix typo