diff options
| author | wangbiao <biao716.wang@samsung.com> | 2024-03-28 16:17:03 +0900 |
|---|---|---|
| committer | wangbiao <biao716.wang@samsung.com> | 2024-03-28 16:17:03 +0900 |
| commit | 5055188da316c31c44cfec89d4e63d9fa8af5e32 (patch) | |
| tree | e37a0a8c46c9ed33fe4057f6b0d17426d043b548 | |
| parent | 46ac7afdb40f1e453a2c4731782055a03661cf20 (diff) | |
| download | git-buildpackage-sandbox/wangbiao/gbp_test_0_9_29.tar.gz git-buildpackage-sandbox/wangbiao/gbp_test_0_9_29.tar.bz2 git-buildpackage-sandbox/wangbiao/gbp_test_0_9_29.zip | |
add debian and packagingsandbox/wangbiao/gbp_test_0_9_29
Change-Id: Iff89a9b763a2e7621d77140f58e9cc44896af57a
Signed-off-by: wangbiao <biao716.wang@samsung.com>
26 files changed, 5282 insertions, 0 deletions
diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 00000000..51949892 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,66 @@ +git-buildpackage (0.6.9) unstable; urgency=medium + + This version changes the default of the cleaner options from 'debuild clean' + to a noop ('/bin/true'). If you want to retain the old behaviour you can still + configure it via gbp.conf. For more details see #670624. + + -- Guido Günther <agx@sigxcpu.org> Sun, 05 Jan 2014 15:52:39 +0100 + +git-buildpackage (0.6.0) unstable; urgency=low + + In order to provide a more consistent and git like interface a new gbp super + command was added as a front end to all git-* and gbp-* commands. So what was + either git-<command> or gbp-<command> is now + + gbp <command> + + The old commands are still provided for backward compatibility but will be + removed in a future release so please update any scripts and tools relying on + it. + + -- Guido Günther <agx@sigxcpu.org> Wed, 26 Jun 2013 13:38:16 +0200 + +git-buildpackage (0.4.61) unstable; urgency=low + + In order to not override dpkg-buildpackge's defaults for 3.0 source packages + the default builder command is now "debuild -i -I" instead of "debuild + -i\.git/ -I.git". If you want to retain the old behaviour please adjust your + gbp.conf accordingly. + + -- Guido Günther <agx@sigxcpu.org> Sun, 22 Nov 2009 17:07:52 +0100 + +git-buildpackage (0.4.57) unstable; urgency=low + + git-import-orig dosn't generate changelog entries by default anymore. This + means you can safely remove --no-dch from all your scripts and config files. + + If you want git-import-orig to behave as before add: + postimport = dch -v%(version)s New Upstream Version + to your gbp.conf. If you want to invoke git-dch instead, you can use: + postimport = git-dch -N%(version)s -S -a + The later is recommended since it creates git-dch compatible changelog + entries. + + -- Guido Günther <agx@sigxcpu.org> Sun, 23 Aug 2009 17:21:50 +0200 + +git-buildpackage (0.3.3) unstable; urgency=low + + As of this version git-buildpackage doesn't pass hardcoded '-i\.git -I.git' + to the build command specified via --git-builder (or via the builder config + file options). So if you're not using the default build command (which is + now 'debuild -i\.git -I.git' instead of just plain 'debuild') you'll have to + add these options to your build command in order to exclude git metadata + from your diffs and source tarballs. + This was done to make the invocation of the build command more flexible, we + don't rely on debuild behaviour from now on. + Again: if you didn't change the default build command, you don't have to + change anything. + + -- Guido Guenther <agx@sigxcpu.org> Mon, 20 Aug 2007 18:08:37 +0200 + +git-buildpackage (0.2.25) unstable; urgency=low + + Generated tags are now by default put into debian/ and upstream/ namespaces. + This doesn't have any effect on already existing tags. + + -- Guido Guenther <agx@sigxcpu.org> Fri, 2 Feb 2007 15:56:12 +0100 diff --git a/debian/bug-presubj b/debian/bug-presubj new file mode 100644 index 00000000..b000c9d9 --- /dev/null +++ b/debian/bug-presubj @@ -0,0 +1,3 @@ +When reporting issues regarding git-buildpackage please run the failing command +with --git-verbose (gbp buildpackage) or --verbose (all other commands) and +provide the full output. diff --git a/debian/changelog b/debian/changelog new file mode 100755 index 00000000..2c9f2a8a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,3497 @@ +git-buildpackage (0.9.29-tizen20240328) unstable; urgency=medium + + * Upgrade to 0.9.29. + + -- Biao Wang <biao716.wang@samsung.com> Thu, 28 Mar 2024 14::32 +0800 + + +git-buildpackage (0.9.28-tizen20231130) unstable; urgency=medium + + * Fix git-buildpackage issue to adapt the librpm-tizen 4.14 version. + + -- Xu Huayong <huayong.xu@samsung.com> Thu, 30 Nov 2023 14::32 +0800 + +git-buildpackage (0.9.27-tizen20231101) unstable; urgency=medium + + * Port code from python2.x to python3.x. + * Support Ubuntu22.04 build. + * Fix some defects during runtime. + + -- Biao Wang <biao716.wang@samsung.com> Wed, 01 Nov 2023 16:50:00 +0800 + +git-buildpackage (0.9.26-tizen20221104) unstable; urgency=medium + + * update submodule url. + * Adapt Ubuntu 22.04 to upgrade the version. + + -- Biao Wang <biao716.wang@samsung.com> Fri, 14 May 2021 16:50:00 +0800 + +git-buildpackage (0.9.21-tizen20210514) unstable; urgency=medium + + * Fix export submodule source code error. + + -- Biao Wang <biao716.wang@samsung.com> Fri, 14 May 2021 16:50:00 +0800 + +git-buildpackage (0.9.20-tizen20200522) unstable; urgency=medium + + * Adapt Ubuntu 20.04 to upgrade the version. + + -- Yan Meng <yan11.meng@samsung.com> Fri, 22 May 2020 16:50:00 +0800 + +git-buildpackage (0.9.9-tizen20180912) unstable; urgency=medium + + * Adapt Ubuntu 18.04 to upgrade the version. + + -- Biao Wang <biao716.wang@samsung.com> Wed, 12 Sep 2018 16:50:00 +0800 + +git-buildpackage (0.7.5-tizen20161231) unstable; urgency=medium + + * Fix diff_status() for renames and copies + * Adapt git-merge option when git version greater then 2.9 + * Disable test_pristine_tar unittest case + + -- SoonKyu Park <sk7.park@samsung.com> Sat, 31 Dec 2016 19:30:00 +0800 + +git-buildpackage (0.7.4-tizen20160514) unstable; urgency=medium + + * Keep same version number with upstream source code ,version 0.7.4 + + -- Jun Wang <junbill.wangx@samsung.com> Sat, 14 May 2016 17:12:00 +0800 + +git-buildpackage (0.6.27-tizen20160302) unstable; urgency=medium + + * Fix error logs when __import__ faild,like "No handlers could be found fo logger" + * Fix build problem on Debian 8 + + -- Jun Wang <junbill.wangx@samsung.com> Wed, 02 Mar 2016 07:47:21 +0100 + +git-buildpackage (0.6.22-tizen20150206) unstable; urgency=low + + * Rebase on top of upstream version 0.6.22 + * Experimental support for BitBake + - Introduce import-bb tool. + This is the first tool in an effort of enabling gbp in the BitBake build + environment. Gbp-import-bb is a tool for importing packages from a + BitBake-based "combined" distro repository into individual per-package + Git repositories. + - Introduce pq-bb tool. + This is a tool for managing patch-queues for packages maintained in the + BitBake packaging format (.bb recipes). + - Introduce buildpackage-bb tool. + Initial version of the tool for building BitBake packages from Git. + NOTE: The buildpackage-bb tool itself is able to operate even without an + initialized BitBake build environment although the build likely fails in + this case. However, this makes it possible to export the packaging meta + data, for example. + - Introcude clone-bb tool. + This is a new tool for helping to clone remote per-package Git + repositories when working in BitBake-based "full distro" build + environment. This is useful in the case that individual packages are + actually maintained in per-package Git repositories (like Tizen). That + is, the full distro repository that the developer operates in is + composed of the packaging meta data from the individual per-package + repositories. When willing to contribute to a package the developer + would use clone-bb to clone the correct per-package repository and make + his changes there. + NOTE: clone-bb uses GBP_PACKAGING_REPO variable to determine the remote + repository URI. This variable should be defined in the package recipes + in order to make clone-bb usable. + - Introduce submit-bb tool. + This is a Tizen-specific tool for creating and pushing special submit + tags. + * pq-rpm: better error message + * buildpackage-rpm: look for remote upstream branches. + Consider remote branches, too, while looking for the upstream branch + when trying to guess if a package is native or not. + * rpm packaging changes + - enable CentOS 7. + - include python egg-info in -common. + * rpm: suppress stderr when unpacking src.rpm + * UpstreamSource: suppress stderr from tar in _determine_prefix() + * patchseries: strip numbering when guessing subject from filename + * Changes in logging + - don't propagate to ancestor loggers + - don't initialize handlers in GbpLogger init. + Better compatibility with 3rd party modules that have their own logging + initializations. + * Features/fixes in GitRepository + - GitRepository/__git_inout: correctly handle input error + - GitRepository.create_tag: add 'annotate' argument. + For forcing the creation of annotated tags. Causes the an editor to be + spawned if no message is given. + + -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Fri, 06 Feb 2015 10:36:26 +0200 + + * Upgrade version to 0.6.25 + + -- Rong Jinhui <jinhui.rong@samsung.com> Thu, 04 Aug 2015 08:53:30 +0800 + +git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low + + [ Markus Lehtonen ] + * Rebase on top of upstream version 0.6.15 + * Changes in buildpackage-rpm + - new 'commitish' keyword for spec vcs tag + - notify: catch RuntimeError when importing pynotify + - fix exit code in case of GitRepositoryError + - always create tarball for native packages + - check submodules from the exported treeish + - fix crash when running prebuild hook + - always run cleaner hook + - add --git-no-build option + - don't crash on invalid vcs format strings + - add '--git-native' option + - remove some outdated/unnecessary exception handling + - get rid of prepare_export_dir() + - handle invalid keys in orig prefix + - internal refactoring and fixes + * Changes in rpm-ch + - implement --commit option + - implement --commit-msg option + - rpm-ch: implement --meta-bts option + - rpm.policy: don't allow leading whitespace in bts meta tags + * docs: manpages for the rpm tools + * Misc. fixes and features + - buildpackage: refactor tarball compression + - gbp-dch: fix handling of the '--meta' option + - import-orig-rpm: download tarball into parent directory + - GitRepository/has_submodules: add treeish argument + - tristate: implement __nonzero__() method + * Logging: + - don't automatically setup gbp-specific logger + - fix auto colorizing for custom streams + * Tests + - multiple fixes and additions in ComponentTestBase class + - testutils: add directories arg to ls_* functions + - add unit tests for buildpackage-rpm + * Packaging + - rpm-packaging: recommend/require unzip + - recommend/require zipmerge + - depend/recommend rpmbuild + + [ Junchun Guan ] + * Add PKGBUILD to support arch linux + + [ Li Jinjing ] + * rpm packaging: use macro for python binary + + -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Thu, 28 Aug 2014 11:40:05 +0300 +git-buildpackage (0.6.22) unstable; urgency=medium + + * [3d8939d] git.vfs: fix close method. Preventing a infinite recursion + which can be triggered by gbp pq export --commit. + + -- Guido Günther <agx@sigxcpu.org> Wed, 29 Oct 2014 07:47:21 +0100 + +git-buildpackage (0.6.21) unstable; urgency=medium + + * [81dab4b] pq: Don't fail commit if the series file is empty on the source + branch + * [740e431] man: fix option argument for --git-pbuilder-options + * [22a6987] Improve change reporting a bit + * [e08d64d] Complete setup.py for pypi + + -- Guido Günther <agx@sigxcpu.org> Fri, 17 Oct 2014 18:41:14 +0200 + +git-buildpackage (0.6.20) unstable; urgency=medium + + * [ee44479] Allow to always drop pq branch after export (Closes: #761160) + * [51ac0a5] pq: document --drop + * [90b283f] meta-closes: Move help text to GbpOptionParser.help + * [0afcd3d] pq: Add "pq export --commit" option. This commits the changes + in the pq right away. This options is currently experimental and subject + to change. + + -- Guido Günther <agx@sigxcpu.org> Sun, 12 Oct 2014 11:42:27 +0200 + +git-buildpackage (0.6.19) unstable; urgency=medium + + * [5d4cb92] Update to git-pbuilder 1.33 + + -- Guido Günther <agx@sigxcpu.org> Sun, 07 Sep 2014 09:25:48 +0200 + +git-buildpackage (0.6.18) unstable; urgency=medium + + * Upload to unstable + * [6edd836] Don't delete *_source.changes on source only builds + (Closes: #758726) + * [a37832e] Mention --no-merge (Closes: #760091) + + -- Guido Günther <agx@sigxcpu.org> Sat, 06 Sep 2014 13:41:05 +0200 + +git-buildpackage (0.6.17) experimental; urgency=medium + + [ Guido Günther ] + * [692e5da] Make sure we fixup the changelog trailer with newer devscripts. + We don't change any mainttrailer options already given. + Thanks to James McCoy for the detailed explanation (Closes: #740566) + * [ae5805e] Improve error messages on formatting errors to + make it easier for the user to detect misformated replacement strings in + config files and command line options. + * [5f82f44] gbp: add --version option (Closes: #758909) + * [04aa92f] Allow to list all available gbp subcommands + * [68c053f] Unify doc strings a bit since they now show up with --list-cmds + * [6d510ce] bash completion: make command list dynamic. + Use "gbp --list-cmds" so we don't have to hardcode the available + commands and get support for the RPM ones as they show up. + + [ Kamal Mostafa ] + * [6823e51] buildpackage: Make debian-tag message configurable via + --git-debian-tag-msg. + + -- Guido Günther <agx@sigxcpu.org> Sun, 24 Aug 2014 11:31:28 +0200 + +git-buildpackage (0.6.16) experimental; urgency=medium + + [ Markus Lehtonen ] + * Doc cleanups and reformatting + * [736b9d8] Introduce git-import-srpm tool. + * [ed228a2] import-srpm: add 'vendor' config option. + Intended to represent the distribution vendor (e.g. 'Debian'). + Currently, this can be used in tag format strings. + + [ Guido Günther ] + * [0b1fc0d] buildpackage: Also print tag name when tagging the Debian + release. Based on a patch by Kamal Mostafa + * [2bf944f] Pass --no-pristine-tar to SRPM compnent tests + to avoid pristine-tar showing up in the matched branches + * [23090c9] Introduce git-buildpackage-rpm. Currently only including "gbp + import-srpm". + * Remove newly introducted spurious log outputs from tests + + -- Guido Günther <agx@sigxcpu.org> Mon, 28 Jul 2014 15:57:49 +0200 + +git-buildpackage (0.6.15) unstable; urgency=medium + + * [5cde49a] Revert "Determine build_dir upfront" + This reverts commit b2549fac19f2d666552291a4fcf2020ca0570834. + Closes: #749104 + + -- Guido Günther <agx@sigxcpu.org> Sat, 24 May 2014 18:40:44 +0200 + +git-buildpackage (0.6.14) unstable; urgency=medium + + * [949ce84] Slightly improve usage output + * [045e607] gbp pq: document --force + * [817976e] Handle version format errors more gracefully. + * [b0390d1] Fix comitter vs committer typos. + Thanks to Sandro Tosi (Closes: #748339) + * [dc231f2] Document that the patches must apply without fuzz + * [de77df7] pq: Print proper error message if we fail to apply the tree + * [54e4542] pq: Try harder to cleanup after a failed patch. + Thanks to Marco d'Itri for the repo to debug this + * [b2549fa] Determine build_dir upfront + * [a050942] Improve error reporting on failed commands. + (Closes: #748248) + * [030ff96] Improve error reporting on hooks. + + -- Guido Günther <agx@sigxcpu.org> Thu, 22 May 2014 22:47:37 +0200 + +git-buildpackage (0.6.13) unstable; urgency=medium + + [ Guido Günther ] + * [14f6ded] Test option parser fallbacks more thoroughly + revealing another bug where we overwrote parsed values with defaults + (Closes: #733759) + * [03ada72] .gitignore: ignore editor backup files + * [4c6b067] Add minimal 'config' command. This only allows to print single + config values so far. (Closes: #733470) + * [b393080] Import command not module. This matches the function name. + * [459d9bf] config: add decorator to add_option_* functions. + This allows us to build an internal list of valid options and print + these. + + [ Markus Lehtonen ] + * [a8cfd88] Revert "GitRepository/add_remote_repo: fix the 'tags' argument" + Which caused an unwanted behavior of not fetching refs/heads at all -- + only tags were fetched. + This reverts commit 5dd598fb8f2a9109189fad6cf631811f12ce2130 + * [4131b90] docs: re-enable missing manpage + + -- Guido Günther <agx@sigxcpu.org> Thu, 03 Apr 2014 21:31:38 +0200 + +git-buildpackage (0.6.12-tizen20140521) unstable; urgency=low + + [ Markus Lehtonen ] + * Rebase on top of upstream version 0.6.12 + * Changes in rpm-ch + - add --message cmdline option + For giving the text for new changelog entry/entries, skipping git commit + messages entirely. + - implement '--all' option + If defined, git-rpm-ch uses all commits in the Git history. Also, + '--since' option is omitted. + - implement --color-scheme option + - use name (string) as the entry author + - internal refactoring + - fix crash in guessing the start commit + * Changes in pq-rpm + - implement --retain-history option + With this option defined gbp tries to preserve the history when + converting. That is, for each commit in the old branch create one + corresponding commit in the new orphan packaging branch. This works by + dumping packaging files and updating patches for each commit. However, + empty commits are not generated - these are caused e.g. by changes in + files that are ignored by patch-generation. + NOTE! Only valid for the 'convert' action. + - convert: don't try to commit empty set of patches + - make sure we always get a sane author + - slight unification of log messages + - decrease (default) verbosity a bit + - don't create pq branch when switching + * Changes in buildpackage-rpm + - buildpackage-rpm: fix desktop notifications + - buildpackage-rpm: remove --purge option + - guess/parse spec as early as possible + * Documentation + - Include man pages in RPM packages + - Add -doc subpackage to RPM packaging + - Build deb and rpm html docs in one docbook + - A multitude of small cosmetic fixes + * Other misc. internal changes + - GitRepository: implement create_tree() method + - rpm: suppress some verbosity when updating patches in spec file + + [ Li Jinjing ] + * Fix missing return value in get_current_branch method + + -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Wed, 21 May 2014 16:32:46 +0300 + +git-buildpackage (0.6.12) unstable; urgency=medium + + * [89f3005] Use a much simpler version to fix the command name in --help + mostly reverting e1780f0. (Closes: #742907) + + -- Guido Günther <agx@sigxcpu.org> Sat, 29 Mar 2014 00:17:59 +0100 + +git-buildpackage (0.6.11) unstable; urgency=medium + + [ Guido Günther ] + * [38cfa6c] Request verbose output on bug reports + * [d000b0c] Remove incorrect docs about multiple filter options + (Closes: #718536) + * [fd440e2] Use a temporary directory. This avoids file name collisions and + weired files in the working copy. + * [e1780f0] Fix command output. + The first line lacked the subcommand like: + $ gbp pull --help + Usage: gbp [options] - safely update a repository from remote + instead of + $ gbp pull --help + Usage: gbp pull [options] - safely update a repository from remote + ^^^^ + + [ Mario Lang ] + * [077dc35] Fix config file name + + [ Markus Lehtonen ] + * [3808523] docs: add some missing sgml closing tags + * [d8f55da] GitRepository/get_commit_info: correctly handle file + renames/copies. Use the '--no-renames' git command line option in order + to prevent two filenames per entry. + * [5dd598f] GitRepository/add_remote_repo: fix the 'tags' argument. + Explicitly use --tags in git arguments - otherwise tags might not be + fetched. + * [15d87fb] tests: more robust check for the default urgency level of dch. + The dch tool might not report it's version if it is incorrectly compiled. + Create a dummy changelog and parse it "manually" to determine the default + urgency level. + * [7774375] pq: minor log message typo fix + * [bbf21bf] ComponentTestBase: use regex matching in log checking + + -- Guido Günther <agx@sigxcpu.org> Thu, 27 Mar 2014 22:27:38 +0100 + +git-buildpackage (0.6.10) unstable; urgency=medium + + * [f1bc542,1b0b17c] config: Don't pull in config defaults twice. + This would otherwise overwrite values set in the legacy config sections. + (Closes: #733759) + * [7e26f91] Remove cover-min-percentage. It makes running single tests + harder than necessary since it requires the percentage also when using + "nose <testname>". + * [d533e0f] import_dsc: Create missing debian branch with + --create-missing-branches (Closes: #739888) + * [df32264] git-import-dsc: Document --create-missing-branches + + -- Guido Günther <agx@sigxcpu.org> Sun, 23 Feb 2014 17:56:47 +0100 + +git-buildpackage (0.6.9) unstable; urgency=medium + + [ Guido Günther ] + * [78f3673] Depend on newer devscripts. + These contain a uscan that handles repackaging at the right level and + won't let us pick up the wrong tarball name. + Thanks to gregor herrmann and all others involved (Closes: #635920) + * [7c64575] Avoid backtrace on config file parse errors + "gbp buildpackage" did this already but others didn't (Closes: #733759) + * [7b1eadd] Make parsing config file sections symmetric. + Always read the legacy command's config file section prior to the + subcommand's config file section. + Until now 'gbp <subcommand>' would read '[subcommand]' as well as + '[gbp-<subcommand>]' sections while 'gbp-<subcommand>' would only read + '[gbp-<subcommand>]' sections. (Closes: #733759) + * [49f0e44] Change the default of cleaner to /bin/true. + Running a clean command within version control by default nowadays + causes more trouble than it helps. It's unnecessary with + pbuilder/cowbuilder/sbuild and with export-dir. So change the default + from 'debuild clean' to a noop ('/bin/true'). (Closes: #670624) + * [d93c89f] import_orig: test error paths of find_source + * [daf249f] docs: improve docs on using upstream's git repo. + The documentation on using upstream's git directly instead of tarballs + was very terse. Add a step by step guide on how to get started and + how to update to new upstream versions. + + [ Markus Lehtonen ] + * [e876beb] tests: adapt dch tests for older devscripts. + Determine the default urgency level by determining the version number of + the dch tool from command line. + + -- Guido Günther <agx@sigxcpu.org> Sat, 15 Feb 2014 11:45:00 +0100 + +git-buildpackage (0.6.8-tizen20140306) unstable; urgency=low + + [ Markus Lehtonen ] + * Rebase on top of upstream version 0.6.8 + * Introduce git-rpm-ch tool. + Initial version of the git-rpm-ch tool which is intended for maintaining + RPM changelogs. Supports both spec files and separate "OBS style" + changelog files. + Implement '--tag' command line option (and other related options for + signing) for creating and tagging a release. These correspond the + tagging options in git-buildpackage-rpm. + The git-buildpackage-rpm tool does not commit anything to git. However, + in rpm-ch the '--tag' option causes the changelog modifications (and, + all other staged changes) to be committed to git before creating the + tag. This makes it possible to create a release and document the + packaging/release tag name in the rpm changelog. + * Changes to gbp-pq-rpm: + - implement 'convert' subcommand. + The new subcommand is intended to be a one-time-callable command for + converting a package to use the "orphan-packaging" development model and + git layout (where packaging files are maintained in a separate branch + and code development in another branch). + - implement '--import-files' command line option. + For defining the packaging file(s) that will be imported into the + development/patch-queue branch. + By default, the local gbp conf files are imported (so that gbp sees the + same settings on the development/pq branc as on the packaging branch). + Files defined with this option will appear as one monolithic commit in + the development/patch-queue branch. + - implement --new-packaging-dir cmdline option. + Used for setting the packaging directory to be used in the new orphan + packaging branch. Defaults to --packaging-dir so that the gbp.conf files + are more likely to work without modification. + - fail gracefully on invalid config files + - support '%(upstreamversion)s' as a replacable string in the pq branch + name. + * Changes to git-buildpackage-rpm + - patch-export from development branch. + Adds git-buildpackage-rpm --patch-export support for the 'orphan + packaging' development model (where packaging files and development sources are kept in separate + branches). + New functionality: + 1. If patch-export is enabled and gbp detects that the current branch + has a development/patch-queue branch it exports the patches from there, + instead of the tip of the packaging branch. + 2. If gbp detects that the current (or exported) branch is a + development/patch-queue branch it automatically enables patch-export + and exports packaging files from the base branch (instead of the + development/patch-queue branch. + Also, add a new '--git-patch-export-rev' command line option with which + the user can explicitly set the treeish from which patches are generated + (i.e. HEAD..<patch-export-rev>) + - fix spec file vcs update when doing git-tag-only + - change default export directory. + So that the git working directory is not dirtied, by default. + * Changes ti git-import-orig-rpm: + - disable --merge by default. + Merging upstream to packaging does not usually make sense with rpm + packages. Merely, it can create confusion cause unapplicable patches to + be generated. + - implement --create-missing-branches option. + - implement automatic downloading. + Automatically try to download the archive if the archive filename points + to a remote location. + - get archive from spec file. + Try to get archive path/filename from spec file if no file name is given + on the command line. This should make version bumps more + straightforward: just update version number in the spec file and run + 'git-import-orig-rpm'. + * git-import-orig: implement --create-missing-branches option. + * Fixes and new features in GitRepository class + - GitRepository/get_commit_info: correctly handle file renames/copies. + - GitRepository.create_branch: add 'force' option + - GitRepository.archive: add 'paths' option + - GitRepository/git_command: strip stderr output in case of error. + - GitRepository/add_remote_repo: fix the 'tags' argument. + - GitRepository: allow interactive commands. + - GitRepository: fix the 'edit' mode in commit methods. + - GitRepository.commit_files: add committer_info and edit arguments. + - GitRepository.commit_all: add committer_info argument. + * Fixes and new features in internal rpm/spec support + - rpm.SpecFile: add 'specpath' attribute + - rpm: correctly handle 'NoSource' and 'NoPatch' tags in spec. + - rpm: Implement spec_from_repo() helper function + - rpm: track all "section" directives in spec file. + - rpm: add gbp.rpm.changelog module. + This new module contains basic containers and functionality for parsing + and updating rpm changelogs. It is coupled with the rpm packaging policy + class which now has definitions for rpm changelog formatting. + - rpm: support for getting/setting changelog in spec. + SpecFile objects now support reading and writing of the %changelog + section. + - rpm: store full path of spec file sources + + [ Łukasz Stelmach ] + * Fix detection of prefix directory in tarballs + gbs import failed to import tarball properly if paths in the archive + were prefixed with "./". + + -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Thu, 27 Feb 2014 11:30:59 +0200 + +git-buildpackage (0.6.8) unstable; urgency=medium + + * [f5718b8] No need to document --verbose. Properly document --help + instead. + Thanks to Olivier Berger for pointing this out (Closes: #731149) + * [e746d5f] Adjust test cases to newer devscripts (Closes: #732384) + * [ca93ccb] Run nosetest on executables too. + They're all well behaved and this allows us to use doctests in them + * [eec8ce3] Determine changes file name based on dpkg-buildpackage options + (Closes: #732678) + + -- Guido Günther <agx@sigxcpu.org> Fri, 20 Dec 2013 17:21:20 +0100 + +git-buildpackage (0.6.7) unstable; urgency=low + + * [ab5a708] import-dsc; Merge upstream version by tag + instead of simply using the upstream branch name. THis makes sure + we also merge upstream versions that were imported previously with + e.g. "gbp import-orig". (Closes: #698222) + * [2042144] log: add error and warning aliases since I tend to use them + instead of err and warn. (Closes: #728896) + * [bc5ce39] Fix description of backports branches + * [00d830c] Use --distribution instead of --dist (Closes: #730788) + + -- Guido Günther <agx@sigxcpu.org> Fri, 29 Nov 2013 20:52:03 +0100 + +git-buildpackage (0.6.6-tizen20131202) unstable; urgency=low + + * Rebase on top of upstream version 0.6.6 + * UpstreamSource: fix archive prefix guessing + * pq-rpm: create diff up to the last merge commit + Before, merge commits broke patch generation, or, (most probably) caused + the generated patches to be unapplicable (similar to how + git-format-patch behaves). + Now, changes up to the last merge commit are squashed into one diff if + merge commits are found in the revision list from which patches are to + be generated. Individual patches (one per commit) are generated from the + last merge commit up to the exported revision. + * pq-rpm: magic word HEAD for patch-squashing + When given as the squash-point, 'HEAD' translates to the end-commit. + This allows one to configure gbp to always squash all commits into one + monolithic diff. + + -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Mon, 02 Dec 2013 12:55:14 +0200 + +git-buildpackage (0.6.6) unstable; urgency=low + + [ Guan Junchun ] + * [284eea5] gbp-clone: support repo URLs like "host:repo.git" Previously, + gbp didn't correctly parse this kind of URL and clone failed. + * [d52abf3] gbp-clone: support cloning to a specific directory + (Closes: #725666) + + [ Guido Günther ] + * [3092623] Add missing bash completion for gbp import-dscs + (Closes: #727749) + * [fc5b485] import-dsc: allow to skip Debian tag creation + (Closes: #636368) + * [6f0c8f9] Update to git-pbuilder 1.30 that resyncs with what we shipped in + gbp. + * [3e09958] Disable html coverage generation until python-nose is fixed. + + [ Markus Lehtonen ] + * [c661c71] pq: rewrite patch export functionality. + Use our own function for constructing the patch files instead of using + the format-patch command of git. This way, we get the desired output + format directly, without the need for the error-prone "format-patch, + parse patch files, mangle and re-write patch files" cycle. + Also, fix patch naming in patch generation when '--no-patch-numbers' is + used. Previously, multiple commits with the same subject resulted in + multiple patches having the same filename. This lead into broken series + with missing patches as patch files were overwritten by the topmost + commit. + * [017fac3] pq.format_patch: support file path filtering. + Implements a filter option that allows filtering out changes to certain + files/paths in the patch-generation. A commit is totally ignored if all + files would be filtered out. The path filter is given as a Python + regexp. + * [a0d6eb7] pq: properly generate non-ascii patch files. + Encode non-ascii email headers properly. Also, set MIME headers + correctly for the message body if the commit message body contains + non-ascii characters. + The reason for constructing the message in a little bit "clumsy" way is + the intention is to match the output of git-format-patch as closely as + possible. + * [91fbdc1] pq: support patch-export commands. + Support giving commands to pq as a meta tag in commit message. The + format is "Gbp: <command> [args]". + Currently, only one command is supported. namely 'ignore'. That is, one + can use 'Gbp: Ignore' in the commit message for ignoring the commit in + patch-generation. + * [3dccca6] pq: add format_diff() function. + For generating a patch file from a diff between two arbitrary commits. + * [34e85f7] pq: listen to 'Gbp-Pq:' commands, too + * [99c6995] pq: support 'Topic' patch-export command. + Topic can be defined with either 'Gbp: Topic <topic>' or 'Gbp-Pq: Topic + <topic>' in the commit message. + This is to replace the "gbp-pq-topic: <topic>" command. + * [0c0086b] docs: update pq manpages regarding pq command meta tags + + [ Felipe Sateler ] + * [babbc5e] Add zsh completion. + (Closes: #717002) + + -- Guido Günther <agx@sigxcpu.org> Wed, 06 Nov 2013 08:21:55 +0100 + +git-buildpackage (0.6.5) unstable; urgency=low + + [ Etienne Millon ] + * [ba4f778] doc: Fix git-pbuilder example (Closes: #725875) + + [ Guido Günther ] + * [3be2947] Be more robust about git status output changes by using + --porcelain. Heavily based on a patch by rian m. carlson + (Closes: #726260) + * [ae460e1] Bump standards version + + [ Andrew Starr-Bochicchio ] + * [4368694] Don't export DEB_VENDOR="Debian" + Tests now take Ubuntu versions into consideration. (Closes: #723756) + + -- Guido Günther <agx@sigxcpu.org> Wed, 16 Oct 2013 10:29:58 +0200 + +git-buildpackage (0.6.4) unstable; urgency=low + + [ Guido Günther ] + * [0385dc5] docs: having an upstream branch is a recommendation rather than + a hard requirement, we can use any treeish to build the upstream tarball + from. + * [e398469] Remove unused import + * [f738be3] Add link to online docs + * [ec7bd94] pq: print which patch failed to apply + * [820100d] pq: Only print number or tries if we try more than once + * [a86ccb7] Update to git-pbuilder 1.29 + * [b494801] Backports got integrated into the main archive. From wheezy on + we can use the main archive + + [ Markus Lehtonen ] + * [4030c19] docs: minor sgml syntax fix + * [e72a1e2] config: restore mangled env in doctests. + * [0eeafba] GitRepository/diff: add 'stat' and 'summary' options. + * [8cdc06f] ComponentTestBase: more verbose output in case of branch mismatch + * [af2034c] ComponentTestBase: fix env restore in teardown + * [54099f5] import-orig: import readline in the common module. + * [6c478a6] ComponentTestBase: keep tmpdir if GBP_TESTS_NOCLEAN is in env + * [bc40956] GitRepository: Add clean() method + * [e48f0a0] GitRepository.diff: add 'text' option. for generating textual + diffs. + * [3c0a022] GitRepository.diff: prevent usage of external diff. External + diff might break patch generation, for example. + * [6f3d63a] ComponentTestBase: use eq_() ok_() from nose.tools for better + assert messages. + * [e54289e] common/buildpackage: fix handling of empty tarball prefix as + needed for rpm builds + * [39f581e] GitRepository.diff: add 'ignore_submodules' option + * [b9b9eea] GitRepository.list_tree: add 'paths' option. + * [3eb401d] git: new class and method for remote repositories. + * [28fdf4c] GitRepository.has_remote_repo: use get_remotes method. + * [b4e5b73] GitRepository: deprecate the get_remote_repos method. + * [c222197] tests: add test for archiving without git submodules + * [92f29be] tests: use eq_ and ok_ from nose tools in submodule tests. + For consistency and better assert error messages. + * [f858f87] tests: add some docstrings to git submodule tests. + * [1d92bfe] tests: upper case global variables in submodule tests. + * [6b8037e] tests: remove unused import in submodule tests. + + [ Lingchaox Xin ] + * [07b3054] GitRepository.has_treeish: minor pylint fix + * [eca5a33] GitRepository.describe: add 'tags' and 'extra-match' options + * [1320de2] GitRepository.fetch: Add 'refspec' option + * [171579f] GitRepository.fetch: Add 'all_remotes' option + * [68baa9a] GitRepository.push: Add 'force' option + * [d28c7cc] GitRepository.push: Add 'tags' option + * [db79c5d] GitRepository.pull: Add 'all_remotes' option. + Also changes the method to utilize the GitArgs class. + + [ Osamu Aoki ] + * [8441bba] typo s/bei/be/ (Closes: #722359) + + -- Guido Günther <agx@sigxcpu.org> Sun, 06 Oct 2013 17:35:14 +0200 + +git-buildpackage (0.6.3-tizen20131017) unstable; urgency=low + + [ Lingchaox Xin ] + * Fix `fatal: fetch --all does not take a repository argument` + + [ Markus Lehtonen ] + * UpstreamSource.guess_version: don't check for directories + * UpstreamSource: move version guessing logic to PkgPolicy + * rpm: UpstreamSource: move version guessing logic to PkgPolicy + * UpstreamSource: store the absolute path + * UpstreamSource: check that the sources exist + * UpstreamSource: implement prefix guessing + * rpm: UpstreamSource: implement prefix guessing + * UpstreamSource.pack: reuse unpacked dir if no filter is used + * UpstreamSource.unpack: return UpstreamSource instance + * import orig: import readline in the common module + * rpm: import orig: import readline in the common module + * buildpackage: fix handling of empty tarball prefix + * import-orig: new function for filtering/re-packing sources + * import-orig: rework sourcecode preparation and filtering + * tests.testutils: add ls_zip() helper + * rpm tests: test --filter option of git-import-srpm + * ComponentTestBase: more verbose output in case of branch mismatch + * import-orig-rpm: don't crash on invalid gbp.conf + * import-orig-rpm: remove unneeded try-except + * config: restore mangled env in doctests + * ComponentTestBase: fix env restore in teardown + * ComponentTestBase: keep tmpdir if GBP_TESTS_NOCLEAN is in env + * tests: add tests for git-import-orig-rpm + * ComponentTestBase: use eq_() ok_() from nose.tools + * rpm tests: slight modificatin of import-srpm tests + * Version bump, rebase on top of 0.6.3 + * docs: minor sgml syntax fix + * Disable cover-min-percentage setting of nose + * debian packaging: change to 1.0 source package format + * git: new class and method for remote repositories + * GitRepository.has_remote_repo: use get_remotes method + * GitRepository: deprecate the get_remote_repos method + * pq-rpm: drop unused 'tries' option + * common/pq: support more flexible pq-branch naming + * GitRepository.list_tree: add 'paths' option + * rpm: change guess_spec() to return SpecFile object + * rpm: minor docstring fixes + * rpm.SpecFile: support parsing spec as raw text data + * rpm: support guessing spec file from git treeish + * pq: don't overwrite patches in the same series + * pq-rpm: don't overwrite patches in the same series + * tests: use sanitize some submodule tests + * tests: use eq_ and ok_ from nose tools in submodule tests + * tests: add some docstrings to git submodule tests + * tests: upper case global variables in submodule tests + * tests: remove unused import in submodule tests + * buildpackage: refactor prefix handling + * common/pq: fix length of patch filenames + * pq: fix generation of series file + * pq.write_patch_file: drop unused argument + * pq: pass commit_info to format_patch() + * SpecFile.set_tag: change the default place for new tags + * buildpackage: support 'commit' variable for VCS tags + + [ Zhang Qiang ] + * remove 'repo' param to adapt to changes of write_patch_file + + [ Guan Junchun ] + * Fix gbs clone failure if repo url is like host:repo.git + * Clone a repository to a specific directory + + -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Thu, 17 Oct 2013 13:45:10 +0300 + +git-buildpackage (0.6.3) unstable; urgency=low + + * [60ffe95] --git-hooks doesn't take an argument + * [7a29e42] Move MockedChangelog to testutils and allow to specify the + content so we can reuse it for other dch tests. + * [938e4cd] dch: make automatic adding of new sections more robust. + The code that determined if we found a snapshot header was obfuscated by + the code that determines the commits to add. Split those and better + document their purpose. Also always return the commit to start from so we + don't need to repeat the logic in the upper levels. + * [d0fb6d8] Minor docstring updates + * [388cfb8] docs: Add recommended branch layout. + It'd be nice to have similar branch layouts among packages so recommend + one that worked well so far. + * [34b2079] GitRepository: allow to use '..' instead of '...' + The symmetric difference isn't always useful since it includes changes + from both branches. See #680705. + * [f793ed0] pq: exclude patches from Debian packaging branch. + When regenerating the patch queue including patches from the Debian + branch is not useful. Addresses parts of #680705. + Thanks to Benjamin Cama for the detailed analysis. + * [283c847] docs: Refert to gbp in the introduction since this wraps all + commands now. + Thanks to Ross Boylan for pointing out that the current wording is + confusing. + * [8f073eb] docs: remove superfluous at + * [c9d3d93] Use open() instead of file() since the later doesn't exist in + python3 + + -- Guido Günther <agx@sigxcpu.org> Wed, 28 Aug 2013 19:35:34 +0200 + +git-buildpackage (0.6.2) unstable; urgency=low + + * [194d396] Document gbp's help option + * [56068e5] Git.Repository.__git_inout: properly set stdin. + We should set stdin to subprocess.PIPE when piping input according + to the subprocess docs. + * [585439e] Git.Repository.__git_inout: Close all other file descriptors. + No need to leak fds to the child. + * [9af1868] gbp.git.Repository.get_branch(): use _git_command + instead of the deprecated _git_inout and clarify the return codes and + exceptions raised. + * [a2ce387] gbp.git.GitRepository.has_branch(): use _git_command instead of + the deprecated _git_getoutput + * [2145c58] Test succesful import too and make sure we don't spew to stderr + during this test + * [8d2ceba] Make sure we keep our test coverage + * [00a4162] Switch to debhelper level 9 which is available in Wheezy + * [55ba9b8] Update Vcs-Browser URL + * [e829dc5] Add symlinks to the manpages for the deprecated commands and + make lintian happy (Closes: #714489) + * [fc74aa2] Fix broken xrefs + * [2a233a7] Add examples for importing upstream sources + * [cef5bae] Add gbp buildpackage example showing git-pbuilder invocation + * [1b38d90] Remove duplicate config files section in the "gbp buildpackage" + man page + * [a22eee2] GitRepository.set_upstream_branch: Newer git wants a valid + remote repo entry so set one in the tests before trying to set the + upstream branch. Found with git 1.8.3.2 + * [7762b17] GitRepository.set_upstream_branch: don't try to set upstream + twice. Move setting of the upstream branch out of the loop. This worked + by accident so far. + * [b615db5] GitRepository.set_upstream_branch: Catch errors to set upstream + branch + * [b8e921e] GitRepository.set_upstream_branch: use --set-upstream-to if + available since --set-upstream is deprecated. + + -- Guido Günther <agx@sigxcpu.org> Tue, 09 Jul 2013 21:46:00 +0200 + +git-buildpackage (0.6.1) unstable; urgency=low + + * [42769e3] Split {Build-,}Deps per line + and sort alphabetically + * [747a273] Depend on python-pkg-resources (Closes: #714238) + + -- Guido Günther <agx@sigxcpu.org> Thu, 27 Jun 2013 11:23:03 +0200 + +git-buildpackage (0.6.0) unstable; urgency=low + + [ Guido Günther ] + * Introduce gbp supercommand to get rid of the git-<command> vs. + gbp-<command> inconsistencies: + * [12dce5f] Add wrapper for all gbp commands. So like git you can now + use gbp <command> instead of git-<command> or gbp-<command>. The + manpages and docs aren't adjusted yet. + * [416f690] Bash complete on "gbp <command>" too + * [5684b18] Add gbp manpage + * [6b1b41f] docs: Use gbp <command> instead of {git,gbp}-<command> + * [daccfa0] manpages: Changes references from git- to gbp- + * [1d90e73] docs: Rename the entities from &git-<command>; to + &gbp-<command>; + * [1eea5d5] gbp.conf: Use command names instead of {git,gbp}- + * [c365f7c] Rename the sgml files from git- to gbp- + * [55fded7] NEWS: add a note about the new gbp super command + * [b47b7e8] Update package description + * [fe9f925] GbpOptionParser: Make sure we parse the old config sections. + For backward compatibility between {gbp,git}-<command> and "gbp + <command>" make sure we parse the former sections if using the later. + * [375014d] gbp: support --help + * [a5aff11] Consistently call gbp the supercommand and robustify against + invalid modules names. + * [e09ef94] gbp-import-dscs: invoke gbp import-dsc instead of + git-import-dsc + * [38d43b4] config: Don't fill in the parser with all defaults. + * [4d6eecb] GitRepository.get_subject: use get_commit_info. + This kills another _git_getoutput. Also deprecate the method since we + don't need to special case the subject. + * [caff99c] GbpOptionParser: Make sure we access the GbpOptionParser*'s + default dict and not the one from the OptionParser. The instance's default + dict this gets reset to empty when invoking OptionParser.__init__. + * [1158503] GbpOptionParser: add test for 'filter' option handling + * [ed63276] Git-Ignore generated gbp.conf.5 too + * [3966076] Remove unused imports + * [b59818d] import-dsc: print filename instead of object name + + [ Markus Lehtonen ] + * [fa414e5] gitmodifier: make the datetime object always have timezone. To + be consistent with the date property and for easier compatibility with git + dates. + * [f717975] GitRepository/get_commit_info: add patchname to info. + Add a new 'patchname' field to the information returned by + get_commit_info. That is, the subject in a sanitized format, similar to + what git-format-patch uses. + * [74d956f] import-orig: keep working copy in sync with branch HEAD. + Update working copy and index (to branch HEAD) if we modify the + currently checked-out branch. Otherwise the repository is left in + unclean state when the current branch is upstream or pristine-tar and + the '--no-merge' option is used. + * [a30f9e7] buildpackage: use get_commit_info() instead of get_subject() + Utilize the get_commit_info() method of GitRepository instead of the + deprecated get_subject(). + * [75cbd9a] GitRepository/diff: allow single object. + Allow diffing a single object, e.g. getting diff from single commit. + + -- Guido Günther <agx@sigxcpu.org> Wed, 26 Jun 2013 16:36:41 +0200 + +git-buildpackage (0.6.0git20130530-tizen20130822) unstable; urgency=low + + [ Markus Lehtonen ] + * GitRepository/add_files: consistently update all tracked files + * rpm: enhance spec parsing error messages + * rpm: simplify SpecFile._parse_filtered_spec() + * rpm: implement a wrapper module for rpm lib + * rpm: print a warning if importing gbp-specific librpm fails + * rpm: Improve logging in case of rpmlib error + + [ Lingchaox Xin ] + * GitRepository: Add force option to push method + * GitRepository: Add all option to pull method + * GitRepository: Add refspec option to fetch method + * Fix pylint warnings, follow Markus' sugesstion + * Add tags option in git push command + * Add all_remotes option in git fetch command + * Add clean method to GitRepository class + + -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Thu, 22 Aug 2013 09:47:51 +0300 + +git-buildpackage (0.6.0~git20130530) unstable; urgency=low + + [ Guido Günther ] + * [f4acd7a] GitRepository: Use LC_ALL=C when checking features. + This fixes the doctest and also makes sure we use an up to date manpage. + Thanks to Daniel Dehennin for the report. + * [9c5bd03] Add Jenkins Scratchbuilder example. + It's a simple script that can be used to build Debian packages via gbp + and Jenkins. + + [ Gaudenz Steinlin ] + * [47f2dea] git-buildpackage: Unbreak overlay mode (Closes: #708636) + + -- Guido Günther <agx@sigxcpu.org> Thu, 30 May 2013 15:24:05 +0200 + +git-buildpackage (0.6.0~git20130506) unstable; urgency=low + + [ Guido Günther ] + * Get rid of lots of spurious output to stderr, only report it in error + cases. This makes the tools and the testsuite less chatty. + * [4abfa6a] gbp-pull: Fix typo in help output + * [90ffae8] manpages: Document gbp-pull's --ignore-branch option + + [ Markus Lehtonen ] + * [9e3267a] DebianSource: raise DebianSourceError if reading changelog fails + * [a36dc64] buildpackage: catch and handle DebianSourceError gracefully + * tests: fixes for older dch + * [36341dd] GitRepository: add describe() method. + * [ae63dba] DebianSource: fix is_native() + Determine from changelog if debian/source/format does not provide any type + (1.0 format). + * [f880910] tests: Fix tests for Ubuntu. + * [f9722f6] buildpackage: implement --[no-]hooks option. + + -- Guido Günther <agx@sigxcpu.org> Mon, 06 May 2013 19:18:49 +0200 + +git-buildpackage (0.6.0~git20130414) unstable; urgency=low + + * [e948bd3] Don't try access source before it's filled + + -- Guido Günther <agx@sigxcpu.org> Sat, 13 Apr 2013 19:36:57 +0200 + +git-buildpackage (0.6.0~git20130413) unstable; urgency=low + + [ Daniel Dehennin ] + * [a9bf9cf] Move debian/changelog manipulation to gbp.deb.changelog.ChangeLog. + (Closes: #672954) + * [ae4a368] Add option to manage distribution fields for non snapshot mode. + The snapshot mode fails to merge two "debian/changelog" entries if the + distribution is not "UNRELEASED". + (Closes: #646684) + * [920053e] Add urgency management. + + [ Guido Günther ] + * [62d3b99] Move DebianPkgPolicy to separate module + * [7335735] Move DscFile to separate module + * [e5d9816] Generate coverage xml for cobertura style coverage information + that can be picked up by e.g. Jenkins + * [6eb2ddc] Use _git_inout for git.show + so we don't spew the error message on stdout for nonexistent objects + * [d510f2a] Honor debian/source/format when checking if a package is a + native package (Closes: #669267) + + [ Markus Lehtonen ] + * [54679eb] Add .coveragerc. + To get correct report if coverage is invoked directly (not through + nose/disttools) in order to get an xml report, for example. + + [ Thomas Koch ] + * [3d6b68a] tests: Use tempfile.mkdtemp to create temp dirs for tests. + This puts test dirs below /tmp which often is a tmpfs. + All tests include the context module which consolidates tmpdir creation + and cleanup, undoes a chdir in teardown and silences log messages. + + -- Guido Günther <agx@sigxcpu.org> Sat, 13 Apr 2013 14:27:06 +0200 + +git-buildpackage (0.6.0~git20130329) unstable; urgency=low + + [ Guido Günther ] + * [703da99] Remove unused imports + * [db66286] Return boolean types from is_ methods instead of a match object + or None + * [db3505f] Better document how one derives from PkgTypes + * [eb999f7] Allow for upper case characters in the upstream version + (Closes: #703694) + * [fc9d019] Purging of the build dir should be configurable via a config file + so introduce --git[-no]-purge which is consistent with the other + boolean options and deprecate --git-dont-purge. (Closes: #702200) + * [5925499] Split out building a debian version from an upstream commit + based on a patch by Daniel Dehennin + Needed for #672954, #646684, #669171 + * [dafb5a3] Fix docstring + + [ Markus Lehtonen ] + * [8b80e38] ComponentTestBase: close streamhandler when stopping log capture + * [5ef9e77] gbp-pull: update tags, too. + To make sure that the tags are in sync with the remote. + * [6fc1c08] tests/component: pylint fixes. + Add module docstring and wrap one overlong line. + * [7709f21] tests: skip test_Changelog if 'dch' tool is not available + * [dcf7467] setup: possibility to skip nosetest requirements. + Makes it possible to not require test requirements by defining + WITHOUT_NOSETESTS environment variable when running setup. + * [3d80b2f] GitRepository/_cmd_has_feature: more intelligent parsing. + More intelligent parsing of the git output (man page). Try to + parse optional options like '--[no-]standard-notes' of git-show + correctly. In this example both 'no-standard-notes' and 'standard-notes' + would be available. + * [57bbd0a] GitArgs: utilize the add() method in other add_X methods. + Only use the add() method for updating the argument list. This makes the + code more robust and makes all add method variant types support the same + argument types. + * [3b873f7] ComponentTestBase: capability to check files of repo. + Makes it possible to check that the correct files are present in + the working copy of the repo. + * [64ed77c] tests.test_GitRepository: import and setup gbp.log. + In order to initialize gbp logging properly. Fixes false positives when + the GitRepository tests are run alone. + + [ Zhang Qiang ] + * [6703edc] packaging: Add man as dependency. + Required by GitRepository._cmd_has_feature() method. + + [ Daniel Kahn Gillmor ] + * [4323cc8] Include the name of the package being built in the debian tag + message. (Closes: #704018) + + -- Guido Günther <agx@sigxcpu.org> Fri, 29 Mar 2013 12:34:07 +0100 + +git-buildpackage (0.6.0~git20130314) unstable; urgency=low + + [ Guido Günther ] + * [4a5fa0d] Ignore rope project files as generated by ropemacs + * [c6b7bc2] gbp-pq: Improve patch header write out. Avoid trailing new + lines in the patch header when reexporing patches. to avoid diffs when + nothing changed. + * [2fa7cac] gbp.log: lowercase the levelname too match the output before the + switch to Python's logging module + * [00ed38f] gbp.log: Improve error message on broken color lists + * [744f85b] gbp-create-remote-repo: Set HEAD in remote repo + to debian branch (Closes: #692006) + * [3591792] git-dch: Allow to create changelogs when not on a branch. + This makes snapshot changelog generation e.g. within jenkins builds + simpler since jenkins by defaults checkouts out the commit without + creating a branch. + * [5176d2a] Check the sha1 doesn't exceed 40 bytes + * [c097397] Document --git-pristine-tar-commit + * [9e30bf2] Add component test initialization very heavily based on code by + Markus Lehtonen + * [3820adc] Add test data submodule + * [9ec98c5] Move over import dsc test from external test suite. Move over + the first test from our external (shell based) test suite to the component + tests. + * [80b5c64] Add missing --git- (LP: #1112831) + * [b678c6a] Fix typo. + Thanks to Andreas Beckmann (Closes: #700443) + * [4ef1081] examples: fix logging. + Thanks to Carsten Schoenert + + [ Markus Lehtonen ] + * [83c2c3f] log: rewrite the module to use Python logging module. Replaces + the Logger with a new one, derived from the Logger class of the Python + standard library. Colorized output is handled by a separate handler class. + * [48c48c9] log: add support for setting the color scheme. Implements + changeable color schemes in the gbp.log module. Color scheme is given as a + colon-separated list, with one color for each log level: + '<debug_color>:<info_color>:<warning_colro>:<error_color>'. Colors can be + given as an integer number (ANSI terminal color code) or color name (.e.g + 'red'). Missing or empty fields are interpreted as using the default color + for that log level. + * [ebbe635] New configuration option for setting the output color scheme. + Adds a new command line and config file option 'color-scheme' for + selecting the colors used in log output. + * [ec2b74c] GitRepository/strip_sha1: fix length checking. + Accept longer sha1 than what was asked for. The length option given to + git is merely a "wish to get a sha1 of this length". Git may also return + longer sha1 if truncating to given length would give + ambiguous/non-unique sha1. + * [c9011f7] Tristate: allow to init from another Tristate object + * [4b719cd] Tristate: drop broken and unused is_valid_state() method + * [4bdfe2a] log: make color setting a tristate on/off/auto. + Makes it possible to force color=on e.g. when piping output. Also, moves + all 'auto' logic to one single place, i.e. the streamhandler. + * [ab7a732] pq: do author guessing outside the apply_patch functions. + Call the author parsing/guessing function outside the apply patch + functions. This way, the caller can decide when to do the guessing, and + with which parameters. Now the apply_patch functions do what their name + suggests. + * [9c80f14] buildpackage: add 'force' option to write_wc() + To select whether to include file that would otherwise be ignored by + gitignore (.gitignore or .git/info/exclude). + * [5e6f163] tests.testutils: baseclass for testing commandline tools. + Introduce a new baseclass to be utilized in testing the git-buildpackage + command line tools. + * [af0ee43] pq/apply_and_commit_patch: fix date parsing. + GitModifier doesn't support dates in the format used in git format-patch + emails. + * [97cd5bd] gbp-clone: fix return value in case of GitRepositoryError + * [377de2d] gbp-pull: fix --depth cmdline option + + -- Guido Günther <agx@sigxcpu.org> Thu, 14 Mar 2013 07:16:49 +0100 + +git-buildpackage (0.6.0~git20121124) unstable; urgency=low + + [ Guido Günther ] + * [c3c2778] Add minimal debian/source/format parser + * [3878867] PEP-8 and pyflakes cleanups + * [30c1821] Add support dch's --security option + * [4970b42] gbp-pq: Print number of import tries left + * [cf48b03] Allow to remove the orig tarball symlink that's used make + pristine-tar see the correct orig tarball name. + (Closes: #692401) + * [09ba538] GbpError accepts an error message so no need to print it + separately. + * [a488695] Minor git-import-orig manpage improvements + * [4c9bb9f] Add missing git- prefix to --color and --notify options. + Thanks to Filippo Rusconi (Closes: #693978) + * [9478bad] testutils: create missing directories when adding a file + * [691856d] Use an absolute path when parsing the control file so we can't + accidentally parse a file from another dir. + * [d248720] Test apply_and_commit_patch + * [3952091] gbp-pq: Allow to pass in custom function to fetch authorship + information so the RPM based tools don't need to rely on a control file + but can e.g. look at the spec file. + * [7f2c9c1] gbp-pq: Test if setting a topic works + * [f4d493d] Add sha1 stripping in a single place so we can easily sanity + check the result. + * [95ec21a] Output test results in xunit format too to make it more useful + in Jenkins CI builds + * [24fdd97] Test gbp.pq.common.write_patch + * [824e83e] gbp-pq: don't use plural form when there's only one try left + * [8b01d37] git-import-dscs: Properly catch import errors + (Closes: #694113) + + [ Dmitrijs Ledkovs ] + * [323bdcf] Fix testsuite failure if DEB_VENDOR != Debian. + (Closes: #692289) + + [ Markus Lehtonen ] + * [f4d2e21] GitRepository: implement _cmd_has_feature() method to allow + compatibility with older git versions. + * [dfbedfe] GitRepository: fix merge() for older git versions using + _cmd_has_feature() in GitRepository.merge(). + * [ba854d8] GitRepository/diff: add 'paths' argument to makes the diff + function more versatile + * [b7cdef5] GitRepository/diff: catch git error. + * [fe1e120] command_wrappers: suppress some pylint warnings + * [4ed1b43] notifications.py: remove unused import + * [0a9bf99] tests: make tests a Python module to make it possible to reuse + code between various tests. + * [932b1c0] pq: fix "no authorship" warning messages. + * [1da7e0d] import-orig: remove dead if statement. + * [3678906] import-orig: remove dead GbpNothingImported exception + * [8bc7921] GitRepository/get_commits: more flexible revision ranges. + * [36d13cb] GitRepository/get_submodules: use correct path. + * [3362147] GitRepository/get_commit_info: support tags. + * [03cdea0] GitRepository/has_submodules: use correct .gitmodules file. + + [ Ed Bartosh ] + * [8bb62f5] GitRepository.find_tag: change deprecated _git_getoutput to + _git_inout + + -- Guido Günther <agx@sigxcpu.org> Sat, 24 Nov 2012 14:55:24 +0100 + +git-buildpackage (0.6.0~git20120822) unstable; urgency=low + + [ Guido Günther ] + * [e05bfb9] dch: Fix error reporting on parsing errors + * [f4162be] manpage: Fix typo in git-dch's multimain-merge option + (Closes: #684322) + * [e8d175a] manpages: correct manual section and remove duplicate entry + + [ Zhang Qiang ] + * [0af1e72] GitRepository/branch_contains: remove prefix '*' in branch name. + + [ Markus Lehtonen ] + * [678f85f] docs: fix cross-referencing in manpages. + * [f0d4b0d] docs: make refentry ids of manpages more consistent + * [dc3b3b6] GitArgs/add: support iterable and non-string args. + + [ Ed Bartosh ] + * [7524bbb] GitRepository: Implement set_upstream_branch and + get_upstream_branch methods + + -- Guido Günther <agx@sigxcpu.org> Wed, 22 Aug 2012 10:58:07 +0200 + +git-buildpackage (0.6.0~git20120803) unstable; urgency=low + + [ Guido Günther ] + * [6287b0d] gbp.conf: Make config option printing more consistent + * [9430ee1] Make TestDir testcase use a newly created directory neeeded for + the upcoming packagename/version parsing support + * [e9d239b] UpstreamSource: automatically detect package name and versions + from directories of the form packagename-<version> + * [41482a3] tests: test GitRepository.get_commit_info() + * [dd593a0] GitRepository: return GitModifier object instead of separate + fields this make sure the number of return values doesn't stays sane when + also returning timestamps and committer information. + * [92a744e] GitRepository: Add test that covers remote branches in + has_branch() + * [e6e0150] Make exception syntax consistent + * [d3ee4b0] GitRepository: Make rev_parse's short option an int everywhere + * [891ea2b] git.repository.GitRepository.add_remote_repo: use GitArgs + * [036db95] gbp.git.GitRepository: Add remove_remote + * [4db02e5] Fix variable renaming + * [f4da964] GitModifier: More flexible date handling. + Allow to pass in the date as datetime object, timestamp or git raw date. + and allow to retrieve these values. This make constructing GitModifiers + from python simpler. + * [cd829c9] GitRepository: raise GitRepositoryError on git errors. + Raise GitRepositoryError in cases where CommandExecFailed (from + GitCommand) was previously silently passed forward. + Heavily based on a patch by Markus Lehtonen. + * [7a9f947] GitModifier: use __getitem__ to fetch date + instead of accessing __dict__ directly which only has _date. + * [c4524f8] GitModifier: add tests for dict interface + * [c47deff] Remove multiple spaces + * [56a8672] Skip tests requiring devscripts if dch is not there + so tests don't fail on rpm based systems. + * [5961a4d] Test help output by importing the modules + so we get correct coverage information for the scripts + * [68efed1] gbp.command_wrappers: Reformat to 80 chars line length + * [aa2ba85] Add tests for gbp.deb.{DpkgCompareVersions,DscFile} + * [83577af] Move uscan to separate class + * [776cbb7] Improve error reporting from uscan + by parsing out the warnings and error fields from the dehs output. + + [ Markus Lehtonen ] + * [9b68e37] import-orig: move is_link_target() to common module. + This change makes is_link_target() re-usable in the upcoming RPM-tools. + * [36e0986] common/pq: use strip in apply_and_commit_patch() + Use the strip information of the patch when applying patches. Also, + changes GitRepository.apply_patch() to accept integer values as 'strip' + argument. + * [cc1ebfd] PristineTar: move Debian-specific stuff to DebianPristineTar. + Continuation to the PristineTar refactoring, makes the "common" + PristineTar independent of DebianPkgPolicy. This commit moves the + Debian-specific has_commit() and checkout() methods to DebianPristineTar + class and replaces them with more generic functions in the base class. + Also, drops the Debian-specific get_commit() method completely, as it + was not used outside the PristineTar class itself. + * [18fc698] GitRepository: fix process cwd in _git_inout() + * [1e85978] GitRepository: make get_commit_info() more robust. + Now uses git-show instead of git-log. This is needed for further + enhancements (namely to get name-status for merge commits). Also, use + null-character as the field separator which makes parsing more reliable. + The method now returns 'body' of the commit message as is, without + stripping or splitting to lines. + In addition, get_commit_info() now uses GitArgs and _git_inout() instead + of the deprecated _git_getoutput(). + * [2c668bf] GitRepository/get_commit_info: check return value of git command + correctly + * [4d56ab6] GitRepository/rev_parse: add new argument 'short' + Adds a new argument to get abbreviated SHA1. + Also, modifies rev_parse() to use GitArgs class. + * [ba55f9e] GitRepository/get_author_info: return user.name as name. + Return users full name (user.name) instead of email (user.email) as the + 'name' of the author when taking the value from git config. + * [21ac2d8] GitRepository: option to ignore untracked in is_clean() + Add an option to ignore untracked files when checking if the repository + is clean. + * [7f9776f] GitRepository/get_commit_info: add author timestamp. + Add author timestamps to the info returned by get_commit_info() method. + * [32f725f] GitRepository/get_commit_info: add committer info. + Add committer to the info returned by get_commit_info() method. Returns + committer name, email and timestamp as a GitModifier object. + * [6e4138f] GitRepository/get_commit_info: add file status. + Add file status and name to the info returned by the get_commit_info() + method. + + [ Ed Bartosh ] + * [9c54298] deb.git: Fixed typo in method name + the double underscore prefix was dropped ages ago. + + [ Daniel Dehennin ] + * [b970ca0] Test behavior of gbp.scripts.dch.main(). + * tests/11_test_dch_main.py: Test common cases with "--release" and + "--snapshot". Try 2 consecutive snapshots to check for merged entries. + + -- Guido Günther <agx@sigxcpu.org> Fri, 03 Aug 2012 19:26:48 +0200 + +git-buildpackage (0.6.0~git20120601) unstable; urgency=low + + * Upload to unstable + * [a5f0d87] git-import-dsc: add --allow-unauthenticated + (Closes: #670623) + * [a116edd] Refactor deb helpers: move PristineTar class based on a patch + by Markus Lehtonen. This refactor is preparation to the upcoming rpm + support. + * [f52a417] git-buildpackage: add missing import so move_old_export works + again + * [16f0309] git-buildpackage overlay-mode: don't fail on files named like + the tarball. Instead of moving individual files around simply rename the + directories. This is faster and independent of the tarballs content. + (Closes: #675412) + * [7f580d9] git-buildpackage: allow to build packages from detached HEAD + state with --git-ignore-branch. + (Closes: #661598) + + -- Guido Günther <agx@sigxcpu.org> Fri, 01 Jun 2012 23:44:17 +0200 + +git-buildpackage (0.6.0~git20120524) experimental; urgency=low + + [ Markus Lehtonen ] + * [3308868] Refactor deb helpers: introduce PkgPolicy class. Create a new + 'pkg' basemodule, intended to be re-used by the upcoming rpm package + helpers. Move some deb functionality to a new pkg.PkgPolicy class, to be + used as a base for different package types. Introduces Deb-specific + deb.DebianPkgPolicy. + * [082679d] Refactor deb helpers: move build_tarball_name() from + UpstreamSource class to DebianPkgPolicy. + * [f495df9] Refactor deb helpers: move UpstreamSource class to pkg base + module. This refactor is preparation to the upcoming rpm support. + + [ Guido Günther ] + * [83165aa] GitRepository.format_patches: allow to set threading format + and disable it by default. + * [5de6410] docs: complete git-dch synopsis + * [1eeb298] Add gbp.deb.ChangeLogSection to parse package and version out of + a changelog section + * [1ea487e] Don't explicitly refer to lenny-backports. + Thanks to Salvatore Bonaccorso + * [9d1459b] gbp.deb.changelog: Split parsing into a separate function + this will allow us to reparse the changelog after manipulation with dch. + * [2ecf9e3] gbp.deb.ChangeLog: Add filename property + + [ Jérémy Lal ] + * [ae850da] --ignore-branch config help fix + + [ Daniel Dehennin ] + * [c57d4af] gbp.git.repository: Add a "git merge-base" wrapper + (Closes: #672642) + * [edc6483] Provide minimalist debian/control object + (Closes: #673473) + + [ Salvatore Bonaccorso ] + * [bb32e94] git-dch: Add support for --team switch for Team uploads + (Closes: #673368) + * [016bf21] Document --bpo, --nmu and --qa in git-dch's manpage + (Closes: #673422) + + -- Guido Günther <agx@sigxcpu.org> Thu, 24 May 2012 14:05:47 +0200 + +git-buildpackage (0.6.0~git20120419) experimental; urgency=low + + [ Guido Günther ] + * [3b34b26] Make building with DEB_BUILD_OPTIONS=nocheck skip all tests + heavily based on a patch by Matthijs Kooijman (Closes: #669149) + + [ Matthijs Kooijman ] + * [a43e9b9] Git-Dch: Full in commit messages. + This new tag makes git-dch use the full commit message when generating + the Debian changelog file, even when --full is not given. (Closes: #669159) + * [b72702f] Bug#669145: Add git-dch --commit and --commit-msg options + (Closes: #669145) + + [ Markus Lehtonen ] + * [19b6e24] docs: add some missing tags to sgml files + * [9c4f34c] Refactor gbp-pq as preparation for rpm support. + Separate some functions of gbp-pq into a basemodule, intended to be + re-used by the upcoming rpm variant of the tool. + Also, introduces a new python subpackage gbp.scripts.common to be used + for the re-usable parts of the scripts in the refactoring work. + * [c8e4807] Refactor git-buildpackage as preparation for rpm support. + Separate some functions of git-buildpackage into a basemodule, intended + to be re-used by the upcoming rpm variant of the tool. + * [27c35b1] import-orig: refactor args of ask_package_* functions. + Makes ask_package_name() and ask_package_version() more generic and + re-usable in the upcoming RPM-tools. + * [5826e9c] Refactor git-import-orig as preparation for rpm support. + Separate some functions of git-import-orig into a baselib, intended to + be re-used by the upcoming rpm variant of the tool. + + -- Guido Günther <agx@sigxcpu.org> Thu, 19 Apr 2012 00:24:03 +0200 + +git-buildpackage (0.6.0~git20120415) unstable; urgency=low + + [ Guido Günther ] + * [1e68f6e] gbp.git.repository: don't append a second .git when mirroring a + repository + * [b7797f9] ALlow to set the output directory via GIT_PBUILDER_OUTPUT_DIR. + Helps with #657277 + * [407dfa1] Make the upstream version check match policy + (Closes: #668554) + * [d1ed77a] Ignore locale when checking for a clean repository + (Closes: #668896) + + [ Jö Fahlke ] + * [43e3a60] docs: correct --git-builder default value + + -- Guido Günther <agx@sigxcpu.org> Sun, 15 Apr 2012 19:05:32 +0200 + +git-buildpackage (0.6.0~git20120404) unstable; urgency=low + + * [f4529a4] docs: add --git-upstream-tag to git-buildpackage's manpage + * [96332cc] Start documenting useful options when upstream uses git. This is + quiet terse yet so follow up bugs are welcome. (Closes: #664771) + * [eae4e4a] gbp-posttag-push: Tighten branch regexp so we don't push to + branches ending with the same name accidentally. + * [169a924] gbp-add-patch: Fix typo + + -- Guido Günther <agx@sigxcpu.org> Wed, 04 Apr 2012 18:50:19 +0200 + +git-buildpackage (0.6.0~git20120324) experimental; urgency=low + + * [8fd6162] gbp-create-remote-repo: Use DebianGitRepository (Closes: #664283) + * [ddaa653] gbp-create-remote-repo: don't expect a terminal so you can do + 'echo y | gbp-create-remote-repo' + * [92cc7ba] gbp-create-remote-repo: allow to use local file transport too + * [6d4b4ff] gbp create-remote-repo: allow to pass template directory to git + init so it's possible to set up remote hooks. + * [b9d03af] gbp-create-remote-repo: add --remote-config. This specifies an + additional config file section that can be used to preconfigure different + remote locations. + * [d6e0e8d] git-import-orig: Allow to pass in an upstream vcs tag. This + allows to link the import-orig commit with the corresponding upstream vcs + tag. See #664771 for a discussion. + + -- Guido Günther <agx@sigxcpu.org> Fri, 23 Mar 2012 23:58:42 +0100 + +git-buildpackage (0.6.0~git20120315) unstable; urgency=low + + * [3cac77f] docs: Fix path to gbp-configure-unpatched-source. Thanks to + Tobias Frost (Closes: #664063) + * [2f08cbd] Parse author and comitter from changelog for native package too + (Closes: #662993) + + -- Guido Günther <agx@sigxcpu.org> Thu, 15 Mar 2012 22:39:00 +0100 + +git-buildpackage (0.6.0~git20120311) unstable; urgency=low + + * [83dcb28] Move gbp.conf manpage to section 5 and add references from the + other manpages + + -- Guido Günther <agx@sigxcpu.org> Sun, 11 Mar 2012 19:23:35 +0100 + +git-buildpackage (0.6.0~git20120227) unstable; urgency=low + + * Upload to unstable + * [45d7dc8] import_dsc: Create debian branch for native packages too + (Closes: #663001) + * [80cf6d4] Add manual page for gbp.conf. + Thanks to Jari Alto for the POD version (Closes: #661748) + * [a8b8536] Build-require a git version that supports --no-edit + (Closes: #663103) + * [b4cfcab] Remove build/ directory during clean so we don't step on any + epydoc leftovers + * [b6a4387] Bump standards version to 3.9.3 + * [6f2f554] GbpOptionParser: allow to modify list of parsed conf files + by setting the GBP_CONF_FILES environment variable. + * [38870d5] git-import-dscs: allow to ignore gbp.conf files stored in the + repository (Closes: #660898) + + -- Guido Günther <agx@sigxcpu.org> Thu, 08 Mar 2012 18:56:42 +0100 + +git-buildpackage (0.6.0~git20120226) experimental; urgency=low + + [ Markus Lehtonen ] + * [bca9f76] Refactor config.py as preparation for rpm support. + * [38afb27] docs: add missing tags to sgml files + * [2081900] gbp-pq: refactor args of write_patch() + Allows defining the formerly hardcoded patch_dir. This makes write_patch() + re-usable in the upcoming RPM-tools. + + [ Guido Günther ] + * Upload to experimental so the current version in sid can move to testing + first. + * [7726bca] Make sure we test the built modules not the system ones + * [1018809] copy_from: remove, not used anymore + * [09e4080] docs: make version pattern match the code (Closes: #650465) + Thanks: Leo 'costela' Antunes + * [970fbaa] config.py: Add default value print out to all options + * [f3aa87f] GitRepository.merge: add edit option defaulting to False + (Closes: #659239) + * [67c8513] Depend on git >= 1:1.7.9.1-1~ for a working "git merge + --no-edit". Thanks to Jonathan Nieder + + -- Guido Günther <agx@sigxcpu.org> Sun, 26 Feb 2012 12:09:23 +0100 + +git-buildpackage (0.6.0~git20120218) unstable; urgency=low + + [ Markus Lehtonen ] + * [24e7725] Make pristine_tar testcases pass with older git versions that + don't support user-defined output formats (tar filters) in git-archive. + + [ Guido Günther ] + * [14d36c0] Depend on git instead of git-core (Closes: #659661) + * [f25fa9b] Lower dependencies on python-nose and python-coverage the + versions in Squeeze are recent enough. + * [7e41626] Require git 1.7 which is already in Squeeze and Lenny Backports + * [63411b7] gbp-pq: Properly print patch name when guessing authorship + information + + -- Guido Günther <agx@sigxcpu.org> Sat, 18 Feb 2012 16:16:48 +0100 + +git-buildpackage (0.6.0~git20120210) unstable; urgency=low + + * [d279757] PristineTar: fix links in testcases + * [44814b7] Include missing doctests in generated API docs + * [3875d5d] gbp-pull: Use a DebianGitRepository (Closes: #659290) + + -- Guido Günther <agx@sigxcpu.org> Fri, 10 Feb 2012 09:30:47 +0100 + +git-buildpackage (0.6.0~git20120209) unstable; urgency=low + + * Upload to unstable + + -- Guido Günther <agx@sigxcpu.org> Thu, 09 Feb 2012 14:08:43 +0100 + +git-buildpackage (0.6.0~git20120207) experimental; urgency=low + + * Upload to unstable + * [1e51936] git-import-orig: Properly detect .tgz and other abbreviated file + extensions (Closes: #658777) + + -- Guido Günther <agx@sigxcpu.org> Tue, 07 Feb 2012 23:24:48 +0100 + +git-buildpackage (0.6.0~git20120124) experimental; urgency=low + + [ Markus Lehtonen ] + * [b7d7016] gbp-pq: don't crash in get_maintainer_from_control() even if + debian/control is missing. + + [ Guido Günther ] + * [c5eee2b] PristineTar: add missing import for debug output + * [3ca0a98] PristineTar: fix match when not passing in a compression type + * [45ab61b] Depend on pristine-tar for the tests + * [041dbf2] GitRepository: allow to capture stderr in __git_inout + stderr was always None. + * [e6fd2ce] GitRepository: Use _git_inout() in __init__() + to avoid misleading error message + + -- Guido Günther <agx@sigxcpu.org> Tue, 31 Jan 2012 10:22:13 +0100 + +git-buildpackage (0.6.0~git20120123) experimental; urgency=low + + [ Guido Günther ] + * [90fb9b2] Add "gbp-pq switch" to bash completion + * [8328c32] Allow to specify the upstream tree via --upstream-tree without + the indirection to --upstream-branch. + * [3d4adca] gbp-posttag-push: Allow to push the upstream tag too via the -u + option. + * [2d84986] gbp-post-tag-push: Add --verbose option to ease debugging + * [cd41023] git-buildpackage: Allow to pass pbuilder options via commandline + or gbp.conf + * [a31c95b] Update to git-pbuilder 1.27. This adds support for creating + backport build environments. Thanks to Russ Allbery + * [338ee68] git-buildpackage: Add --pristine-tar-commit option. This option + allows to auto commit a generated tarball to the pristine-tar branch to + simplify building non-dfsg clean packages and to make it easier to track + uptream git without having to commit the generated tarball manually. + + [ Markus Lehtonen ] + * [0c47432] Add git-depth option to gbp-clone and gbp-pull. Allows creating + and deepening shallow clones. This is sometimes useful for e.g. saving + bandwidth when cloning. + + -- Guido Günther <agx@sigxcpu.org> Mon, 23 Jan 2012 22:13:38 +0100 + +git-buildpackage (0.6.0~git20111229) experimental; urgency=low + + * [686f29c] scripts/pq: handle patches without filename extension. Don't + fail if patches don't have a proper patch header and filename extensions + (like in the heimdal package) + * [248b550] Update git-pbuilder to 1.25. + Thanks to Russ Allbery (Closes: #635061, #642355) + * [58978c5] Add --[no-]-pbuilder-autoconf to pass GIT_PBUILDER_AUTOCONF=no + to git-pbuilder. + * [01a2689] gbp-pq: add "switch" action to quickly switch between + patch-queue and base branch. + * [8f41ffb] docs: add missing dependency to manpage generation + * [6bfc8e5] Fix typo in clean target override + * [747c05d] dch: Honor epoch when guessing new upstream version. + Thanks to a lot to Daniel Dehennin for the testcase (Closes: #652366) + * [ed4e523] import_dsc: remove debian/ dir from upstream source after + importing it. This gives us the orig tarball on upstream but the debian + branch looks the same as with dpkg-source -x. (Closes: #653472) + + -- Guido Günther <agx@sigxcpu.org> Thu, 29 Dec 2011 14:52:29 +0100 + +git-buildpackage (0.6.0~git20111217) experimental; urgency=low + + * [baeee74] docs: fix version string + * [2ff6119] pq: add --force option to fore recreation of pq branch so one + doesn't have to drop the old one first. + + -- Guido Günther <agx@sigxcpu.org> Sat, 17 Dec 2011 13:28:12 +0100 + +git-buildpackage (0.6.0~git20111202) experimental; urgency=low + + [ Guido Günther ] + * [3a3539a] Document that gbp-create-repo is noninteractive + (Closes: #643752) + * [bf397fc] gbp-pq: Properly check for start of signature (Closes: #646400) + * [718f0c3] gbp-pq: Strip .patch and .diff when importing patches without a + subject + * [3fcf009] command_wrappers.Command: Don't print several error lines + * [37e8310] Allow to import upstream tarballs into bare repositories + (Closes: #582775) + * [abf90ab] Allow to import Debian packages into bare repositories + * [8c22803] gbp-pull: massive speedup by just updating the ref to the + remote's SHA1 instead of checking out the branch and doing a fast-forward + merge. + * [af07c40] gbp-pq: Instead of looking for the signature don't let git + generate it. Thanks to Robert Luberda + * [69d348c] Support postexport hooks. Heavily based on a patch by Jan Čapek + (Closes: #640982) + * [030744d] Parse the changelog of the exported tree instead of the working + copy when using --export. This reduces the number of options needed when + using an export dir since the correct tarball is now being created without + additional options. (Closes: #564791) + * GitRepository: Lots of api, documentation and test updates replacing Git* + classes by GitRepository methods. Check the apidocs for details. + * [7168735] Switch to dh + + [ Jan Čapek ] + * [d2c1033] Documentation update for --git-postexport, --git-postbuild typo + fix + * [f7a6b07] Additional documentation for postexport hook in the manual - the + documentation now provides sample postexport script and gbp.conf + + -- Guido Günther <agx@sigxcpu.org> Fri, 02 Dec 2011 19:19:51 +0100 + +git-buildpackage (0.5.32) unstable; urgency=low + + * [efe9220] Use known_compressions in guess_upstream_version too + (Closes: #645477) + * [e984baf] git-import-orig: fix --filter + + -- Guido Günther <agx@sigxcpu.org> Mon, 17 Oct 2011 10:15:22 +0200 + +git-buildpackage (0.5.31) unstable; urgency=low + + [ Guido Günther ] + * [3588d88] Fix pristine-tar error message + * [8da98da] gbp-pq: don't fail on missing series file but create an empty + branch instead + + [ Salvatore Bonaccorso ] + * [b33cf74] Fix URL to cl2vcs service. + Refer to https://honk.sigxcpu.org/cl2vcs instead of + https://honk.sigxcpu.org/cl2vcs for the cl2vcs service. (Closes: #640141) + + -- Guido Günther <agx@sigxcpu.org> Wed, 28 Sep 2011 20:21:34 +0200 + +git-buildpackage (0.5.30) unstable; urgency=low + + * [37f16cc] Document meta tags. Thanks to Raphaël Hertzog for the + suggestion (Closes: #636088) + * [f2efdaf] Add known_compressions() to UpstreamSource so we can use it for + the DscFile parsing. This fixes the import of xz compressed upstream + tarballs. + * [2da9e9e] Leave compression type detection to tar by default + * [a878947] Ignore comments and empty lines in series files. + (Closes: #637224) + * [b3931e0] Fix missing branch name in error message + * [4e2f7de] gbp-pq: Use latest patches with --time-machine. When going back + in history to find the point where the patches in debian/patches still + apply make sure we use the latest ones not the one currently in the tree. + + -- Guido Günther <agx@sigxcpu.org> Wed, 10 Aug 2011 22:25:11 +0200 + +git-buildpackage (0.5.29) unstable; urgency=low + + * [00c2b8e] Move GbpPatchQueue and GbpPatch into gbp.pq + * [2fbac77] Build epydoc API documents by default + * [42a13a1] gbp-pq: add --time-mache=N option to find the last commit the + patch-queue applies to. + * [d052ba2] Document --time-machine option + + -- Guido Günther <agx@sigxcpu.org> Sat, 30 Jul 2011 15:07:41 +0200 + +git-buildpackage (0.5.28) unstable; urgency=low + + * [3c72dfa] git-import-orig: Clarify missing argument error message + * [d34e82e] Be less picky about empty filters. (Closes: #635641) + * [a692745] Report errors reading the patch file instead of throwing an + exception. (Closes: #635872) + * [9bbbc77] Better document --git-upstream-tree. (Closes: #635883) + * [3fb7fd6] Add strip option to GitRepository.apply + * [dbe68fb] Split out GbpPatchQueue and GbpPatch to handle "-p<num>" without + munging the code further (Closes: #635873) + + -- Guido Günther <agx@sigxcpu.org> Fri, 29 Jul 2011 19:00:25 +0200 + +git-buildpackage (0.5.27) unstable; urgency=low + + [ Guido Günther ] + * [8ce3500] Add autocompletion for --git-dist= based on the available + cowbuilder images + * [7fc837a] git-import-orig: Better support uscan for non tar.gz tarballs + (Closes: #629538) + * [2d4034d] Drop suggests of git-load-dirs. It's not in the archive anymore + * [41a5d0d] Switch to dh_python2 + * [305e871] Re-enable pychecker checks + * [7360496] Support importing zip archives. This can be extended to support + other formats. + * [00e1d97] Remove fastimport code since it didn't support filters, etc. + * [8d0143a] git-import-orig: support filters for all input formats + (Closes: #628645) + * [e05e985] Add tests for UpstreamSource + * [f0ba62c] Drop unpack_orig and tar_toplevel + * [5bd3ff2] git-dch: add formatter that wraps the changelog entry + (Closes: #626439) + * [0ecd9f7] git-buildpackage: Add upstream-tree option to specify where the + upstream tarball should be created from. The default is to create the it + from the exact tag and fail otherwise. + Based on a patch by Ricardo Salveti de Araujo + + -- Guido Günther <agx@sigxcpu.org> Tue, 26 Jul 2011 22:18:29 +0200 + +git-buildpackage (0.5.26) unstable; urgency=low + + [ Guido Günther ] + * [d841899] git-pbuilder: Add git-pbuilder 1.22. + Thanks to a lot Russ Allbery (Closes: #623117) + * [43e11c7] Bump standards version. No changes necessary. + * [f5344c6] gbp-create-remote-repo: switch to git.debian.org. + Thanks to Ritesh Raj Sarraf (Closes: #632897) + + [ Courtney Bane ] + * [3a68566] gbp-create-remote-repo: Improve url handling. + Support user name expansion and different ssh ports. + Closes: #630832 + + -- Guido Günther <agx@sigxcpu.org> Wed, 06 Jul 2011 23:09:21 +0200 + +git-buildpackage (0.5.25) unstable; urgency=low + + * [f07c1fc] Make qemubuilder really a boolean option. + Thanks to Gregor Herrmann <gregoa@debian.org> for tracking this down + (Closes: #627541) + + -- Guido Günther <agx@sigxcpu.org> Sat, 21 May 2011 22:14:30 +0200 + +git-buildpackage (0.5.24) unstable; urgency=low + + [ Guido Günther ] + * [033f359] git-pbuilder: Distinguish 1.0 and 3.0 source format and set + exclude patterns for the 1.0 format. Otherwise the build fails since + dpkg-source tries to include .git. + * [09bf9f1] Add git-pbuilder 0.21. Thanks to Russ Albery. + (Closes: #601045, #601298) + * [7e022fb] Add support for qemubuilder (Closes: #601298) + * [e66c9e8] git-pbuilder: remove single quotes from '$BASE' to fix "cannot + canonicalize filename '/var/cache/pbuilder/base-sid.cow', does not exist" + failure + + [ Jon Dowland ] + * [a645073] Spelling corrections (Closes: #627378) + + -- Guido Günther <agx@sigxcpu.org> Sat, 21 May 2011 13:51:29 +0200 + +git-buildpackage (0.5.23) unstable; urgency=low + + [ Guido Günther ] + * [6710462] git-pbuilder: Drop diffignore and tarignore patterns + (Closes: #606412, #610662) + * [5b63e3f] tests: add doctests for gbp.deb.orig_file() + * [9f3030b] git-dch: improve formatting of commit subject by taking into + account idlength and the prefix added by git-dch itself. + + [ Peter Eisentraut ] + * [0958897] Correct option name in git-buildpackage man page + * [3e1fd70] Fix various typos in man pages + * [e5dd444] gbp-clone: check out the debian branch after the clone is + complete. + + -- Guido Günther <agx@sigxcpu.org> Sat, 07 May 2011 14:38:58 +0200 + +git-buildpackage (0.5.22) unstable; urgency=low + + [ Guido Günther ] + * [61513e6] git.rev_parse: unconditionally use --quiet to avoid the + confusing "fatal: Needed a single revision" error message + * [c7bb3f1] Add aliases for gz and bz2 compression types + * [dc39596] gbp: Handle whitespace in submodule names (Closes: #622103) + * [f5db59d] Disable submodule processing by default. + + [ Loïc Minier ] + * [2d620e4] Ignore .noseids from nosetests + * [8189cc9] Add tests for orig autodetection + * [85c5d8e] Detect compression from orig tarball (Closes: #621701) + + -- Guido Günther <agx@sigxcpu.org> Mon, 11 Apr 2011 09:42:50 +0200 + +git-buildpackage (0.5.21) unstable; urgency=low + + [ Guido Günther ] + * [d8142c7] git-import-dsc: don't silently drop the epoch in tags + (Closes: #620950) + * [ebc19c7] docs: Document Gbp-Pq-Topic: tag + * [82e5f4d] git-buildpackage: Call gbp.update_submodules before exporting a + tarball or creating a separate build tree. We invoke git-submodule with + --no-fetch to not break offline operation. + * [dff62f2] Make submodule support conditional + + -- Guido Günther <agx@sigxcpu.org> Wed, 06 Apr 2011 20:35:37 +0200 + +git-buildpackage (0.5.20) experimental; urgency=low + + [ Guido Günther ] + * [a618bdc] git-buildpackage: Make the desktop notification transient so + they timeout and don't clutter the notification area. + * [3b0f296] Add gbp-configure-unpatched-source example to ignore .pc and + tell dpkg-source to unpatch the source. See #591858. + * [258743a] gbp-pull: make sure git interprets arguments as revisions in + is_fast_forward so it prints a clearer error message on configuration + errors in .git/config. + * [40f4709] gbp-pq: Allow to specify subdirs for patches via the + "Gbp-Pq-Tag: <subdir>" directive in the patch header. This also gets rid + sed callouts. Add "apply" action to apply single patches. + * [fadcfcb] gbp: Add git.archive() and git.{has,get,update,add}_submodules() + and testcases. + Heavily based on work by Sean Finney and Chow Loong Jin + * [2353ab7] git-buildpackage: submodule support for dump_tree. + Heavily based on work by Sean Finney and Chow Loong Jin + * [97c32c7] git-buildpackage: submodule support for git_archive. + Heavily based on work by Sean Finney and Chow Loong Jin (Closes: #588752) + * [3b0ebe9] gbp: Don't fail on paths without extensions in get_compression() + and add doctests for that. (Closes: #618893) + * [1021f84] git-buildpackage: special case non-submodule tarfile generation. + Tarfile generation with submodules is slower since we need to + concatenate several tarfiles and compress afterwards. So special case + the common non submodule case and add a testcase to check the tarfiles + content. + * [80048e9,dcc2562,0827a33,93b4ab7,adc50a3,431075b] improve our testsuite + + [ Sean Finney ] + * [ddf5ea3] gbp: Allow to pass cwd to git.__get_output() + + [ Charles Plessy ] + * [c9f1e1e] docs: Added markup to the example for creating upstream branch. + * [0095808] docs: Easier to remember commands to create orphan upstream branch. + Closes: #619084 + + -- Guido Günther <agx@sigxcpu.org> Mon, 21 Mar 2011 21:09:32 +0100 + +git-buildpackage (0.5.19) unstable; urgency=low + + [ Jonathan Nieder ] + * [7f00d39] git-import-dsc: improve error message when upstream branch is + missing + + [ Guido Günther ] + * [b9acbf9] logging: don't use color inside Emacs's comint shell + (Closes: #612384) + * [14fdbce] gbp-clone: reparse the configuration after cloning the + repository (Closes: #607936) + * [d21506e] git-import-dscs: really use git-import-dsc from the same + location as git-import-dscs + * [b92b88f] git-import-dsc: auto create upstream branch if it's missing. + This allows to mass import old history of packages that were native and + switched to non-native later. + * [0363f47] git-import-dsc: better explain missing upstream branch. + Thanks to Jonathan Nieder for the suggestion. (Closes: #610379) + + -- Guido Günther <agx@sigxcpu.org> Fri, 11 Feb 2011 18:20:36 +0100 + +git-buildpackage (0.5.18) experimental; urgency=low + + [ Guido Günther ] + * [0b2b869] git-buildpackage: fix fallback to auto detection for unknown + compression types + * [b7136f3] gbp-pull: Adjust incorrect logging level + * [d8d2347] git-import-dscs: Ignore debsnap download errors to cope with + binNMUs. Based on a patch from Jonathan Nieder. (Closes: #610376) + * [e1661bd] git-buildpackage: print the "Looking for tarball..." message at + debug level. There's no need to print two messages in the default logging + level. + * [9054ae1] git.force_head: quiet git reset so we don't see pointless 'HEAD + is now at ...' messages during imports. + * [d36077c] Add --author-is-comitter and --author-date-is-comitter-date + commandline options (Closes: #610381) + + [ Jonathan Nieder ] + * [f2f03b7] git-import-dscs: Fix --debsnap doc and option error handling + (Closes: #610368) + * [2984d27] git-import-dsc doc updates for new options --author-is-committer + and --author-date-is-committer-date + + -- Guido Günther <agx@sigxcpu.org> Sun, 23 Jan 2011 14:52:25 +0100 + +git-buildpackage (0.5.17) experimental; urgency=low + + * [244c1d2] gbp-create-remote-repo: allow for repository names without + substitutions + * [ebc67f3] gbp-create-remote-repo: get repository name from + debian/changelog if possible + * [eb9c0e6] git-create-remote-repo: don't hardcode 'origin' as remote. This + makes it possible to create different remote repos from within the same + repository. + * [b383c96] Document --remote-name + * [8d5f78a] Use the latest commit instead of the earliest one + when guessing the compression type for pristine-tar. + Thanks to Andreas Rottmann for the detailed report (Closes: #609980) + + -- Guido Günther <agx@sigxcpu.org> Sat, 15 Jan 2011 13:46:36 +0100 + +git-buildpackage (0.5.16) experimental; urgency=low + + * [b9aae05] git-import-orig: Make --[no-]merge a proper option so it can be + configured via gbp.conf. + * [05d9ecb] gbp-create-remote-repo: allow to set up remote branch tracking + * [03f3d75] Make gbp-create-remote-repo a first class citizen. Add manpage, + move into path, add bash completion + * [5ca57cd] git-import-dsc: also set the commit date to the changelog date + when importing old history. This makes sure we get proper sorting with + e.g. gitk. + Thanks to Rob Browning for the hint and explanation + + -- Guido Günther <agx@sigxcpu.org> Tue, 11 Jan 2011 07:48:02 +0100 + +git-buildpackage (0.5.15) experimental; urgency=low + + * [b770493] git-buildpackage: Add support for sending notifications via + libnotify after the build finished. + * [bfb233a] git-dch: don't add empty changelog entries with "Git-Dch: Ignore" + * [ab06072] Require python 2.6 since we use a context manager + * [79ed2e0] Use tristate option for --color=value this allows true and false + as alias for on and off. + + -- Guido Günther <agx@sigxcpu.org> Sat, 08 Jan 2011 19:09:41 +0100 + +git-buildpackage (0.5.14) experimental; urgency=low + + [ Guido Günther ] + * [2a5df0a] docs/gbp-clone: better document --all + * [c3c76ac] docs/gbp-pull: Better document --force and --redo-pq + * [b23f05b] docs/git-import-dscs: document --debsnap to fetch from + snapshots.debian.org + * [8040433] docs/gbp-pq: fix typo in manpage. + Thanks to Emilio Pozuelo (Closes: #609166) + * [8cabb0e] Add gbp-{pull,clone,pq} examples to gbp.conf + * [eac621a] Add generated files to .gitignore + * [91b0aa8] pychecker warning cleanups (mostly unused variables and imports) + * [63d9624] Change dirs declaration to avoid false positives from pychecker. + See #608153 + * [bd2ac3a] Enable pychecker warnings + * [67bdb1f] git-import-dscs: Remove duplicate log message + * [d523065] command_wrappers: Use logging functions + * [9411f76] bash completion: parse short options too + * [7374d00] bash completion: also complete on tags + * [25677d0] bash completion: add completion for gbp-{pq,pull,clone} + * [3f05eba] bash completion: add support for tristate options like --color + * [d9ed286] bash completion: avoid space after options taking an argument. + This makes branch and tag completion more useful. + + [ Yaroslav Halchenko ] + * [2558ea7] git-import-dscs: Use git-import-dsc from the same location as + git-import-dscs. With hardcoded path it is impossible to use + git-import-dscs directly from the repository while developing both tools + * [31b4854] Spit out debug message in __git_inout + + -- Guido Günther <agx@sigxcpu.org> Fri, 07 Jan 2011 09:58:39 +0100 + +git-buildpackage (0.5.13) experimental; urgency=low + + * [7e697a9] Update the repo after the first import so master matches the + debian branch. Thanks to Rob Browning for the testcase + * [83b9235] Initialize Logger.get_color{,off} so we can print errors before + the option parsing finished. (Closes: #608004) + * [b1f081a] Rewrite gbp-pq in python so we get consistent logging and + debugging options. + * [5a312db] Allow to drop numbers from patch names via --no-patch-numbers + so patch names remain constant when interim patches are dropped. + (Closes: #592129) + + -- Guido Günther <agx@sigxcpu.org> Mon, 27 Dec 2010 00:05:30 +0100 + +git-buildpackage (0.5.12) experimental; urgency=low + + [ Guido Günther ] + * [3e0d663] Also allow for 'issue' as bugnumber prefix as used in Grml. + * [4323487] Fix off by one error by not counting. Thanks to Olivier Aubert + for pointing this out + * [5ace5eb] Better wrap thanks and closes (Closes: #529332) + * [cf98258] Move Debian tag with --ignore-same-version + so the import doesn't fail. (Closes: #606204) + * [29feba8] Change --ignore-same-version to --allow-same-version + and properly document it. This matches the defaults we had since ages. + * [3b858a9] Fix debug string formatting (Closes: #606771) + * [8a46f74] Favor ARCH environment variable over dpkg's architecture + based on a patch by Jacob Helwig. (Closes: #607318) + * [2c94f9d] Add option to open editor (Closes: #565553) + + [ Rob Browning ] + * [98b034c] Remove unused commit_msg variable from git-dch. + * [5b7b0f1] Use "log -n1" instead of "show" to retrieve commit log + information. + * [e875704] Add "*.pyc" to .gitignore. + * [3640569] Add git-dch --customizations FILE to allow changelog entry + customization: + Add support for git-dch --customizations FILE. FILE must be Python code, + and for now, the only useful thing it can do is define a + format_changelog_entry() function which will override + kgbp.dch.format_changelog_entry(). + Add a new customization option group for --customizations. Create a + gbp.dch module and move the changelog entry formatting functions there. + Create separate procedures to handle extracting metadata from the git log, + and use them in the default format_changelog_entry(). These functions are + also available for use by custom formatters: extract_git_dch_cmds(), + filter_ignore_rx_matches(), extract_bts_cmds(), extract_thanks_info(), etc. + Add a GitRepository.get_commit_info() method, and use it in git-dch + parse_commit(). (Closes: #536719) + * [d12a32f] Add --multimaint support to git-dch + + -- Guido Günther <agx@sigxcpu.org> Mon, 20 Dec 2010 16:31:12 +0100 + +git-buildpackage (0.5.11) unstable; urgency=low + + [ Matthijs Kooijman ] + * [083834b] git-import-orig: 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. (Closes: #479172) + * [ee0e9ff] 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. + + [ Guido Günther ] + * [beaee6e] git-import-orig: Add --[no]-interactive to avoid prompts on + import. + * [223b97a] Fall back to source only changes file if the architecture one + doesn't exist. (Closes: #593598) + * [a6f2974] Makes uscan options explicit - thanks to Chris Butler. + (Closes: #596003) + * [ea9a656] Don't put generated gbp/gbp_version.py into the source package. + * [c385e76] Fix download location - thanks to Rob Browning. + * [7e79bcd] Add logging functions. This allows us to color and prefix the + output. Coloring can be disanbled via the --color option. + (Closes: #544332) + + [ Yaroslav Halchenko ] + * [d62fadd] Document --git-overlay. (Closes: #598530) + + [ Benoît Knecht ] + * [dfe9104] 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 <agx@sigxcpu.org> Tue, 16 Nov 2010 13:27:41 +0100 + +git-buildpackage (0.5.10) unstable; urgency=low + + * [4b23f2d] 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 <agx@sigxcpu.org> Mon, 27 Sep 2010 09:46:52 +0200 + +git-buildpackage (0.5.9) experimental; urgency=low + + * [6a200ad] Resync with git-pbuilder 0.16 (Closes: #595055) + * [ed97b84] Add --git-arch option + * [257a3e1] Switch to debian branch before forcing the HEAD update + otherwise we might forward the current branch to another branch's + ref - thanks to Rolf Leggewie for the testcase + * [af97781] Avoid unnecessary branch switch when fixing the previous + issues. (LP: #637286) + * [70c5b22] 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) + * [02b1a03] Don't fail on missing debian/rules. (LP: #638371) + + -- Guido Günther <agx@sigxcpu.org> Fri, 17 Sep 2010 10:42:32 +0200 + +git-buildpackage (0.5.8) experimental; urgency=low + + [ Guido Günther ] + * [a09cce7] gbp-svn-tag: Simple helper to tag a version if using git-svn + * [3262621] gbp-pull: Properly handle local only changes as no update needed + * [b1bd417] git-import-dsc: Remove file and commit ambiguity + * [65bf135] git-dch: Fix exception name so we don't fail on repos without + tags. + + [ Svend Sorensen ] + * [39b1a07] Fix --git-cleaner option name in git-buildpackage man page + (Closes: #594612) + + -- Guido Günther <agx@sigxcpu.org> Wed, 01 Sep 2010 10:56:34 +0200 + +git-buildpackage (0.5.7) experimental; urgency=low + + * [07c11d5] git-pbuilder: Only output dist if set. + * [3d97dfe] git-pbuilder: Check for cowbuilder. The cowbuilder package + depends on pbuilder so this is enough. + * [7f07ed6] Recommend cowbuilder + * [0a081d4] Update copyright file + * [af3dc21] Don't fail on gbp_version import errors. This makes it easier to + test from the source tree without starting a build first. + * [c0dad1a] git-import-dsc: Catch KeyboardInterrupt + * [cc557e7] git-dch: Check for greater not unequal when looking for a new + upstream version + * [74aa351] git-buildpackage: Use --pretty=format: instead of --format= to + support the git version in Lenny. + + -- Guido Günther <agx@sigxcpu.org> Wed, 18 Aug 2010 18:18:35 +0200 + +git-buildpackage (0.5.6) experimental; urgency=low + + * [1d06128] git-pbuilder: When creating a new base image don't fail if it's + not there already. + + -- Guido Günther <agx@sigxcpu.org> Sat, 14 Aug 2010 01:26:42 +0200 + +git-buildpackage (0.5.5) experimental; urgency=low + + * [36edd3c] git-dch: Support --nmu, --bpo and --qa. (Closes: #561535) + * [7200035] git-dch: 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 to Michael Prokop + * [8d33c92] git-dch: Guess changelog version number from upstream version + * [595d6d8] git-buildpackage: Add --git-pbuilder and --git-dist=<dist> + options + * [b193936] docs: Use git-pbuilder in the pbuilder chapter + * [61e0c3c] docs: Simplify example using --download + * [76b16df] docs: Build and install git-pbuilder manpage + * [67287d0] Add git-pbuilder (Closes: #583078) - thanks to Russ Allbery + * [bc52725] Deprecate our own pbuilder helpers + * [3c6bbd0] Better version number replacement (Closes: #534494) + * [55fdbc6] Check for legacy tags where necessary. + + -- Guido Günther <agx@sigxcpu.org> Thu, 12 Aug 2010 23:35:30 +0200 + +git-buildpackage (0.5.4) unstable; urgency=low + + * [88afa61] git-dch: Pass --multimaint-merge on to dch (Closes: #586165) + * [e8b6b49] gbp-pq: Use the maintainer of the Debian package as fallback + patch author + * [f63c4ed] git-import-dsc: Don't add superfluous parents to imports on the + Debian branch. Only set a parent on the first import per upstream version. + * [af2a435] gbp-pull: Don't update already up to date branches + * [407b614] docs: Drop git_load_dirs reference we're not using it anymore. + * [dbc7fe3] docs: We don't only support .gz tarballs + * [34d6d84] Bump standards version + + -- Guido Günther <agx@sigxcpu.org> Fri, 06 Aug 2010 17:07:47 -0400 + +git-buildpackage (0.5.3) unstable; urgency=low + + * [2808207] git-dch: 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. + * [47463da] Better document the default config file. + * [57b2abf] git-dch: Set author information from git on --release when using + --git-author - thanks to Boleslaw Tokarski for his feedback. + * [ad2416e] examples/zeitgeist-git: Adjust for zeitgeist 0.4.0. + * [8676193] examples/gbp-create-remote-repos: Simple helper to create remote + repos based on dom-new-git-repo from the OCaml maintainers as well as + aa-create-repo. (Closes: #540185) + * [3ed1a5c] git-import-dscs: Fetch all snapshots from snapshots.debian.org + using debsnap and import them (Closes: #591218) + + -- Guido Günther <agx@sigxcpu.org> Mon, 02 Aug 2010 22:10:18 +0200 + +git-buildpackage (0.5.2) unstable; urgency=low + + * Upload to unstable + + -- Guido Günther <agx@sigxcpu.org> Tue, 20 Jul 2010 22:13:57 +0200 + +git-buildpackage (0.5.1) experimental; urgency=low + + [ Jonathan Nieder ] + * [a650ce3] 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 ] + * [9b8bc60] Bump standards version + + -- Guido Günther <agx@sigxcpu.org> Tue, 20 Jul 2010 21:31:30 +0200 + +git-buildpackage (0.5.0) experimental; urgency=low + + [ Guido Günther ] + * [bd1ad03] Drop dependency on python-dev since it's not needed for arch all + packages. Depend on python instead. + * [077bdb0] git-buildpackage: Add compression=auto to guess compression type + of upstream tarball from pristine-tar branch. This is now the default. + (Closes: #566993) + * [3bcb1ef] Abort if upstream tarball contains git metadata + (Closes: #571717) + * [24410e9] docs: Mention patch-queue branches + * [877166c] docs: Don't document Git-Dch: twice. Thanks to Matthijs Kooijman + (Closes: #587456) + * [719f1ae] git-import-dsc: Use commit_dir to write directly commit the + content of the unpacked orig tarball and the patched Debian tree instead + of using replace_tree. Thanks to Roger Leigh for his nice explantion on + howto do this. + (Closes: #506211, #588061) + * [fc270b5] git-import-dsc: Drop --no-merge We don't invoke 'git merge' + anymore. + * [d35ee45] git-import-orig: Use commit_dir instead of replace_tree + (Closes: #526022, #569031) + + [ Torsten Werner ] + * [d3c0901] fix typo in gbp-pq + (Closes: #587673) + + -- Guido Günther <agx@sigxcpu.org> Mon, 05 Jul 2010 21:58:14 +0200 + +git-buildpackage (0.4.68) unstable; urgency=low + + [ Guido Günther ] + * [88c2d6d] gbp-pq export: Instead of failing switch branch if on a + patch-queue branch. + * [65ea70f] gbp-pq: Use run_git to catch git errors + * [488f16c] No need to assign repo + * [7f0b81f] Strip traling slashes from repo path (Closes: #584775) + * [a831329] Add 'ignore-branch' option This disables the 'current branch' == + 'debian-branch' check. + * [5988e20] Add 'ignore-branch' option This disables the 'current branch' == + 'debian-branch' check. + + [ Christian Kastner ] + * [2173157] Add option --git-force-create to force tarball creation + (Closes: #519297) + + -- Guido Günther <agx@sigxcpu.org> Sat, 19 Jun 2010 16:07:05 +0200 + +git-buildpackage (0.4.67) unstable; urgency=low + + * [6427e2a] git-import-dsc: Add --download option. This allows to directly + import source packages either via git-import-dsc --download <pkg> or + git-import-dsc --download <url-to-dsc> The former uses "apt-get soure" the + later "dget". (Closes: #510036) + * [823f49f] gbp-pull: Document exit codes + * [9fb419f] git-import-orig: Document --uscan + * [3473689] git-buildpackage: Document --git-compression and + --git-compression-level + * [f31c82d] git-dch: Document 'Git-Dch: Ignore' and 'Git-Dch: Short' + * [65b9e0d] gbp-pq: Improve manpage and help output + * [33e56ca] git-import-dsc: Document --download + + -- Guido Günther <agx@sigxcpu.org> Sat, 15 May 2010 14:01:03 +0200 + +git-buildpackage (0.4.66) unstable; urgency=low + + [ Paul Menzel ] + * [1072473] docs/manpages/git-dch.sgml: Consistency fixes and typo. + • Start sentences with capital letter and end them with a full stop. + • s/enty/entry/ + + [ David Paleino ] + * [49e31b1] Add --uscan command-line option Launch uscan and use the + tarball, if there's a new upstream version. (Closes: #577394) + + [ Guido Günther ] + * [0826409] Bump standards version + * [6646d63] Depend on git | git-core (Closes: #577731) + * [f7a085a] Make --uscan more robust by not throwing exceptions onto the + console and catching download errors. + * [9521e6c] Fix typo - thanks to Paul Menzel + * [a2dd58d] gbp-pull: Requests for non fast-forward updates should exit with + a non-zero result (Closes: #579997) + * [b0100b6] Add simple Zeitgist data provider + * [5aefe29] Add 'Git-Dch: Short' tag to changelog parser This omits + the long description of the commit from the changelog. + + -- Guido Günther <agx@sigxcpu.org> Tue, 04 May 2010 09:08:40 +0200 + +git-buildpackage (0.4.65) unstable; urgency=low + + [ Guido Günther ] + * [07d54ef] gbp-add-patch: Strip path from patchname and handle missing + files gracefully. + * [a7fe7c4] Add basic bash completion for git-buildpackage (Closes: #567313) + - thanks to Siegfried-Angel Gevatter + * [aec185f] Add gbp-{clone,pull,pq} to description + * [24ac91c] bash-completion: Add git-dch, git-import-{orig,dsc} and tab + completion for branch names. + * [cbc0577] Add GitRepository.get_remotes() to easily query remote branches + * [4654425] gbp-clone: Add --all to track all remote branches + + [ Matthijs Kooijman ] + * [2874c23] Make the commit message for upstream imports configurable. + This adds the import-msg commandline and configuration file option + to change the commit message. (Closes: #474457) + + [ Jon Bernard ] + * [ad9b7f5] Prevent git-add-patch from being gzip'd + + -- Guido Günther <agx@sigxcpu.org> Sat, 13 Feb 2010 12:37:41 +0100 + +git-buildpackage (0.4.64) unstable; urgency=low + + * [ab40623] Add gbp-add-patch to easily commit patches from debian/patches + * [34c1c43] Allow to skip imports of same version Based on a patch by + Christoph Göhre. + * [ea6311e] DscFile: Parse name of debian.tar.gz + * [237a547] Import version 3 source format (Closes: #552771) + + -- Guido Günther <agx@sigxcpu.org> Mon, 25 Jan 2010 22:08:26 +0100 + +git-buildpackage (0.4.63) unstable; urgency=low + + [ Guido Günther ] + * [a0c7a91] docs: fix git-init call - thanks to Pietro Battiston + * [02ab603] docs: Drop superfluous upstream branch creation + * [e339c70] gbp: Make sure we drop the generated custom index file + (Closes: #561454) + * [d436612] git-dch: Add body regex filter (Closes: #544238) + * [cf45595] gbp-{pull,clone}: Don't hardcode pristine-tar branch + * [0eb4580] gbp: Allow to set compression type (Closes: #554520) + * [7ad35fb] tests: Add other gbp-* commands + * [f1f3d8e] tests: Add unpack test + + [ Matthijs Kooijman ] + * [725b9d3] git-dch: Add support for a Git-Dch: Ignore metaheader. + (Closes: #561346) + * [e54b7bf] git-dch: There was a second use of parse_commit. Both uses of + parse_commit now support the None return value. The shortlog_to_dch + function is now superfluous and was removed. + + -- Guido Günther <agx@sigxcpu.org> Sat, 26 Dec 2009 18:17:39 +0100 + +git-buildpackage (0.4.62) unstable; urgency=low + + * [dce995d] Improve error handling on broken dsc files. (Closes: #560689) + * [bcdd6b5] Improve error message when trying to import 3.0 source format + packages until we properly support them. + + -- Guido Günther <agx@sigxcpu.org> Mon, 14 Dec 2009 09:15:49 +0100 + +git-buildpackage (0.4.61) unstable; urgency=low + + * [fc96f75] switch to 3.0 (native) source format + * [bf258de] use git;// instead of http:// + * [043c75a] Make gbp-clone, gbp-pull and gbp-pq first class citizens + by moving them from examples/ to /usr/bin/ + * [c5e4148] Add documentation for gbp-{pg,pull.clone} + * [06059df] Make the default build command 3.x source format safe Instead of + passing "-i\.git/ -I.git" to debuild use "-i -I". This makes sure we use + the default behaviour of dpkg-source. (Closes: #553079) + * [ecec4d5] gbp-pull: Don't fail if no tracking branch exists. + * [5539417] cleanup symlinks + + -- Guido Günther <agx@sigxcpu.org> Thu, 26 Nov 2009 19:05:53 +0100 + +git-buildpackage (0.4.60) unstable; urgency=low + + [ Guido Günther ] + * gbp-pull: + * [9960f24] check for clean repo + * [9d190a5] add --redo-pq so a "gbp-pull --redo-pq" also refreshes the + patch-queue branch + * gbp-pq: + * [526fc0c] add option to drop patch-queue branch + * [3bf8288] Don't fail when series file is missing. Create an empty + patch-queue branch instead. + * git-import-orig: + * [eef5eca] Use "imported" instead of "merged". This way we don't claim + we merged something but we possibly didn't. (Closes: #545908) + * debian/rules: + * [5372050] Don't compress the example scripts + * docs: + * [4da84c0] document --git-retag + + [ Charles Plessy ] + * [509c1c3] Stefano Zacchiroli’s workaround for creating empty + upstream branches. (See ‘http://bugs.debian.org/cgi- + bin/bugreport.cgi?bug=471560’) + + -- Guido Günther <agx@sigxcpu.org> Sat, 07 Nov 2009 15:30:49 +0100 + +git-buildpackage (0.4.59) unstable; urgency=low + + * new tools: + * [9ccbcd2] add examples/gbp-pull. Addresses another part of #540185. + * git-buildpackage: + * [38fcab2] add --git-retag (Closes: #521329) + * git-import-orig: + * [ee3209c] Drop superfluous argument. Fixes TypeError on merge failures. + (Closes: #549885) + * examples/gbp-clone: + * [1d8fb9d] gbp-clone: import Command too. Fixes "--verbose". + * gbp module: + * [db7cbab] add GitFetch + * [6f03267] add GitRepository.get_merge_branch() + * [b543f67] add GitRepository.is_fast_forward() + * [5bf8201] move FastImport into gbp/git.py + * docs: + * [189ff52] fix link to "homepage" + + -- Guido Günther <agx@sigxcpu.org> Sat, 24 Oct 2009 21:31:08 +0200 + +git-buildpackage (0.4.58) unstable; urgency=low + + * [78bcf5e] catch config file parse errors (Closes: #545690) + * [8a9b813] docs: mention pristine-tar branch and pristine-tar + * [260afa1] docs: add missing --git- prefix + * [af4265e] git-dch: export GBP_BRANCH to postimport hook so we can pass the + current branch to git-dch + + -- Guido Günther <agx@sigxcpu.org> Mon, 05 Oct 2009 18:16:10 +0200 + +git-buildpackage (0.4.57) unstable; urgency=low + + * new tools: + * [13316be] Add gbp-clone to examples. Using this to clone + repositories will automatically track the remote branches used by + gbp. Addresses parts of #540185. + * git-dch: + * [d42ed40] Trim commit display. + * [a335e04] Catch gbp.deb.NoChangelogError. + * [98a9b88] Add changelog section if current topmost version is already + tagged. This makes sure we add a new changelog section after a + release. This was broken due to 016318. + * git-import-orig: + * [dcbe091] Use option groups for nicer --help output + * [ee6c238] Add postimport hook for git-import-orig Allows to run git- + dch after import. Drop the dch invocation and warn when --no-dch gets + passed on the commandline. (Closes: #520355) + * [aecb9b4] NEWS: --no-dch is no more (Closes: #540750) + * git-import-dsc: + * [dcbe091] Use option groups for nicer --help output + * packaging: + * [4f82dfb] Honor DEB_BUILD_OPTIONS=nocheck + * [29cacc0] Run doctests with nose + * [1f8abec] Bump standards version + * [c84fd78] TODO list maintained in the wiki + * gbp module: + * [715d42a] Drop superfluous _utils from module names + * [46d6c1b] Make sanitize_version a private function + * [75eedb8] Add doctest for __sanitize_version() and build_tag() + * [4cd72bc] Add doctest for Command.__call__() + * [a4fd8eb] Add doctest for Command.call() and fix error in exception + handling revealed by the test. + * [edfe670] Add GitClone + * [2663f23] Make GitBranch remote branch aware + * [838b3f4] Make has_branch aware of remote branches + * tests: + * [6cbbddf] Add unit test for --help + * [52d9b5a] Fix testcase name + * [e4abaad] document changes so far + + -- Guido Günther <agx@sigxcpu.org> Sat, 05 Sep 2009 16:06:11 +0200 + +git-buildpackage (0.4.56) unstable; urgency=low + + * [d6dae62] depend on devscripts >= 2.10.49 for --no-force-save-on-release + in dch. (Closes: #541420) + * [080b1eb] make parameters for GitRepository.commits() optional + * [016318e] git-dch: use the last commit in which debian/changelog was + touched as starting point if no snapshot header was found. This can still + be overriden by using --since. Based on a patch by Felipe Sateler. + (Closes: #511269) + + -- Guido Günther <agx@sigxcpu.org> Sat, 15 Aug 2009 19:24:23 +0200 + +git-buildpackage (0.4.55) unstable; urgency=low + + [ Guido Günther ] + * [651f723] fix release + * [e1bdfdb] update Homepage: + * [8ea4747] add gbp-pq to examples (Closes: #537212) + * [bedacee] check for correct overlay usage + * [849c801] bump standards version + * [f636022] add --no-force-save-on-release so dch saves the changlog + even when there are no changes so we don't end up with UNRELEASED + when passing -R. + + [ أحمد المحمودي ] + * [14915d9] make tar_toplevel safer + * [b86ddcc] add --git-overlay option (Closes: #411206) + + -- Guido Günther <agx@sigxcpu.org> Thu, 30 Jul 2009 11:27:17 +0200 + +git-buildpackage (0.4.54) unstable; urgency=low + + [ Damyan Ivanov ] + * [b577f01] Unconfuse git-dch when commit message starts with "--" + (Closes: #531985) + + [ Guido Günther ] + * [55a89e1] allow for uppercase characters in the version pattern and + in the package name if it's not a debian source package's name. Also + allow for ':' and '~' which are allowed accoring to Debian Policy. + Based on a patch by Felipe Sateler. (Closes: #531819) + * [882f971] check for snapshot mode when checking if we need to add a + new section. (Closes: #532583) - thanks to Ove Kaaven for sorting + this out + * [f80ee2e] fix one digit version numbers + * [5edecd9] + is a valid character in version numbers + + [ Mehdi Dogguy ] + * [7de9f12] add filter-pristine-tar to filter upstream tarball before + passing it to pristine-tar (Closes: #520722) + + -- Guido Günther <agx@sigxcpu.org> Fri, 03 Jul 2009 16:16:41 +0200 + +git-buildpackage (0.4.53) unstable; urgency=low + + * [b772300] pass --pretty=medium to git show (Closes: #525969) + * [5ed3078] add commit argument to GitTag + * [129b3c4] add get_author_email that parses git config and + environment + * [9ed19e7] add --fast-import. This uses git-fast-import to import the + upstream tarball, speeds up imports of upstream tarballs by a + factor of two. This options is experimental and will become the + default once it got more testing. (Closes: #449075) + + -- Guido Günther <agx@sigxcpu.org> Sun, 03 May 2009 18:35:52 +0200 + +git-buildpackage (0.4.52) unstable; urgency=low + + * [a2e42cd] move to section vcs + * [2892e7f] document postbuild hook + * [66f1027] promote pristine-tar to Recommends: + * [54b9da0] fix missing argument in error message + * [3e4b08e] restore default signal handlers before subprocess.call, python + changes them to SIG_IGN. (Closes: #525411) + + -- Guido Günther <agx@sigxcpu.org> Fri, 24 Apr 2009 17:35:44 +0200 + +git-buildpackage (0.4.51) unstable; urgency=low + + * [74a0954] git-import-dsc: don't ignore --debian-branch on import into non + empty archives + * [abe7de4] store version without epoch and simplify version parsing + * [8d2c6bd] add get_arch returns dpkg's notion of the architecture + * [e4db34b] add postbuild hook can be used to e.g. run lintian. + (Closes: #521358) + * [829db7c] pass GBP_BUILD_DIR to the build command this allows hooks + to figure out where to copy back the build result. Adjust the + cowbuilder example accordingly. + * [eaacadf] bump standards version + * [d113a3b] let the version detection patter match debian policy + (Closes: #522888) + + -- Guido Günther <agx@sigxcpu.org> Thu, 16 Apr 2009 11:47:27 +0200 + +git-buildpackage (0.4.50) unstable; urgency=low + + * [eceac16] be less strict on the spelling of boolean config file + options any capitalization of 'true' or 'false' as well as '0' and + '1' are allowed. (Closes: #517376) + * [94084b0] Skip all comments before looking for clean_msg (Closes: #518008) + * [e56c9f5] add git-builder cowbuilder example + + -- Guido Günther <agx@sigxcpu.org> Thu, 05 Mar 2009 21:08:24 +0100 + +git-buildpackage (0.4.49) unstable; urgency=low + + * [4ddcd5c] gbp-posttag-push: fix for remote repos containing '.' + * [1e62d1a] Pass "-d" to debuild when run as cleaner. This way build- + deps don't have to be fulfilled in the source tree but only in the + build tree. (Closes: #516876) + * [660acbe] better document 'Closes:' tag (Closes: #516877) + * [e3b7610] simplify boolean option handling + * [1e1a1ca] add --no-pristine-tar (Closes: #517024) + * [600a16d] add --git-no-ignore-new + * [2fa0cc8] make --[no-]full a config file option + * [6ccd482] make --export a config file option + + -- Guido Günther <agx@sigxcpu.org> Thu, 26 Feb 2009 13:48:50 +0100 + +git-buildpackage (0.4.48) unstable; urgency=low + + * [ae575e3] Add --export=WC to export the working copy into export- + dir. (Closes: #509138) + * [9f42e53] run git-cleaner with --git-ignore-new Makes running with + and without --git-ignore-new more consistent. + * [b8a35b4] docs: add --git-export=INDEX to the manual + * [47c8a38] docs: add --git-dont-purge to the manual + * [616bff3] docs: fix typo + * [15042e3] rename git-pbuilder to gbp-pbuilder + * [ffbb38a] add gbp-posttag-push example to examples/ + + -- Guido Günther <agx@sigxcpu.org> Mon, 23 Feb 2009 18:24:12 +0100 + +git-buildpackage (0.4.47) unstable; urgency=low + + * [b5a3215] export sha1, branch and tagname into the commit hooks + environment this makes it possible to push out that specific tag only + * [2be813e] document exported env vars and add example posttag hook + * [a498bdf] add GitRepository.rev_parse + * [28973fb] fix VCS-Browser URL + + -- Guido Günther <agx@sigxcpu.org> Thu, 19 Feb 2009 20:37:49 +0100 + +git-buildpackage (0.4.46) unstable; urgency=low + + [ Guido Günther ] + * [746d63b] fix typos (Closes: #510479) - thanks to Jonathan Wiltshire + * [07ceb2c] add Vcs-Browser + + [ Dietmar Winkler ] + * [a92c398] documentation typo + + [ Jonathan Wiltshire ] + * [a748f52] typo in docs/manpages/git-dch.sgml (Closes: 511096) + + [ Guido Günther ] + * [5c8de27] handle dpkg-parsechangelog errors (Closes: #512765) + + -- Guido Günther <agx@sigxcpu.org> Fri, 23 Jan 2009 18:32:27 +0100 + +git-buildpackage (0.4.45) unstable; urgency=low + + [ Robie Basak ] + * [6f4af4a] Use name and email from git (Closes: #509867) + + [ Guido Günther ] + * [b097286] document --no-sign-tags + * [6fe5985] add --no-git-author + * [7c2034c] add --no-sign-tags to git-import-{dsc,orig} too + (Closes: #508889) + + -- Guido Günther <agx@sigxcpu.org> Thu, 01 Jan 2009 20:11:16 +0100 + +git-buildpackage (0.4.44) unstable; urgency=low + + * [c54e6dc] help option cleanup (Closes: #505787) + * [45541fe] don't require bugnumbers to start with '#' - use the regex + from Debian policy instead + * [77a875c] move common help messages into config.py + * [9223997] allow to import into empty repositories this makes git- + import-dsc's behaviour finally consistent with git-import-orig + (Closes: #500458, #504075) + * [aacd04a] require python 2.5 + * [54b9a3e] better descriptions + * [e806326] add --no-sign-tags (Closes: #508889) + + -- Guido Günther <agx@sigxcpu.org> Mon, 29 Dec 2008 00:29:43 +0100 + +git-buildpackage (0.4.43) unstable; urgency=low + + * [8b8c137] gather all invocations of dch in one function - fixes dch + failures due to missing quotes introduced by [7f24b98] + * [a328fa2] fix off by one introduced by not counting first_commit + when creating a new header in [7f24b98] + + -- Guido Günther <agx@sigxcpu.org> Fri, 14 Nov 2008 14:12:04 +0100 + +git-buildpackage (0.4.42) unstable; urgency=low + + [ Guido Günther ] + * [b5e8691] debian/control: fix maintainer + * [ee9e51d] doc: mention cl2vcs + * [a0c03e1] doc: fix typo + * [0314acc] git-buildpacakge: use option groups + * [2d44dad] git-dch: merge sha and snapshot parameter + + [ Felipe Sateler ] + * [7f24b98] git-dch: Don't include first UNRELEASED line - There's not much + point in keeping this line when either doing a release or when having a + snapshot header (nor does it help much if one invokes git-dch without + options). (Closes: #505400) + + [ Guido Günther ] + * [a6f5472] git-import-orig: Don't fail on symlink creation (Closes: #502565) + * [b7f8efd] git-dch: add missing call to escape_commit + + -- Guido Günther <agx@sigxcpu.org> Thu, 13 Nov 2008 17:08:52 +0100 + +git-buildpackage (0.4.41) unstable; urgency=low + + * [8b15994] allow for another config file $REPO/debian/gbp.conf + (Closes: #502253) + * [1ef4e04] add repo.set_branch() to switch branches + * [d4d4580] use repo.set_branch() + * [245d5f1] add GbpNothingImported exception + * [c410c0b] switch back to original branch on empty imports + (Closes: #504029, #504072) + + -- Guido Günther <agx@sigxcpu.org> Fri, 31 Oct 2008 10:28:47 +0100 + +git-buildpackage (0.4.40) unstable; urgency=low + + [ Guido Guenther ] + * [d87e2ab] fix typo (Closes: #500167) - thanks to Aleksej R. Serdyukov + * [632c9b4] gbp.git_utils.GitRepository: make indentation more consistent + * [b1a2847] adjust is_clean for git 1.6 (Closes: #500238) + * [3332982] gbp.deb_utils.symlink_orig: remove superflous printout + * [fb6187f] silence parse_dsc and move sanity checks into DscFile + + [ Kurt B. Kaiser ] + * [bbd9946] Force tarball symlink on second export to build-area + (Closes: #500498) + + -- Guido Guenther <agx@sigxcpu.org> Thu, 02 Oct 2008 12:26:56 +0200 + +git-buildpackage (0.4.39) unstable; urgency=low + + [ Kurt B. Kaiser ] + * [ac30b9b] Don't buffer stdout; let git-bp messages print in-line + (Closes: #479846) + + [ Guido Guenther ] + * [4da9954] git-import-dscs: likewise + * [2162ead] git-dch: demangle adding commits and sections + * [af70d4d] git-dch: improve wording + * [bbf5020] git-dch: more option grouping + * [3931f70] git-import-orig: print version number on failed imports + * [745fbf6] git-import-dsc: merge by default when importing into an existing archive + (Closes: #475571) + * [631c347] git-import-dsc.sgml: document --no-merge + * [2f46ba4] gbp: Don't honor .gitignore during replace_source_tree + (Closes: #467504) + * [624bdc9] gbp: move replace_source_tree into GitRepository + * [519901e] gbp: add find_tag(branch) + + -- Guido Guenther <agx@sigxcpu.org> Mon, 22 Sep 2008 20:55:07 +0200 + +git-buildpackage (0.4.38) unstable; urgency=low + + * [1623560] "git-commond" vs. "git command" cleanup (Closes: #497335) + * [0a34c3b] add --new-version + * [2a17687] document --new-version + * [fc67ac2] document short options and snapshot mode + + -- Guido Guenther <agx@sigxcpu.org> Mon, 08 Sep 2008 18:48:58 +0200 + +git-buildpackage (0.4.37) unstable; urgency=low + + * [d1ea39d] allow setting the bug-closing meta tag to look for this + way we can generate bug-closing entries for different BTSs such as + Debian or Launchpad. + * [0376265] document meta-closes + * [4da3586] fix commit order of GitRepository.commits() - we request + since..until but got until..since. This makes the order of changelog + entries generated by git-dch the same order as if git-dch would be + called individually for each commit. + + -- Guido Guenther <agx@sigxcpu.org> Sat, 30 Aug 2008 14:20:11 +0200 + +git-buildpackage (0.4.36) unstable; urgency=low + + * [64808df] Warn if we can't parse the changelog - without a changelog we + can't parse the package name. Without that we might end up with wrong + names on the pristine tar branch and with missing symlinks in tarball-dir. + Since this might be intentional we issue a warning only. + * [32b2e89] detect flat tar archives in git-import-dsc too + * [277581c] don't fail import on non rfc822 adressess in the dsc file + (Closes: #494753) + + -- Guido Guenther <agx@sigxcpu.org> Tue, 12 Aug 2008 19:31:26 +0200 + +git-buildpackage (0.4.35) unstable; urgency=low + + * [e012d8b] add epoch parsing to DscFile (Closes: #493214) + + -- Guido Guenther <agx@sigxcpu.org> Fri, 01 Aug 2008 19:32:01 +0200 + +git-buildpackage (0.4.34) unstable; urgency=low + + * [4ac0aa8] git-buildpackage: always symlink orig.tar.gz from tarball dir + (Closes: 490706) + * [fb94fea] git-buildpackage: print default export-dir on --help + * [ffeb40e] git-dch: escape backticks (`) (Closes: 491104) + * [4e398cc] git-dch: --auto and --since are incompatible + * [3537f24] git-dch: use option groups + * [18d8405] git-dch: split git-log options into a list (Closes: #479267) + * [044083f] docs: readd list import line (Closes: #488120) + + -- Guido Guenther <agx@sigxcpu.org> Tue, 22 Jul 2008 00:29:49 -0230 + +git-buildpackage (0.4.33) unstable; urgency=low + + [ Adeodato Simó ] + * [35c92a4] git-import-orig: merge upstream by tag name instead of by + branch name. + * [f1ca044] command_wrappers.py: add a GitMerge wrapper class. + + [ Guido Guenther ] + * [9bbd5d2] make symlink_orig's error message more helpful + * [26c0310] make no-dch configurable via gbp.conf + * [e6ce2df] bump standards version + * [45b060e] mention git-import-dscs + * [721068a] add "meta" to sample config file + + -- Guido Guenther <agx@sigxcpu.org> Thu, 26 Jun 2008 16:47:55 +0200 + +git-buildpackage (0.4.32) unstable; urgency=low + + * [217263e] Don't set the version number twice - makes sure git-import-dsc + doesn't use the Version: line from the message instead of the signature on + old PGP signatures (Closes: #486397) + * [063fab5] escape $s in commit messages so variable names like + $remote_fs don't get dropped silently. (Closes: #486447) + * [6008c37] don't try to cleanup in case of tag_only (Closes: #486398) + + -- Guido Guenther <agx@sigxcpu.org> Mon, 16 Jun 2008 17:54:09 +0200 + +git-buildpackage (0.4.31) unstable; urgency=low + + * [bf8738f] add --git-tag-only (Closes: #485114) + * [b06bcf0] document git-import-dscs + * [c1deeb2] add epoch to dch call (Closes: #483718) + * [6640ac7] Fix typo (Closes: #484243) + + -- Guido Guenther <agx@sigxcpu.org> Thu, 12 Jun 2008 16:53:45 +0200 + +git-buildpackage (0.4.30) unstable; urgency=low + + * [cc9c42a] Try harder to find/build the upstream tarball (Closes: + #482786) + * [e6dd31e] Help pristine-tar to find the branch name (Closes: + #481806) + + -- Guido Guenther <agx@sigxcpu.org> Thu, 29 May 2008 13:24:51 +0200 + +git-buildpackage (0.4.29) unstable; urgency=low + + * [ce152d4] git-dch: include the commit id in the changelog entry + * [ad6ff99] git-dch: print default value of --meta + * [2c1c265] git-dch: avoid extra space before "(Closes: )" + * [6ddf168] add git-import-dscs (Closes: #471580) + * [2cfbf05] move dsc handling into deb_utils + + -- Guido Guenther <agx@sigxcpu.org> Sat, 17 May 2008 22:01:49 +0200 + +git-buildpackage (0.4.28) unstable; urgency=low + + * git-buildpackage: add --git-dont-purge to leave the exported build dir + intact (Closes: #479848) - thanks to Kurt B. Kaiser for the patch + * git-dch: make --meta a config file option + * git-import-orig: fix symlink creation + * docs: missing EOF (Closes: #479726) - thanks to Sedat Dilek + + -- Guido Guenther <agx@sigxcpu.org> Mon, 12 May 2008 18:03:47 +0200 + +git-buildpackage (0.4.27) unstable; urgency=low + + * make author parsing more robust (Closes: #479263) + * fix --git-export (Closes: #479147) + + -- Guido Guenther <agx@sigxcpu.org> Sun, 04 May 2008 16:43:43 +0200 + +git-buildpackage (0.4.26) unstable; urgency=low + + * git-export=INDEX exports the index into git-export-dir + (Closes: #471568) + * make ignore-new a config file option (Closes: #466900) + * build-depend on python-dateutil (Closes: #477959) + * git-dch: + * use --no-auto-nmu + * error handling fixes + * depend on devscripts that has dch --no-auto-nmu + * gbp/config.py: make boolean options parsing more robust + * add a link to the online version of the manual + + -- Guido Guenther <agx@sigxcpu.org> Mon, 28 Apr 2008 16:36:44 +0200 + +git-buildpackage (0.4.25) unstable; urgency=low + + * create a symlink archive -> <package>_<version>.orig.tar.gz this makes + sure pristine_tar uses the correct filename for the orig.tar.gz. (Closes: + #475316) + * fix unpack_orig error reporting by adding the missing imports + * fix "pristine-tar missing" error message + + -- Guido Guenther <agx@sigxcpu.org> Fri, 18 Apr 2008 11:33:46 +0200 + +git-buildpackage (0.4.24) unstable; urgency=low + + [ Adeodato Simó ] + * Make commits from git-import-dsc get author and date from + debian/changelog. + + [ Guido Guenther ] + * add rfc822_date_to_git() this function converts a date in RFC822 + format to a string 'seconds_since_epoch tz' that can be used for eg. + GIT_AUTHOR_DATE. + * better handle broken dsc files + + -- Guido Guenther <agx@sigxcpu.org> Mon, 14 Apr 2008 14:39:37 +0200 + +git-buildpackage (0.4.23) unstable; urgency=low + + [ Frank S. Thomas ] + * docs/manpages/*.sgml: Use the citerefentry for references to other + manpages. + * Do not list the --upstream-version option twice in the synopsis + section of git-import-orig's manpage. (Closes: #472496) + + [ Guido Guenther ] + * don't pass nonexisting branches to pristine-tar (Closes: #475554) + * doc cleanups (Closes: 473610): + * mention the html manual in the manpages + * reference pristine-tar + * filter uses glob + * move conffiles section into separate sgml file + * fix doc-base section + + -- Guido Guenther <agx@sigxcpu.org> Fri, 11 Apr 2008 19:18:08 +0200 + +git-buildpackage (0.4.22) unstable; urgency=low + + * git-dch: don't skip meta tags without --force + * gbp: git-core 1.5.3.4 doesn't support -q so use --quiet instead + * fix typos in documentation (Closes: #471582) - thanks to Michael + Biebl + + -- Guido Guenther <agx@sigxcpu.org> Wed, 19 Mar 2008 18:03:20 +0100 + +git-buildpackage (0.4.21) unstable; urgency=low + + * allow meta tags in the commit logs + * add --full and --meta options --full (Closes: #468118) + + -- Guido Guenther <agx@sigxcpu.org> Fri, 14 Mar 2008 20:42:53 +0100 + +git-buildpackage (0.4.20) unstable; urgency=low + + * add missing pngs (Closes: #469403) + * be more verbose on pbuilder (Closes: #469138) + * explain howto push tags and mention linda and lintian (Closes: #469436) + + -- Guido Guenther <agx@sigxcpu.org> Thu, 06 Mar 2008 08:48:02 +0100 + +git-buildpackage (0.4.19) unstable; urgency=low + + * don't fail of the pristine-tar branch doesn't exist + (Closes: #468675) + + -- Guido Guenther <agx@sigxcpu.org> Sat, 01 Mar 2008 14:22:20 +0100 + +git-buildpackage (0.4.18) unstable; urgency=low + + * update documentation about git-import-dsc and --filter + * gbp/command_wrappers.py: make error messages more consistent + * git-import-dsc: don't throw a python exception on tag failures or non + existant branches + + -- Guido Guenther <agx@sigxcpu.org> Fri, 29 Feb 2008 18:05:40 +0100 + +git-buildpackage (0.4.17) unstable; urgency=low + + * make dsc import repeatable (Closes: #468120, #432082) + * drop now (due to git-apply) unneeded code + + -- Guido Guenther <agx@sigxcpu.org> Fri, 29 Feb 2008 16:09:47 +0100 + +git-buildpackage (0.4.16) unstable; urgency=low + + [ Guido Guenther ] + * speed up git-import-dsc by using git-apply (addresses parts of + #449075) + * update docs and gbp.conf with --filter and filter = [ ... ] + + [ Harald Braumann ] + * allow multiple file filters for git-import-{orig,dsc} (Closes: #464653) + + -- Guido Guenther <agx@sigxcpu.org> Sun, 24 Feb 2008 14:56:47 +0100 + +git-buildpackage (0.4.15) unstable; urgency=low + + * add (for now experimental) pristine-tar support based on a patch from + Julian Andres Klode (Closes: #463580) + * document pristine-tar options + * suggest pristine-tar + * don't use the deprecated git-* command versions + + -- Guido Guenther <agx@sigxcpu.org> Thu, 21 Feb 2008 16:25:33 +0100 + +git-buildpackage (0.4.14) unstable; urgency=low + + * correct several typos in the manual (Closes: #464582, #464583, + #464617) + * better dpkg-parsechangelog error reporting (Closes: #460195) + * document default tag formats (Closes: #464100) + * git-import-orig: detect flat tar archives (Closes: #463822) + * git-import-orig: add --no-dch options + + -- Guido Guenther <agx@sigxcpu.org> Fri, 08 Feb 2008 17:38:29 +0100 + +git-buildpackage (0.4.13) unstable; urgency=low + + * git-import-orig: don't fail when importing into empty git archives + + -- Guido Guenther <agx@sigxcpu.org> Fri, 28 Dec 2007 23:01:29 +0100 + +git-buildpackage (0.4.12) unstable; urgency=low + + * remove unused debian/dirs + * bump standards version + * add a homepage field + * add doc-base file (Closes: #457495) + * git-import-orig: fix doc url (Closes: #456535) + * use export-dir instead of build-area in gbp.conf because git- + buildpackage has no --git-build-area option - thanks to Frank S. Thomas + for the patch. + + -- Guido Guenther <agx@sigxcpu.org> Sun, 23 Dec 2007 20:35:45 +0100 + +git-buildpackage (0.4.11) unstable; urgency=low + + * --export-dir and --export are actually --git-export-dir and --git- + export (Closes: #456384) - thanks to Frank S. Thomas for the patch. + * don't start a new changelog section if we found a snapshot header + even when distribution != UNRELEASED + + -- Guido Guenther <agx@sigxcpu.org> Sat, 15 Dec 2007 17:16:34 +0100 + +git-buildpackage (0.4.10) unstable; urgency=low + + * git-ls-files: separate filenames by '\0', based on a patch from Uwe + Kleine-König <Uwe.Kleine-Koenig@digi.com> (Closes: #454470) + * git-import-dsc: return non null on failure + + -- Guido Guenther <agx@sigxcpu.org> Fri, 07 Dec 2007 23:19:39 +0100 + +git-buildpackage (0.4.9) unstable; urgency=low + + * fix "gpb gets confused by color enabled on branches..." - thanks to + Niv Sardi for the patch (Closes: #452921) + + -- Guido Guenther <agx@sigxcpu.org> Mon, 26 Nov 2007 17:22:48 +0100 + +git-buildpackage (0.4.8) unstable; urgency=low + + * git-buildpacakge: make sure we don't switch directories during build + (Closes: #451550) + * debian/control: use the now official Vcs-Git + + -- Guido Guenther <agx@sigxcpu.org> Mon, 19 Nov 2007 18:50:08 +0100 + +git-buildpackage (0.4.7) unstable; urgency=low + + * add tarball-dir option losely based on patch from Sjoerd Simons + (Closes: #448357) + * don't print a commit summary when importing into empty repos + (addresses parts of #449075) + + -- Guido Guenther <agx@sigxcpu.org> Mon, 05 Nov 2007 20:09:15 +0100 + +git-buildpackage (0.4.6) unstable; urgency=low + + * fix url (Closes: #448350) + * call gzip with "-n" (Closes: #449094) - thanks to Romain Francoise + * add .gitignore + + -- Guido Guenther <agx@sigxcpu.org> Sun, 04 Nov 2007 16:20:36 +0100 + +git-buildpackage (0.4.5) unstable; urgency=low + + * git-import-orig: fix missing s/upstream/upstream_branch/ rename + (Closes: #447920) - Thanks to Arnaud Cornet + + -- Guido Guenther <agx@sigxcpu.org> Wed, 24 Oct 2007 22:56:24 +0200 + +git-buildpackage (0.4.4) unstable; urgency=low + + * git-buildpackage: use upstream-branch in case the tag doesn't exist + + -- Guido Guenther <agx@sigxcpu.org> Mon, 22 Oct 2007 17:00:12 +0200 + +git-buildpackage (0.4.3) experimental; urgency=low + + * git-dch: properly quote "" (Closes: #447211) + * git-dch: use Command() instead of implementing it again + * documentation updates + * don't split up the manual that much (local.dsl taken from + darcs-buildpackage) + * add version number to docs and a tools (--version) + * pylint and other consistency updates + + -- Guido Guenther <agx@sigxcpu.org> Fri, 19 Oct 2007 10:12:40 +0200 + +git-buildpackage (0.4.2) experimental; urgency=low + + * git-dch: + * make --git-log a config file option + * git-dch: fix help message for --debian-branch + * doc: snapshot-number can be used in gbp.conf too + * git-buildpackage: + * add --git-export-dir=dir/, --git-export=treeish (Closes: #446042) + * allow to use any treeish object for --git-upstream-branch + * add missing examples to gbp.conf + * parse .gbp.conf in the repository directory (Closes: #426009) + * minor doc updates and clarifications + + -- Guido Guenther <agx@sigxcpu.org> Wed, 17 Oct 2007 00:00:13 +0200 + +git-buildpackage (0.4.1) unstable; urgency=low + + * make sure the changelog section's trailer points to the person + invoking git-dch + * depend on devscripts with a working 'dch ""' + * git-dch: eval() the snapshot number calculation + + -- Guido Guenther <agx@sigxcpu.org> Wed, 10 Oct 2007 18:15:54 +0200 + +git-buildpackage (0.4.0) experimental; urgency=low + + * add support for automatic snapshot releases as suggested by Ottavio + Salvador + * make git-dch actually useful: + * --auto: guess last changelogged commit from the snapshot header + * add short options for --snapshot and --release + * don't fail if the commit msg starts with '--' + * add a check for the debian branch instead of always using it as the + tip + * handle versions containing epochs + * add --git-log to pass options along to git-log + * allow to specify paths to look at: git-dch path1 path2 - useful if + upstream uses git + * add some basic documentation for git-dch + + -- Guido Guenther <agx@sigxcpu.org> Sun, 07 Oct 2007 15:32:40 +0200 + +git-buildpackage (0.3.6) unstable; urgency=low + + * create upstream branch when importing into an empty archive + (Closes: #443305) + * detect upstream version from common tarball formats + (Closes: #443306) + + -- Guido Guenther <agx@sigxcpu.org> Wed, 03 Oct 2007 18:01:15 +0200 + +git-buildpackage (0.3.5) unstable; urgency=low + + * add a minimalistic git-dch that creates changelog entries from git commit + messages + * s/reopsitory/repository/ - thanks to Loïc Minier (Closes: #444702) + * update TODO + * short paragraph on hacking on arbitrary debian packages + + -- Guido Guenther <agx@sigxcpu.org> Wed, 03 Oct 2007 14:10:05 +0200 + +git-buildpackage (0.3.4) unstable; urgency=low + + * introduce --git-no-create-orig to skip building of any orig.tar.gz - this + is especially usefull if you're working on an NMU that has a X-0.Y version + number although it's a Debian native package + * fix the error path in case the tgz can't be unpacked + * git-pbuilder: add filter for git meta data and allow to pass options to + pbuilder vi $PBUILDER_OPTS (Closes: #439535) + + -- Guido Guenther <agx@sigxcpu.org> Sat, 08 Sep 2007 20:40:36 +0200 + +git-buildpackage (0.3.3) unstable; urgency=low + + * git-buildpackage: don't hardcode -i\.git -I.git as build arguments + (Closes: #438669) + * git-import-dsc: support --debian-branch (Closes: #432084) + + -- Guido Guenther <agx@sigxcpu.org> Mon, 20 Aug 2007 19:22:24 +0200 + +git-buildpackage (0.3.2) unstable; urgency=low + + * git-import-orig: allow to import into an empy git repository + * docs: we don't use git_load_dirs internally anymore + * docs: howto start a package from scratch + + -- Guido Guenther <agx@sigxcpu.org> Wed, 27 Jun 2007 04:06:33 +0300 + +git-buildpackage (0.3.1) unstable; urgency=low + + * don't fail imports on large archives + * print a sensible error message, when a git repository isn't a debian + source package + + -- Guido Guenther <agx@sigxcpu.org> Mon, 11 Jun 2007 18:06:15 +0200 + +git-buildpackage (0.3.0) unstable; urgency=low + + * don't use git_load_dirs for imports, this addresses: + * upstream directory removal (#423363) + * empty dirs and files not under version control (#409606) + * filtering out of files (Closes: #425986) + * importing of an empty .diff.gz (like libx86 0.99-1.2) + * doc: remove stray ';' from special.sgml. Thanks to Loïc Minier + * doc: gbp.conf is per working copy, not per repository + + -- Guido Guenther <agx@sigxcpu.org> Mon, 28 May 2007 03:19:32 +0200 + +git-buildpackage (0.2.31) unstable; urgency=low + + * git-import-orig: rename --upstreamversion to --upstream-version, to match + the documentation and the other --upstream-* options + * add several missing options to manpages and documentation + + -- Guido Guenther <agx@sigxcpu.org> Thu, 24 May 2007 09:38:35 +0200 + +git-buildpackage (0.2.30) unstable; urgency=low + + * fix changelog upstream version parsing (Closes: #425615) + * git-import-orig: allow to import from an unpacked source tree + + -- Guido Guenther <agx@sigxcpu.org> Thu, 24 May 2007 06:19:06 +0200 + +git-buildpackage (0.2.29) unstable; urgency=low + + * git-import-orig: more specific error message, when the merge merge fails + (Closes: #424036) + + -- Guido Guenther <agx@sigxcpu.org> Tue, 15 May 2007 23:55:07 +0200 + +git-buildpackage (0.2.28) unstable; urgency=low + + * git-import-orig: support import of tar.bz2 (Closes: #423254) + * type fixes by Aurélien GÉRÔME. Thanks! (Closes: #422171) + + -- Guido Guenther <agx@sigxcpu.org> Sun, 13 May 2007 14:13:00 +0200 + +git-buildpackage (0.2.27) unstable; urgency=low + + * git_load_dirs now supports --summary, use this for nicer import messages + * bump versioned dependency on git-load-dirs therefore + * improve tagging messages + + -- Guido Guenther <agx@sigxcpu.org> Thu, 12 Apr 2007 18:25:40 +0200 + +git-buildpackage (0.2.26) unstable; urgency=low + + * use GbpError everywhere + * move commands into a submodule + * git-import-orig: pass --verbose on to git_load_dirs + * use default python version in setup.py + * depend on a git that has the "removed files left in working copy after + merge" bug (#410325) + * adjust to new output of git-status in git 1.5 + + -- Guido Guenther <agx@sigxcpu.org> Tue, 27 Feb 2007 19:11:06 +0100 + +git-buildpackage (0.2.25) unstable; urgency=low + + * posttag support for git-buildpackage: use --git-posttag to run a command + after a successfull build and tag (e.g. --git-posttag='git-push --tags + git.alioth.org') + * repositories that weren't created by git-import-dsc and never had the + upstream sources as a single commit (let alone an upstream branch) can be + made git-import-orig compatible by using git's grafts - mention this in + the manual. This (Closes: #403988) since with this every git repo can use + git-import-orig (with some preparation). + * Allow to specify the tag format. The format of generated tags can now be + specified via the debian-tag and upsteam-tag options. The default now puts + debian tags and upstream tags into different namespaces (Closes: #408990). + * add example for pbuilder + + -- Guido Guenther <agx@sigxcpu.org> Fri, 2 Feb 2007 16:26:52 +0100 + +git-buildpackage (0.2.24) unstable; urgency=low + + * add XS-Vcs-Git + * fix error message in case the upstream branch doesn't exist + + -- Guido Guenther <agx@sigxcpu.org> Sat, 13 Jan 2007 22:05:23 +0100 + +git-buildpackage (0.2.23) unstable; urgency=low + + * depend on gtk-doc-tools, sgml2x and jade (Closes: #404673) + * use docbook-utils insted of docbook-to-man + * docbook updates + + -- Guido Guenther <agx@sigxcpu.org> Fri, 29 Dec 2006 18:18:50 +0100 + +git-buildpackage (0.2.22) unstable; urgency=low + + * git-buildpackage: check if upstream branch exists + * git-import-dsc: improve error handling + * add GitRepository class + * make pylint a bit happier + * update manpages + + -- Guido Guenther <agx@sigxcpu.org> Tue, 26 Dec 2006 00:27:44 +0100 + +git-buildpackage (0.2.21) unstable; urgency=low + + * While dpkg-buildpackage's -i argument takes a regexp -I doesn't - fix + inclusion of git metadata in debian native packages + + -- Guido Guenther <agx@sigxcpu.org> Fri, 22 Dec 2006 17:59:49 +0100 + +git-buildpackage (0.2.20) unstable; urgency=low + + * git-import-orig: improve error message when the upstream branch cannot be + found. We cannot create the branch automatically since on repositories + not created by git-import-dsc it's not clear where to branch from. + (Closes: #403990) + * remove pointless patch arguments from most of the git helper functions + * add some more documentation + + -- Guido Guenther <agx@sigxcpu.org> Fri, 22 Dec 2006 17:30:11 +0100 + +git-buildpackage (0.2.19) unstable; urgency=low + + * git-buildpackage: add an option (--git-cleaner) that allows to specify + a different clean command (Closes: #403987) + * depend on a git-core that has git-archive + * s/keyid/GPG keyid/ + * minor fixes all over the place + + -- Guido Guenther <agx@sigxcpu.org> Thu, 21 Dec 2006 15:18:40 +0100 + +git-buildpackage (0.2.18) experimental; urgency=low + + * git-buildpackage: detect the branch we're on and bail out if it's not the + debian branch + * doc updates + + -- Guido Guenther <agx@sigxcpu.org> Sun, 10 Dec 2006 14:57:35 +0100 + +git-buildpackage (0.2.17) experimental; urgency=low + + * fix wrong default debian branch + * git-buildpackage: fix typo in git-ignore-new + + -- Guido Guenther <agx@sigxcpu.org> Sat, 9 Dec 2006 13:22:33 +0100 + +git-buildpackage (0.2.16) experimental; urgency=low + + * git-buildpackage: properly pass builder args + + -- Guido Guenther <agx@sigxcpu.org> Fri, 8 Dec 2006 17:13:32 +0100 + +git-buildpackage (0.2.15) experimental; urgency=low + + * git-buildpackage now supports signed tags via the "sign-tag" and "keyid" + options. This allows us to have a nice "trustable" history. See: + http://www.kernel.org/pub/software/scm/git/docs/ + on how this ensured. + + -- Guido Guenther <agx@sigxcpu.org> Wed, 6 Dec 2006 22:04:41 +0100 + +git-buildpackage (0.2.14) experimental; urgency=low + + * config file parsing to set default branches and build commands + + -- Guido Guenther <agx@sigxcpu.org> Tue, 5 Dec 2006 19:36:41 +0100 + +git-buildpackage (0.2.13) experimental; urgency=low + + * fix typos in 'git-buildpackage -v' + + -- Guido Guenther <agx@sigxcpu.org> Sun, 3 Dec 2006 22:27:11 +0100 + +git-buildpackage (0.2.12) experimental; urgency=low + + * upload to experimental (Closes: #389710) + * bump dependency on git-load-dirs again + + -- Guido Guenther <agx@sigxcpu.org> Thu, 30 Nov 2006 09:47:33 +0100 + +git-buildpackage (0.2.11) git-buildpackage; urgency=low + + * git-buildpackage: use pipes module instead of os.system + * git-import-orig: fix printout of branch name + + -- Guido Guenther <agx@sigxcpu.org> Tue, 28 Nov 2006 16:33:54 +0100 + +git-buildpackage (0.2.10) git-buildpackage; urgency=low + + * build an orig.tar.gz if nones there + + -- Guido Guenther <agx@sigxcpu.org> Sun, 19 Nov 2006 14:17:40 +0100 + +git-buildpackage (0.2.9) git-buildpackage; urgency=low + + * depend on a fixed git-load-dirs that contains the git_load_dirs executable + * git-import-dsc: fix importing debian native packages + + -- Guido Guenther <agx@sigxcpu.org> Tue, 14 Nov 2006 12:39:26 +0100 + +git-buildpackage (0.2.8) git-buildpackage; urgency=low + + * sanitze_version: strip of epochs + * don't use a regexp for version parsing on import + * minor cosmetic cleanups all over the place + * README: no need to mention git-load-dirs anymore, it's in unstable now. + Thanks John. + * git-import-orig: implement "--no-merge" + + -- Guido Guenther <agx@sigxcpu.org> Wed, 8 Nov 2006 10:36:55 +0100 + +git-buildpackage (0.2.7) git-buildpackage; urgency=low + + * more robust regex matching + * sanitize all version numbers before running git-tag + + -- Guido Guenther <agx@sigxcpu.org> Fri, 6 Oct 2006 18:40:12 +0200 + +git-buildpackage (0.2.6) git-buildpackage; urgency=low + + * run pychecker during build + * also filter out git metadata when building tarballs, not only when + building diffs (affects Debian native packages) + * git-import-dsc: allow for '+' in Debian as well as upstream version + numbers + * check if we're at the top level of a git repository before starting the + build + + -- Guido Guenther <agx@sigxcpu.org> Thu, 5 Oct 2006 19:46:23 +0200 + +git-buildpackage (0.2.5) git-buildpackage; urgency=low + + * fix syntax error in tag replacement + * minor manpage reformating + * cleanup generated manpage.* files + + -- Guido Guenther <agx@sigxcpu.org> Thu, 5 Oct 2006 11:21:01 +0200 + +git-buildpackage (0.2.4) git-buildpackage; urgency=low + + * add manpages + + -- Guido Guenther <agx@sigxcpu.org> Wed, 4 Oct 2006 19:39:13 +0200 + +git-buildpackage (0.2.3) git-buildpackage; urgency=low + + * git doesn't like '~' in tag names so replace this with a dot when tagging + + -- Guido Guenther <agx@sigxcpu.org> Mon, 2 Oct 2006 18:30:20 +0200 + +git-buildpackage (0.2.2) git-buildpackage; urgency=low + + * git-import-dsc: don't fail if the dsc is a plain filename without a + directory component + * git-buildpackage: add --git-verbose option + * git-import-{orig,dsc}: allow to set the name of the upstream branch + + -- Guido Guenther <agx@sigxcpu.org> Fri, 29 Sep 2006 19:08:08 +0200 + +git-buildpackage (0.2.1) git-buildpackage; urgency=low + + * git-import-orig: don't try import new upstream versions when there + are uncommitted changes + * git-buildpackage: use helpers from git_buildpackage + + -- Guido Guenther <agx@sigxcpu.org> Wed, 27 Sep 2006 12:15:47 +0200 + +git-buildpackage (0.2) git-buildpackage; urgency=low + + * git-import-dsc: import of debian native packages + + -- Guido Guenther <agx@sigxcpu.org> Wed, 27 Sep 2006 00:40:46 +0200 + +git-buildpackage (0.01) unstable; urgency=low + + * Initial release + + -- Guido Guenther <agx@sigxcpu.org> Tue, 12 Sep 2006 14:55:57 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100755 index 00000000..b068b917 --- /dev/null +++ b/debian/control @@ -0,0 +1,96 @@ +Source: git-buildpackage +Section: vcs +Priority: optional +Maintainer: Guido Günther <agx@sigxcpu.org> +Build-Depends: + bash-completion, + dh-python, + debhelper (>= 9~), + docbook-utils, + gtk-doc-tools, + openjade, + perl, + python3, + python-epydoc | pydoctor | python-pydoctor, + python3-nose, + python3-pkg-resources, + python3-setuptools, + python3-dateutil, + sgml2x, + librpm-tizen, +# For rpm (epydoc) + python3-rpm +Standards-Version: 3.9.4 +Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git +Vcs-Browser: https://honk.sigxcpu.org/gitweb/?p=git-buildpackage.git +Homepage: https://honk.sigxcpu.org/piki/projects/git-buildpackage/ +X-Python3-Version: >= 3.5 + + +Package: git-buildpackage-common +Architecture: all +Depends: ${python3:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + devscripts (>= 2.13.5~), + git (>= 1:1.7.9.1-1~), + man-db, + python3-pkg-resources, + python3-dateutil, +#unittest need + zipmerge +Recommends: pristine-tar (>= 0.5) +Suggests: python3-notify2, unzip, zipmerge +Description: Suite to help with packaging in Git repositories + This package contains the common API and scripts for Debian and rpm packaging + +Package: git-buildpackage +Architecture: all +Depends: ${python3:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + devscripts, + git-buildpackage-common (= ${binary:Version}) +Recommends: cowbuilder +Description: Suite to help with Debian packages in Git repositories + This package contains the following tools: + * gbp import-{dsc,dscs}: import existing Debian source packages into a git + repository + * gbp import-orig: import a new upstream version into the git repository + * gbp buildpackage: build a package out of a git repository, check for local + modifications and tag appropriately + * gbp dch: generate Debian changelog entries from Git commit messages + * gbp {pull,clone}: clone and pull from remote repos + * gbp pq: manage debian/patches easily + * gbp create-remote-repo: create remote repositories + +Package: git-buildpackage-rpm +Architecture: all +Depends: ${python3:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + python3-rpm, + rpm2cpio, + git-buildpackage-common (= ${binary:Version}) +Recommends: rpm +Description: Suite to help with rpm packages in Git repositories + This package contains the following tools: + * git-import-srpm: import existing rpm source packages into a git + repository + * git-import-orig-rpm: import a new upstream version into the git repository + * git-buildpackage-rpm: build a package out of a git repository, check for local + modifications and tag appropriately + * gbp-pq-rpm: manage separate development and packaging branches + +Package: git-buildpackage-bb +Architecture: all +Depends: ${python3:Depends}, + ${misc:Depends}, + git-buildpackage-common (= ${binary:Version}), + git-buildpackage-rpm (= ${binary:Version}), +Recommends: bitbake +Description: Suite to help with BitBake builds from Git repositories + This package contains the following tools: + * gbp import-bb: import sources from distribution repository + * gbp buildpackage-bb: build a package out of a Git repository + * gbp pq-bb: manage separate development and packaging branches diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..32a20193 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Guido Günther <agx@sigxcpu.org> on +Tue, 12 Sep 2006 14:55:57 +0200. + +It was downloaded from https://honk.sigxcpu.org/piki/projects/git-buildpackage/ + +Upstream Author: Guido Günther <agx@sigxcpu.org> + +Copyright: 2006,2007,2008,2009,2010, Guido Günther + +License: + +You are free to distribute this software under the terms of the GNU General +Public License Version 2. The full text of this license can be found in the +file /usr/share/common-licenses/GPL-2 + +Git-buildpackage includes git-pbuilder written by Russ Allbery +<rra@stanford.edu> + +Copyright: 2008, 2009, 2010 Board of Trustees, Leland Stanford Jr. University +License: + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Stanford University not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Stanford University makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. diff --git a/debian/git-buildpackage-bb.install b/debian/git-buildpackage-bb.install new file mode 100644 index 00000000..c76b64bb --- /dev/null +++ b/debian/git-buildpackage-bb.install @@ -0,0 +1,2 @@ +usr/lib/python*/dist-packages/gbp/bb/ +usr/lib/python*/dist-packages/gbp/scripts/*bb*.py* diff --git a/debian/git-buildpackage-common.doc-base b/debian/git-buildpackage-common.doc-base new file mode 100644 index 00000000..b377b272 --- /dev/null +++ b/debian/git-buildpackage-common.doc-base @@ -0,0 +1,11 @@ +Document: git-buildpackage +Title: Git-Buildpackage Manual +Author: Guido Guenther +Abstract: git-buildpackage is a suite to help with Debian packages in Git + repositories. This manual describes the utilities in this package, their + configuration and possible workflows. +Section: Programming + +Format: HTML +Index: /usr/share/doc/git-buildpackage-common/manual-html/index.html +Files: /usr/share/doc/git-buildpackage-common/manual-html/*.html diff --git a/debian/git-buildpackage-common.docs b/debian/git-buildpackage-common.docs new file mode 100644 index 00000000..7fdec518 --- /dev/null +++ b/debian/git-buildpackage-common.docs @@ -0,0 +1,2 @@ +README +docs/manual-html/ diff --git a/debian/git-buildpackage-common.examples b/debian/git-buildpackage-common.examples new file mode 100644 index 00000000..e39721e2 --- /dev/null +++ b/debian/git-buildpackage-common.examples @@ -0,0 +1 @@ +examples/* diff --git a/debian/git-buildpackage-common.install b/debian/git-buildpackage-common.install new file mode 100644 index 00000000..5283d546 --- /dev/null +++ b/debian/git-buildpackage-common.install @@ -0,0 +1,13 @@ +usr/bin/gbp +usr/bin/gbp-clone +usr/bin/gbp-pull +usr/lib/python*/dist-packages/gbp/*.py* +usr/lib/python*/dist-packages/gbp/scripts/__init__.py* +usr/lib/python*/dist-packages/gbp/scripts/clone.py* +usr/lib/python*/dist-packages/gbp/scripts/config.py* +usr/lib/python*/dist-packages/gbp/scripts/pull.py* +usr/lib/python*/dist-packages/gbp/scripts/supercommand.py* +usr/lib/python*/dist-packages/gbp/scripts/common/*.py* +usr/lib/python*/dist-packages/gbp/git/*.py* +usr/lib/python*/dist-packages/gbp/pkg/*.py* +etc/git-buildpackage/gbp.conf diff --git a/debian/git-buildpackage-common.links b/debian/git-buildpackage-common.links new file mode 100644 index 00000000..e74ac0b9 --- /dev/null +++ b/debian/git-buildpackage-common.links @@ -0,0 +1 @@ +/usr/share/doc/git-buildpackage-common/manual-html/gbp.html /usr/share/doc/git-buildpackage-common/manual-html/index.html diff --git a/debian/git-buildpackage-common.manpages b/debian/git-buildpackage-common.manpages new file mode 100644 index 00000000..3280f63c --- /dev/null +++ b/debian/git-buildpackage-common.manpages @@ -0,0 +1,5 @@ +docs/gbp.1 +docs/gbp-clone.1 +docs/gbp-config.1 +docs/gbp-pull.1 +docs/*.5 diff --git a/debian/git-buildpackage-rpm.install b/debian/git-buildpackage-rpm.install new file mode 100644 index 00000000..8c49491e --- /dev/null +++ b/debian/git-buildpackage-rpm.install @@ -0,0 +1,3 @@ +usr/bin/*rpm* +usr/lib/python*/dist-packages/gbp/rpm/*.py* +usr/lib/python*/dist-packages/gbp/scripts/*rpm*.py* diff --git a/debian/git-buildpackage.bash-completion b/debian/git-buildpackage.bash-completion new file mode 100644 index 00000000..053b9332 --- /dev/null +++ b/debian/git-buildpackage.bash-completion @@ -0,0 +1,228 @@ +# -*- shell-script -*- +# +# Bash tab auto-completion rules for git-buildpackage. +# +# Copyright (C) 2010 Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> +# Copyright (C) 2010,2013 Guido Guenther <agx@sigxcpu.org> +# +# Distributed under the GNU General Public License, version 2.0. + +_gbp_branches () +{ + [ -d .git ] || return 0 + git for-each-ref --format="%(refname:short)" refs/heads +} + + +_gbp_tags () +{ + [ -d .git ] || return 0 + git for-each-ref --format="%(refname:short)" refs/tags +} + + +_gbp_options () +{ + $1 --help | sed -ne 's/^ \+\(\(\-[a-z]\), \)\?\(\-\-[a-z\-]\+\=\?\).*/\2 \3/p' +} + + +_gbp_commands () +{ + gbp --list-cmds | sed -ne 's/^ \+\([a-z\-]\+\) \-.*/\1/p' +} + + +_gbp_comp () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local prev="${COMP_WORDS[COMP_CWORD - 1]}" + local options=$1 + local branch_opts=$2 + local tag_opts=$3 + local tristate_opts=$4 + +# COMPREPLY considers '=' as a word. For $prev we prefer the word before the actual "=" + if [[ "$prev" == "=" ]]; then + prev="${COMP_WORDS[COMP_CWORD - 2]}" + elif [[ "$cur" == "=" ]]; then + cur="" + fi + + if [[ "${branch_opts}" == *$prev* ]]; then + local refs=$(_gbp_branches) + COMPREPLY=( $(compgen -W "$refs" -- $cur ) ) + return 0 + fi + + if [[ "${tag_opts}" == *$prev* ]]; then + local refs=$(_gbp_tags) + COMPREPLY=( $(compgen -W "$refs" -- $cur ) ) + return 0 + fi + + if [[ "${tristate_opts}" == *$prev* ]]; then + COMPREPLY=( $(compgen -W 'on off auto' -- $cur ) ) + return 0 + fi + + if [[ "${cbdist_opts}" == *$prev* ]]; then + local BASE="/var/cache/pbuilder/base-" + COMPREPLY=( $( compgen -o dirnames -G "${BASE}${cur}*.cow" \ + | sed -e "s,${BASE}\(.*\)\.cow,\1,g" ) ) + return 0 + fi + + # separate opts by tab so we can append a space to all options not ending + # with an equal sign + tab_opts=$(echo "$options" | sed -e 's/ \+/\t/g' -e 's/[^=]$/& /g') + type compopt &>/dev/null && compopt -o nospace + local IFS=$'\t\n' + COMPREPLY=($(compgen -W "$tab_opts" -- $cur)) +} + +# check if we can find a gbp command on the commandline +_gbp_find_cmd_on_cmdline () +{ + local cmds="$1" # list of commands to check for + local word cmd c=1 + + while [ $c -lt $((COMP_CWORD)) ]; do + word="${COMP_WORDS[c]}" + for cmd in $cmds; do + if [ "$cmd" = "$word" ]; then + echo "$cmd" + return + fi + done + ((c++)) + done +} + +have git-buildpackage && +_gbp_buildpackage() +{ + local options=$(_gbp_options git-buildpackage) + local branch_opts="--git-debian-branch\= --git-upstream-branch\= --git-upstream-tree\=" + local tag_opts="--git-debian-tag\= --git-upstream-tag\=" + local tristate_opts="--git-color\= --git-notify\=" + local cbdist_opts="--git-dist\=" + + _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" \ + "$cbdist_opts" +} +[ "${have:-}" ] && complete -F _gbp_buildpackage -o default git-buildpackage + + +have git-dch && +_gbp_dch () +{ + local options=$(_gbp_options git-dch) + local branch_opts="--debian-branch\=" + local tag_opts="--debian-tag\= --upstream-tag\=" + local tristate_opts="--color\=" + + _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_dch -o default git-dch + + +have git-import-orig && +_gbp_import_orig () +{ + local options=$(_gbp_options git-import-orig) + local branch_opts="--debian-branch\= --upstream-branch\=" + local tag_opts="--debian-tag\= --upstream-tag\=" + local tristate_opts="--color\=" + + _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_import_orig -o default git-import-orig + + +have git-import-dsc && +_gbp_import_dsc () +{ + local options=$(_gbp_options git-import-dsc) + local branch_opts="--debian-branch\= --upstream-branch\=" + local tag_opts="--debian-tag\= --upstream-tag\=" + local tristate_opts="--color\=" + + _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_import_dsc -o default git-import-dsc + +have git-import-dscs && +_gbp_import_dscs () +{ + local options="$(_gbp_options git-import-dscs) $(_gbp_options git-import-dsc)" + local branch_opts="--debian-branch\= --upstream-branch\=" + local tag_opts="--debian-tag\= --upstream-tag\=" + local tristate_opts="--color\=" + + _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_import_dscs -o default git-import-dscs + +have gbp-pq && +_gbp_pq () +{ + local options=$(_gbp_options gbp-pq) + options="$options export import rebase drop apply switch" + local tristate_opts="--color\=" + + _gbp_comp "$options" "" "" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_pq -o default gbp-pq + +have gbp-pull && +_gbp_pull () +{ + local options=$(_gbp_options gbp-pull) + local branch_opts="--debian-branch\= --upstream-branch\=" + local tag_opts="--debian-tag\= --upstream-tag\=" + local tristate_opts="--color\=" + + _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_pull -o default gbp-pull + +have gbp-clone && +_gbp_clone () +{ + local options=$(_gbp_options gbp-clone) + local branch_opts="--debian-branch\= --upstream-branch\=" + local tag_opts="--debian-tag\= --upstream-tag\=" + local tristate_opts="--color\=" + + _gbp_comp "$options" "$branch_opts" "$tag_opts" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_clone -o default gbp-clone + +have gbp-create-remote-repo && +_gbp_create_remote_repo () +{ + local options=$(_gbp_options gbp-create-remote-repo) + local branch_opts="--debian-branch\= --upstream-branch\=" + local tristate_opts="--color\=" + + _gbp_comp "$options" "$branch_opts" "" "$tristate_opts" +} +[ "${have:-}" ] && complete -F _gbp_create_remote_repo -o default gbp-create-remote-repo + +have gbp && +_gbp () +{ + local cur="${COMP_WORDS[COMP_CWORD]}" + local commands=$(_gbp_commands) + local func + + command=$(_gbp_find_cmd_on_cmdline "$commands") + if [ -z $command ]; then + COMPREPLY=( $(compgen -W "$commands" -- $cur ) ) + else + func=_gbp_$(echo $command | sed -e 's/-/_/g') + $func + fi +} +[ "${have:-}" ] && complete -F _gbp -o default gbp diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install new file mode 100644 index 00000000..7a276d7e --- /dev/null +++ b/debian/git-buildpackage.install @@ -0,0 +1,16 @@ +usr/bin/gbp-pq +usr/bin/git-buildpackage +usr/bin/git-dch +usr/bin/git-import-dsc +usr/bin/git-import-dscs +usr/bin/git-import-orig +usr/bin/git-pbuilder +usr/bin/gbp-create-remote-repo +usr/lib/python*/dist-packages/gbp/deb/*.py* +usr/lib/python*/dist-packages/gbp/scripts/pq.py* +usr/lib/python*/dist-packages/gbp/scripts/buildpackage.py* +usr/lib/python*/dist-packages/gbp/scripts/dch.py* +usr/lib/python*/dist-packages/gbp/scripts/import_dsc.py* +usr/lib/python*/dist-packages/gbp/scripts/import_dscs.py* +usr/lib/python*/dist-packages/gbp/scripts/import_orig.py* +usr/lib/python*/dist-packages/gbp/scripts/create_remote_repo.py* diff --git a/debian/git-buildpackage.manpages b/debian/git-buildpackage.manpages new file mode 100644 index 00000000..fc937453 --- /dev/null +++ b/debian/git-buildpackage.manpages @@ -0,0 +1,8 @@ +docs/gbp-buildpackage.1 +docs/gbp-create-remote-repo.1 +docs/gbp-dch.1 +docs/gbp-import-dsc.1 +docs/gbp-import-dscs.1 +docs/gbp-import-orig.1 +docs/gbp-pq.1 +docs/git-pbuilder.1 diff --git a/debian/git-buildpackage.zsh-completion b/debian/git-buildpackage.zsh-completion new file mode 100644 index 00000000..3ff1e7e0 --- /dev/null +++ b/debian/git-buildpackage.zsh-completion @@ -0,0 +1,488 @@ +#compdef gbp +#description build debian packages from a git repository + +__gbp_common_options() { + local prefix="$1" + # these can't be prefixed + _arguments '--help[Show help]' \ + '--version[Show version information]' + + _arguments "--${prefix}verbose[Verbose execution]" \ + "--${prefix}color=-[Use colored output]:color:(on auto off)" + +} + +__gbp_branch_options() { + local prefix="$1" + _arguments \ + "--${prefix}debian-branch=-[The branch the Debian package is being developed on]" \ + "--${prefix}upstream-branch=-[The branch the upstream sources are put onto]" \ + "--${prefix}pristine-tar[Track pristine tar branch]" +} + +__gbp_tag_format_options() { + local prefix="$1" + _arguments \ + "--${prefix}debian-tag=-[format string for debian tags]" \ + "--${prefix}upstream-tag=-[format string for upstream tags]" +} + +__gbp_tag_sign_options() { + local prefix="$1" + _arguments \ + "(--${prefix}sign-tags --${prefix}no-sign-tags)--${prefix}sign-tags[GPG sign all generated tags]" \ + "(--${prefix}sign-tags --${prefix}no-sign-tags)--${prefix}no-sign-tags[Do not GPG sign generated tags]" \ + "--${prefix}keyid=-[GPG keyid to sign tags with]:GPG key:" +} + +_gbp() { + local curcontext="$curcontext" state line + typeset -A opt_args + _arguments -C \ + ':command:->command' \ + '*::options:->options' \ + + case $state in + (command) + #breaks if defined outside the func + local -a subcommands + subcommands=( + 'buildpackage:Build a Debian package' + 'clone:Clone a Git repository from a remote and set up the necessary branch tracking.' + 'create-remote-repo:Create a remote Git repository' + 'dch:Generate the debian/changelog from Git commit history' + 'import-dsc:Import a single Debian source package' + 'import-dscs:Import multiple Debian source packages' + 'import-orig:Import a new upstream tarball' + 'pq:Manage debian/patches using Git rebase' + 'pull:Update a Git repository from a remote' + ) + + _describe -t commands gbp subcommands + ;; + (options) + local funcname + funcname=_gbp-$line[1] + if type $funcname | grep -q "shell function" ; then + $funcname + fi + ;; + esac +} + +_gbp-buildpackage() { + __gbp_common_options git- + __gbp_branch_options git- + __gbp_tag_format_options git- + __gbp_tag_sign_options git- + _arguments \ + '--git-ignore-new[build with uncommited changes in the source tree]' \ + '--git-no-ignore-new[negates --git-ignore-new]' \ + '--git-tag[create a tag after a successful build]' \ + '--git-tag-only[do not build, only tag and run the posttag hook]' \ + '--git-retag[do not fail if the tag already exists]' \ + '--git-force-create[force creation of orig.tar.gz]' \ + '--git-no-create-orig[do not create orig.tar.gz]' \ + '--git-tarball-dir=-[location to look for external tarballs]:tarball directory:_files -/' \ + '--git-compression=-[compression type]:compression:(auto gzip bzip2 lzma xz)' \ + '--git-compression-level=-[set compression level]:level:(1 2 3 4 5 6 7 8 9)' \ + '--git-ignore-branch[build although debian-branch != current branch]' \ + '--git-no-ignore-branch[negates --git-ignore-branch]' \ + '--git-builder=-[command to build the Debian package]:command:' \ + '--git-cleaner=-[command to clean the working copy]:command:' \ + '--git-prebuild=-[command to run before a build]:command:' \ + '--git-postbuild=-[hook run after a successful build]:command:' \ + '--git-posttag=-[hook run after a successful tag operation]:command:' \ + '--git-pbuilder[invoke git-pbuilder for building]' \ + '--git-no-pbuilder[negates --git-pbuilder]' \ + '--git-dist=-[build for this distribution when using git-pbuilder]:distribution:' \ + '--git-arch=-[build for this architecture when using git-pbuilder]:architecture:' \ + '--git-export-dir=-[before building the package export the source into this directory]:directory:_files -/' \ + '--git-export=-[export treeish object instead of HEAD]:treeish:' \ + '--git-dont-purge[retain exported package build directory]' \ + '--git-overlay[extract orig tarball when using export-dir option]' \ + '--git-no-overlay[negates --git-overlay]' \ + '--git-notify=-[Send a desktop notification after build]:notify:(on auto off)' \ + '*:Other options:_dpkg-buildpackage' +} + +_gbp-clone() { + __gbp_common_options + __gbp_branch_options + _arguments \ + '--all[Track all branches, not only debian and upstream]' +} + +_gbp-create-remote-repo() { + __gbp_common_options + _arguments \ + '--remote-url-pattern=-[Where to create remote repository]' \ + '--remote-name=-[What name git will use when refering to that repository]' \ + '--template-dir=-[Template dir to pass to git init]' \ + '--remote-config=-[Name of config file section to specify params]' \ + '(--track --no-track)--track[Set up branch tracking]' \ + '(--track --no-track)--no-track[Do not set up branch tracking]' + +} + +_gbp-dch () { + __gbp_common_options + __gbp_branch_options + __gbp_tag_format_options + + _arguments \ + '--git-ignore-branch[build although debian-branch != current branch]' \ + '--since=-[Start point for reading commits]:commitish:' \ + '--auto[Guess the last commit documented in the changelog]' \ + '(--meta --no-meta)--meta[Parse meta tags]' \ + '(--meta --no-meta)--no-meta[Do not parse meta tags]' \ + '--meta-closes=-[What meta tags to look for to generate bug-closing changelog entries]' \ + '(--full --no-full)--full[Include the full commit message]' \ + '(--full --no-full)--no-full[Do not include the full commit message]' \ + '(--snapshot -S)'{-S,--snapshot}'[Create a snapshot release entry]' \ + '--snapshot-number=-[Python expression that gets eval()ed to the new snapshot number]' \ + '(--release -R)'{-R,--release}'[Remove any snapshot release banners]' \ + '(--new-version -N)'{-R,--release}'=[Specify changelog version]' \ + '--team[Create a team upload entry]' \ + '--bpo[Increment the release number for a backports upload]' \ + '--nmu[Increment the release number for a NMU upload]' \ + '--qa[Increment the release number for a QA upload]' \ + '--distribution=-[Set the distribution field]' \ + '--force-distribution[Force distribution]' \ + '--urgency=-[Set the upload urgency]' \ + '--git-log=-[Options passed to git log]' \ + '--id-length=-[Number of commit id digits to include]' \ + '--ignore-regex=-[Ignore matching commit lines]' \ + '--git-author[Use git name configuration for changelog signature]' \ + '(--multimaint-merge --no-multimaint-merge)--multimaint-merge[Merge commits by maintainer]' \ + '(--multimaint-merge --no-multimaint-merge)--multimaint-merge[Do not merge commits by maintainer]' \ + '--spawn-editor=[Spawn an editor]:when:(always snapshot release)' \ + '--commit-msg=[Commit message format string]' \ + '--commit[Commit the generated changelog]' \ + '*:Paths:_files -/' +} + +_gbp-import-dsc() { + __gbp_common_options + __gbp_branch_options + __gbp_tag_format_options + __gbp_tag_sign_options + _arguments \ + '--filter=-[Filter out files]' \ + '--download=-[Download the source package]' \ + '--allow-unauthenticated[Skip signature verification on downloads]' \ + '--allow-same-version[Import a package with the same debian version]' \ + '--author-is-committer[Use the author identity as committer identity]' \ + '--author-date-is-committer-date[Use author date as commit date]' \ + '*:package:_files -g "*.dsc"' + # TODO: complete source package names + # TODO: pass only one tarball/source package name +} + +_gbp-import-dscs() { + # same options + _gbp-import_dsc + _arguments \ + '--debsnap[Fetch snapshots from snapshots.debian.org]' \ + '--ignore-repo-config[Ignore options in gbp.conf]' + # TODO: multiple dscs or one source package name + debsnap +} + +_gbp-import-orig() { + __gbp_common_options + __gbp_branch_options + __gbp_tag_format_options + __gbp_tag_sign_options + _arguments \ + '(--upstream-version -u)'{--upstream-version,-u}'=[The upstream version number]' \ + '--merge[Merge the upstream branch into the debian branch]' \ + '--upstream-vcs-tag=-[Add a tag as an additional parent to the upstream tarball commit]' \ + '--import-msg=-[Commit message format string]' \ + '--filter=-[Filter out files]' \ + '--filter-pristine-tar[When filtering also filter out of pristine-tar tarballs]' \ + '(--symlink-orig --no-symlink-orig)--symlink-orig=[Create a symlink with a debian-compliant name]' \ + '(--symlink-orig --no-symlink-orig)--no-symlink-orig=[Do not create a symlink with a debian-compliant name]' \ + '--postimport=-[Run a command after import]' \ + '--uscan[Use uscan to fetch the new upstream version]' \ + '*:file:_files' + + # TODO: pass only one tarball + # TODO: Do not complete files when uscan option is enabled +} + +_gbp-pq() { + __gbp_common_options + _arguments \ + '(--patch-numbers --no-patch-numbers)--patch-numbers[Add numbers to patch files]' \ + '(--patch-numbers --no-patch-numbers)--no-patch-numbers[Do not add numbers to patch files]' \ + '--topic=-[Topic to use when importing a single patch]' \ + '--time-machine=-[Go back N commits trying to apply patch queue]' + + local -a pqcommands + pqcommands=( + 'import:Create a patch queue branch' + 'export:Export the patches on the patch-queue branch' + 'rebase:Rebase the patch-queue branch against the current branch' + 'drop:Drop the patch queue' + 'apply:Add a single patch to the patch-queue' + 'switch:Switch to the patch-queue branch if on the base branch and viceversa' + ) + # TODO: only display these commands once + _describe -t pqcommands gbp-pq pqcommands +} + +_gbp-pull() { + __gbp_common_options + __gbp_branch_options + _arguments \ + '--force[Update even non fast-forward]' \ + '--redo-pq[Rebuild the patch queue]' \ + '--ignore-branch[Dont care if on a detached state]' \ + '--depth=-[Depth for deepening shallow clones]' +} + +_gbp "$@" + + + +__gbp_common_options() { + local prefix="$1" + # these can't be prefixed + _arguments '--help[Show help]' \ + '--version[Show version information]' + + _arguments "--${prefix}verbose[Verbose execution]" \ + "--${prefix}color=-[Use colored output]:color:(on auto off)" + +} + +__gbp_branch_options() { + local prefix="$1" + _arguments \ + "--${prefix}debian-branch=-[The branch the Debian package is being developed on]" \ + "--${prefix}upstream-branch=-[The branch the upstream sources are put onto]" \ + "--${prefix}pristine-tar[Track pristine tar branch]" +} + +__gbp_tag_format_options() { + local prefix="$1" + _arguments \ + "--${prefix}debian-tag=-[format string for debian tags]" \ + "--${prefix}upstream-tag=-[format string for upstream tags]" +} + +__gbp_tag_sign_options() { + local prefix="$1" + _arguments \ + "(--${prefix}sign-tags --${prefix}no-sign-tags)--${prefix}sign-tags[GPG sign all generated tags]" \ + "(--${prefix}sign-tags --${prefix}no-sign-tags)--${prefix}no-sign-tags[Do not GPG sign generated tags]" \ + "--${prefix}keyid=-[GPG keyid to sign tags with]:GPG key:" +} + +_gbp() { + local curcontext="$curcontext" state line + typeset -A opt_args + _arguments -C \ + ':command:->command' \ + '*::options:->options' \ + + case $state in + (command) + #breaks if defined outside the func + local -a subcommands + subcommands=( + 'buildpackage:Build a Debian package' + 'clone:Clone a Git repository from a remote and set up the necessary branch tracking.' + 'create-remote-repo:Create a remote Git repository' + 'dch:Generate the debian/changelog from Git commit history' + 'import-dsc:Import a single Debian source package' + 'import-dscs:Import multiple Debian source packages' + 'import-orig:Import a new upstream tarball' + 'pq:Manage debian/patches using Git rebase' + 'pull:Update a Git repository from a remote' + ) + + _describe -t commands gbp subcommands + ;; + (options) + local funcname + funcname=_gbp-$line[1] + if type $funcname | grep -q "shell function" ; then + $funcname + fi + ;; + esac +} + +_gbp-buildpackage() { + __gbp_common_options git- + __gbp_branch_options git- + __gbp_tag_format_options git- + __gbp_tag_sign_options git- + _arguments \ + '--git-ignore-new[build with uncommited changes in the source tree]' \ + '--git-no-ignore-new[negates --git-ignore-new]' \ + '--git-tag[create a tag after a successful build]' \ + '--git-tag-only[do not build, only tag and run the posttag hook]' \ + '--git-retag[do not fail if the tag already exists]' \ + '--git-force-create[force creation of orig.tar.gz]' \ + '--git-no-create-orig[do not create orig.tar.gz]' \ + '--git-tarball-dir=-[location to look for external tarballs]:tarball directory:_files -/' \ + '--git-compression=-[compression type]:compression:(auto gzip bzip2 lzma xz)' \ + '--git-compression-level=-[set compression level]:level:(1 2 3 4 5 6 7 8 9)' \ + '--git-ignore-branch[build although debian-branch != current branch]' \ + '--git-no-ignore-branch[negates --git-ignore-branch]' \ + '--git-builder=-[command to build the Debian package]:command:' \ + '--git-cleaner=-[command to clean the working copy]:command:' \ + '--git-prebuild=-[command to run before a build]:command:' \ + '--git-postbuild=-[hook run after a successful build]:command:' \ + '--git-posttag=-[hook run after a successful tag operation]:command:' \ + '--git-pbuilder[invoke git-pbuilder for building]' \ + '--git-no-pbuilder[negates --git-pbuilder]' \ + '--git-dist=-[build for this distribution when using git-pbuilder]:distribution:' \ + '--git-arch=-[build for this architecture when using git-pbuilder]:architecture:' \ + '--git-export-dir=-[before building the package export the source into this directory]:directory:_files -/' \ + '--git-export=-[export treeish object instead of HEAD]:treeish:' \ + '--git-dont-purge[retain exported package build directory]' \ + '--git-overlay[extract orig tarball when using export-dir option]' \ + '--git-no-overlay[negates --git-overlay]' \ + '--git-notify=-[Send a desktop notification after build]:notify:(on auto off)' \ + '*:Other options:_dpkg-buildpackage' +} + +_gbp-clone() { + __gbp_common_options + __gbp_branch_options + _arguments \ + '--all[Track all branches, not only debian and upstream]' +} + +_gbp-create-remote-repo() { + __gbp_common_options + _arguments \ + '--remote-url-pattern=-[Where to create remote repository]' \ + '--remote-name=-[What name git will use when refering to that repository]' \ + '--template-dir=-[Template dir to pass to git init]' \ + '--remote-config=-[Name of config file section to specify params]' \ + '(--track --no-track)--track[Set up branch tracking]' \ + '(--track --no-track)--no-track[Do not set up branch tracking]' + +} + +_gbp-dch () { + __gbp_common_options + __gbp_branch_options + __gbp_tag_format_options + + _arguments \ + '--git-ignore-branch[build although debian-branch != current branch]' \ + '--since=-[Start point for reading commits]:commitish:' \ + '--auto[Guess the last commit documented in the changelog]' \ + '(--meta --no-meta)--meta[Parse meta tags]' \ + '(--meta --no-meta)--no-meta[Do not parse meta tags]' \ + '--meta-closes=-[What meta tags to look for to generate bug-closing changelog entries]' \ + '(--full --no-full)--full[Include the full commit message]' \ + '(--full --no-full)--no-full[Do not include the full commit message]' \ + '(--snapshot -S)'{-S,--snapshot}'[Create a snapshot release entry]' \ + '--snapshot-number=-[Python expression that gets eval()ed to the new snapshot number]' \ + '(--release -R)'{-R,--release}'[Remove any snapshot release banners]' \ + '(--new-version -N)'{-R,--release}'=[Specify changelog version]' \ + '--team[Create a team upload entry]' \ + '--bpo[Increment the release number for a backports upload]' \ + '--nmu[Increment the release number for a NMU upload]' \ + '--qa[Increment the release number for a QA upload]' \ + '--distribution=-[Set the distribution field]' \ + '--force-distribution[Force distribution]' \ + '--urgency=-[Set the upload urgency]' \ + '--git-log=-[Options passed to git log]' \ + '--id-length=-[Number of commit id digits to include]' \ + '--ignore-regex=-[Ignore matching commit lines]' \ + '--git-author[Use git name configuration for changelog signature]' \ + '(--multimaint-merge --no-multimaint-merge)--multimaint-merge[Merge commits by maintainer]' \ + '(--multimaint-merge --no-multimaint-merge)--multimaint-merge[Do not merge commits by maintainer]' \ + '--spawn-editor=[Spawn an editor]:when:(always snapshot release)' \ + '--commit-msg=[Commit message format string]' \ + '--commit[Commit the generated changelog]' \ + '*:Paths:_files -/' +} + +_gbp-import-dsc() { + __gbp_common_options + __gbp_branch_options + __gbp_tag_format_options + __gbp_tag_sign_options + _arguments \ + '--filter=-[Filter out files]' \ + '--download=-[Download the source package]' \ + '--allow-unauthenticated[Skip signature verification on downloads]' \ + '--allow-same-version[Import a package with the same debian version]' \ + '--author-is-committer[Use the author identity as committer identity]' \ + '--author-date-is-committer-date[Use author date as commit date]' \ + '*:package:_files -g "*.dsc"' + # TODO: complete source package names + # TODO: pass only one tarball/source package name +} + +_gbp-import-dscs() { + # same options + _gbp-import_dsc + _arguments \ + '--debsnap[Fetch snapshots from snapshots.debian.org]' \ + '--ignore-repo-config[Ignore options in gbp.conf]' + # TODO: multiple dscs or one source package name + debsnap +} + +_gbp-import-orig() { + __gbp_common_options + __gbp_branch_options + __gbp_tag_format_options + __gbp_tag_sign_options + _arguments \ + '(--upstream-version -u)'{--upstream-version,-u}'=[The upstream version number]' \ + '--merge[Merge the upstream branch into the debian branch]' \ + '--upstream-vcs-tag=-[Add a tag as an additional parent to the upstream tarball commit]' \ + '--import-msg=-[Commit message format string]' \ + '--filter=-[Filter out files]' \ + '--filter-pristine-tar[When filtering also filter out of pristine-tar tarballs]' \ + '(--symlink-orig --no-symlink-orig)--symlink-orig=[Create a symlink with a debian-compliant name]' \ + '(--symlink-orig --no-symlink-orig)--no-symlink-orig=[Do not create a symlink with a debian-compliant name]' \ + '--postimport=-[Run a command after import]' \ + '--uscan[Use uscan to fetch the new upstream version]' \ + '*:file:_files' + + # TODO: pass only one tarball + # TODO: Do not complete files when uscan option is enabled +} + +_gbp-pq() { + __gbp_common_options + _arguments \ + '(--patch-numbers --no-patch-numbers)--patch-numbers[Add numbers to patch files]' \ + '(--patch-numbers --no-patch-numbers)--no-patch-numbers[Do not add numbers to patch files]' \ + '--topic=-[Topic to use when importing a single patch]' \ + '--time-machine=-[Go back N commits trying to apply patch queue]' + + local -a pqcommands + pqcommands=( + 'import:Create a patch queue branch' + 'export:Export the patches on the patch-queue branch' + 'rebase:Rebase the patch-queue branch against the current branch' + 'drop:Drop the patch queue' + 'apply:Add a single patch to the patch-queue' + 'switch:Switch to the patch-queue branch if on the base branch and viceversa' + ) + # TODO: only display these commands once + _describe -t pqcommands gbp-pq pqcommands +} + +_gbp-pull() { + __gbp_common_options + __gbp_branch_options + _arguments \ + '--force[Update even non fast-forward]' \ + '--redo-pq[Rebuild the patch queue]' \ + '--ignore-branch[Dont care if on a detached state]' \ + '--depth=-[Depth for deepening shallow clones]' +} + +_gbp "$@" diff --git a/debian/links b/debian/links new file mode 100644 index 00000000..0a561b02 --- /dev/null +++ b/debian/links @@ -0,0 +1,7 @@ +/usr/share/doc/git-buildpackage/manual-html/gbp.html /usr/share/doc/git-buildpackage/manual-html/index.html +# As long as we keep the old aliases +/usr/share/man/man1/gbp-import-orig.1.gz /usr/share/man/man1/git-import-orig.1.gz +/usr/share/man/man1/gbp-buildpackage.1.gz /usr/share/man/man1/git-buildpackage.1.gz +/usr/share/man/man1/gbp-import-dsc.1.gz /usr/share/man/man1/git-import-dsc.1.gz +/usr/share/man/man1/gbp-import-dscs.1.gz /usr/share/man/man1/git-import-dscs.1.gz +/usr/share/man/man1/gbp-dch.1.gz /usr/share/man/man1/git-dch.1.gz diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 00000000..e5804d04 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/deb/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/git/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/pkg/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/rpm/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/scripts/common/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/scripts/__pycache__ diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..0ac72e48 --- /dev/null +++ b/debian/rules @@ -0,0 +1,61 @@ +#!/usr/bin/make -f + +# HACK: disable checks, i.e. unit tests +DEB_BUILD_OPTIONS += nocheck +export WITHOUT_NOSETESTS := 1 + +EXAMPLE_SCRIPTS=\ + gbp-add-patch \ + gbp-cowbuilder-sid \ + gbp-posttag-push \ + gbp-configure-unpatched-source \ + wrap_cl.py + +DEB_COMPRESS_EXCLUDE=$(EXAMPLE_SCRIPTS) + +ZSH_COMPDIR = /usr/share/zsh/vendor-completions/ + +PYCHECKER_ARGS=-boptparse --no-override --no-shadowbuiltin + +%: + dh $@ --with python3 --buildsystem=pybuild + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + dh_auto_test + export GIT_AUTHOR_NAME="Gbp Tests"; \ + export GIT_AUTHOR_EMAIL=tests@example.com; \ + export GIT_COMMITTER_NAME=$$GIT_AUTHOR_NAME; \ + export GIT_COMMITTER_EMAIL=$$GIT_AUTHOR_EMAIL; \ + PYTHONPATH=. \ + python3 setup.py nosetests + +else + @echo "Checks disabled via DEB_BUILD_OPTIONS" +endif + +override_dh_auto_build: + dh_auto_build + make -C docs + +override_dh_auto_install: + dh_auto_install + dh_bash-completion + mkdir -p debian/git-buildpackage/$(ZSH_COMPDIR) + install -m644 debian/git-buildpackage.zsh-completion \ + debian/git-buildpackage/$(ZSH_COMPDIR)/_gbp + +override_dh_auto_clean: + dh_auto_clean + # Remove renamed files - renames are not correctly expressed in debian.diff + rm -f debian/doc-base + rm -f debian/docs + rm -f debian/examples + rm -f debian/manpages + rm -rf build/ + make -C docs/ clean + -rm gbp/version.py + +override_dh_compress: + dh_compress --exclude=usr/share/doc/git-buildpackage/examples/ + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..d3827e75 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 00000000..f2592903 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +extend-diff-ignore = "^(tests/test_rpm_data/.*|tests/component/rpm/data/.*|tests/component/deb/data/.*)" +diff-ignore diff --git a/packaging/PKGBUILD b/packaging/PKGBUILD new file mode 100755 index 00000000..b26bbb70 --- /dev/null +++ b/packaging/PKGBUILD @@ -0,0 +1,83 @@ +pkgbase='git-buildpackage' +pkgname=('git-buildpackage-rpm' 'git-buildpackage-common' 'git-buildpackage-doc') +pkgver=0.6.27 +pkgrel=0 +pkgdesc="Tools from Debian to integrate the package build system with Git" +arch=(any) +url="https://honk.sigxcpu.org/piki/projects/git-buildpackage/" +license=('GPLv2') +conflicts=('git-buildpackage') +provides=('git-buildpackage') +makedepends=('python3-distribute' 'gtk-doc' 'docbook-sgml' 'docbook-utils') +source=(git-buildpackage_${pkgver}.tar.gz) +sha256sums=(SKIP) + +prepare() +{ + cd "$srcdir/$pkgbase-${pkgver}" + for patch_file in $(find ../../ -maxdepth 1 -name '*.patch' |sort) + do + patch -p1 -i $patch_file + done +} + +build() { + cd $srcdir/$pkgbase-$pkgver + WITHOUT_NOSETESTS=1 \ + python3 setup.py build + +# Prepare apidocs + epydoc -n git-buildpackage --no-sourcecode -o docs/apidocs/ \ + gbp*.py git*.py gbp/ + +# HTML docs + HAVE_SGML2X=0 make -C docs/ +} + +package_git-buildpackage-common() { + depends=('man-db' + 'python3' + 'git') + optdepends=('pristine-tar: regenerate pristine tarballs') + cd $srcdir/$pkgbase-$pkgver + WITHOUT_NOSETESTS=1 \ + python3 setup.py install \ + --root="$pkgdir" \ + --prefix=/usr \ + -O1 + rm $pkgdir/usr/lib/python*/site-packages/*info -rf + rm $pkgdir/usr/bin/*rpm* + rm $pkgdir/usr/lib/python*/site-packages/gbp/rpm -rf + rm $pkgdir/usr/lib/python*/site-packages/gbp/scripts/*rpm*.py* -rf +} + +package_git-buildpackage-rpm() { + depends=("git-buildpackage-common=$pkgver-$pkgrel" "rpm") + provides=("tizen-gbp-rpm=20160302") + cd $srcdir/$pkgbase-$pkgver + WITHOUT_NOSETESTS=1 \ + python3 setup.py install \ + --root="$pkgdir" \ + --prefix=/usr \ + -O1 + rm $pkgdir/usr/lib/python*/site-packages/*info -rf + rm -rf $pkgdir/etc + find $pkgdir/usr/bin -mindepth 1 -maxdepth 1 ! -name '*rpm*' -delete + find $pkgdir/usr/lib/python*/site-packages/gbp -mindepth 1 -maxdepth 1 -type f -o -type d ! -name rpm -a ! -name scripts |xargs rm -rf + find $pkgdir/usr/lib/python*/site-packages/gbp/scripts -mindepth 1 -maxdepth 1 ! -name '*rpm*.py*' |xargs rm -rf +} + +package_git-buildpackage-doc() { + cd $srcdir/$pkgbase-$pkgver +# Install man pages + mandir=/usr/share/man + install -d ${pkgdir}/${mandir}/man1 ${pkgdir}/${mandir}/man5 + install docs/*.1 ${pkgdir}/${mandir}/man1 + install docs/*.5 ${pkgdir}/${mandir}/man5 + +# Install html documentation + mkdir -p ${pkgdir}/${docdir}/${pkgbase} + cp -r docs/manual-html ${pkgdir}/${docdir}/${pkgbase} + cp -r docs/apidocs ${pkgdir}/${docdir}/${pkgbase} +} +# vim:set ts=2 sw=2 et: diff --git a/packaging/git-buildpackage.changes b/packaging/git-buildpackage.changes new file mode 100755 index 00000000..91c749e9 --- /dev/null +++ b/packaging/git-buildpackage.changes @@ -0,0 +1,354 @@ +* Thu Nov 30 2023 Xu Huayong <huayong.xu@samsung.com> tizen/0.9.28-20231130 +- Fix git-buildpackage issue to adapt the librpm-tizen 4.14 version + +* Wed Nov 01 2023 Biao Wang <biao716.wang@samsung.com> tizen/0.9.27-20231101 +- Port code from python2.x to python3.x +- Support openSUSE 15.2 build +- Fix some defects during runtime + +* Fri May 14 2021 Biao Wang <biao716.wang@samsung.com> tizen/0.9.21-20210514 +- Fix export submodule source code error. + +* Fri May 22 2020 Yan Meng <yan11.meng@samsung.com> tizen/0.9.20-20200522 +- Adapt Ubuntu 20.04 to upgrade the version. + +* Wed Sep 12 2018 Biao Wang <biao716.wang@samsung.com> tizen/0.9.9-20180912 +- Adapt Ubuntu 18.04 to upgrade the version. + +* Sat Dec 31 2016 SoonKyu Park <sk7.park@samsung.com> tizen/0.7.5-20161231 +- Fix diff_status() for renames and copies +- Adapt git-merge option when git version greater then 2.9 +- Disable test_pristine_tar unittest case + +* Sat May 14 2016 Jun Wang <junbill.wang@samsung.com> tizen/0.7.4-20160514 +- Upgrade version to 0.7.4 + +* Wed Mar 02 2016 Jun Wang <junbill.wang@samsung.com> tizen/0.6.27-20160302 +- Upgrade version to 0.6.27 + +* Fri Feb 06 2015 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.22-20150206 +- Rebase on top of upstream version 0.6.22 +- Experimental support for BitBake + * Introduce import-bb tool. + This is the first tool in an effort of enabling gbp in the BitBake build + environment. Gbp-import-bb is a tool for importing packages from a + BitBake-based "combined" distro repository into individual per-package + Git repositories. + * Introduce pq-bb tool. + This is a tool for managing patch-queues for packages maintained in the + BitBake packaging format (.bb recipes). + * Introduce buildpackage-bb tool. + Initial version of the tool for building BitBake packages from Git. + NOTE: The buildpackage-bb tool itself is able to operate even without an + initialized BitBake build environment although the build likely fails in + this case. However, this makes it possible to export the packaging meta + data, for example. + * Introcude clone-bb tool. + This is a new tool for helping to clone remote per-package Git + repositories when working in BitBake-based "full distro" build + environment. This is useful in the case that individual packages are + actually maintained in per-package Git repositories (like Tizen). That + is, the full distro repository that the developer operates in is + composed of the packaging meta data from the individual per-package + repositories. When willing to contribute to a package the developer + would use clone-bb to clone the correct per-package repository and make + his changes there. + NOTE: clone-bb uses GBP_PACKAGING_REPO variable to determine the remote + repository URI. This variable should be defined in the package recipes + in order to make clone-bb usable. + * Introduce submit-bb tool. + This is a Tizen-specific tool for creating and pushing special submit + tags. +- pq-rpm: better error message +- buildpackage-rpm: look for remote upstream branches. + Consider remote branches, too, while looking for the upstream branch + when trying to guess if a package is native or not. +- rpm packaging changes + * enable CentOS 7. + * include python egg-info in -common. +- rpm: suppress stderr when unpacking src.rpm +- UpstreamSource: suppress stderr from tar in _determine_prefix() +- patchseries: strip numbering when guessing subject from filename +- Changes in logging + * don't propagate to ancestor loggers + * don't initialize handlers in GbpLogger init. + Better compatibility with 3rd party modules that have their own logging + initializations. +- Features/fixes in GitRepository + * GitRepository/__git_inout: correctly handle input error + * GitRepository.create_tag: add 'annotate' argument. + For forcing the creation of annotated tags. Causes the an editor to be + spawned if no message is given. + +* Thu Aug 28 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.15-20140828 +- Rebase on top of upstream version 0.6.15 +- Changes in buildpackage-rpm + * new 'commitish' keyword for spec vcs tag + * notify: catch RuntimeError when importing pynotify + * fix exit code in case of GitRepositoryError + * always create tarball for native packages + * check submodules from the exported treeish + * fix crash when running prebuild hook + * always run cleaner hook + * add --git-no-build option + * don't crash on invalid vcs format strings + * add '--git-native' option + * remove some outdated/unnecessary exception handling + * get rid of prepare_export_dir() + * handle invalid keys in orig prefix + * internal refactoring and fixes +- Changes in rpm-ch + * implement --commit option + * implement --commit-msg option + * rpm-ch: implement --meta-bts option + * rpm.policy: don't allow leading whitespace in bts meta tags +- docs: manpages for the rpm tools +- Misc. fixes and features + * buildpackage: refactor tarball compression + * gbp-dch: fix handling of the '--meta' option + * import-orig-rpm: download tarball into parent directory + * GitRepository/has_submodules: add treeish argument + * tristate: implement __nonzero__() method +- Logging: + * don't automatically setup gbp-specific logger + * fix auto colorizing for custom streams +- Tests + * multiple fixes and additions in ComponentTestBase class + * testutils: add directories arg to ls_* functions + * add unit tests for buildpackage-rpm +- Packaging + * rpm-packaging: recommend/require unzip + * recommend/require zipmerge + * depend/recommend rpmbuild + * [ Junchun Guan ] Add PKGBUILD to support arch linux + * [ Li Jinjing ] rpm packaging: use macro for python binary + +* Wed May 21 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.12-20140521 +- Rebase on top of upstream version 0.6.12 +- Changes in rpm-ch + * add --message cmdline option + For giving the text for new changelog entry/entries, skipping git commit + messages entirely. + * implement '--all' option + If defined, git-rpm-ch uses all commits in the Git history. Also, + '--since' option is omitted. + * implement --color-scheme option + * use name (string) as the entry author + * internal refactoring + * fix crash in guessing the start commit +- Changes in pq-rpm + * implement --retain-history option + With this option defined gbp tries to preserve the history when + converting. That is, for each commit in the old branch create one + corresponding commit in the new orphan packaging branch. This works by + dumping packaging files and updating patches for each commit. However, + empty commits are not generated - these are caused e.g. by changes in + files that are ignored by patch-generation. + NOTE! Only valid for the 'convert' action. + * convert: don't try to commit empty set of patches + * make sure we always get a sane author + * slight unification of log messages + * decrease (default) verbosity a bit + * don't create pq branch when switching +- Changes in buildpackage-rpm + * buildpackage-rpm: fix desktop notifications + * buildpackage-rpm: remove --purge option + * guess/parse spec as early as possible +- Documentation + * Include man pages in RPM packages + * Add -doc subpackage to RPM packaging + * Build deb and rpm html docs in one docbook + * A multitude of small cosmetic fixes +- Other misc. internal changes + * GitRepository: implement create_tree() method + * rpm: suppress some verbosity when updating patches in spec file + * [ Li Jinjing ] Fix missing return value in get_current_branch method + +* Thu Mar 06 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> tizen/0.6.8-20140306 +- Rebase on top of upstream version 0.6.8 +- Introduce git-rpm-ch tool. + Initial version of the git-rpm-ch tool which is intended for maintaining + RPM changelogs. Supports both spec files and separate "OBS style" + changelog files. + Implement '--tag' command line option (and other related options for + signing) for creating and tagging a release. These correspond the + tagging options in git-buildpackage-rpm. + The git-buildpackage-rpm tool does not commit anything to git. However, + in rpm-ch the '--tag' option causes the changelog modifications (and, + all other staged changes) to be committed to git before creating the + tag. This makes it possible to create a release and document the + packaging/release tag name in the rpm changelog. +- Changes to gbp-pq-rpm: + * implement 'convert' subcommand. + The new subcommand is intended to be a one-time-callable command for + converting a package to use the "orphan-packaging" development model and + git layout (where packaging files are maintained in a separate branch + and code development in another branch). + * implement '--import-files' command line option. + For defining the packaging file(s) that will be imported into the + development/patch-queue branch. + By default, the local gbp conf files are imported (so that gbp sees the + same settings on the development/pq branc as on the packaging branch). + Files defined with this option will appear as one monolithic commit in + the development/patch-queue branch. + * implement --new-packaging-dir cmdline option. + Used for setting the packaging directory to be used in the new orphan + packaging branch. Defaults to --packaging-dir so that the gbp.conf files + are more likely to work without modification. + * fail gracefully on invalid config files + * support '%(upstreamversion)s' as a replacable string in the pq branch + name. +- Changes to git-buildpackage-rpm + * patch-export from development branch. + Adds git-buildpackage-rpm --patch-export support for the 'orphan + packaging' development model (where packaging files and development sources are kept in separate + branches). + New functionality: + 1. If patch-export is enabled and gbp detects that the current branch + has a development/patch-queue branch it exports the patches from there, + instead of the tip of the packaging branch. + 2. If gbp detects that the current (or exported) branch is a + development/patch-queue branch it automatically enables patch-export + and exports packaging files from the base branch (instead of the + development/patch-queue branch. + Also, add a new '--git-patch-export-rev' command line option with which + the user can explicitly set the treeish from which patches are generated + (i.e. HEAD..<patch-export-rev>) + * fix spec file vcs update when doing git-tag-only + * change default export directory. + So that the git working directory is not dirtied, by default. +- Changes ti git-import-orig-rpm: + * disable --merge by default. + Merging upstream to packaging does not usually make sense with rpm + packages. Merely, it can create confusion cause unapplicable patches to + be generated. + * implement --create-missing-branches option. + * implement automatic downloading. + Automatically try to download the archive if the archive filename points + to a remote location. + * get archive from spec file. + Try to get archive path/filename from spec file if no file name is given + on the command line. This should make version bumps more + straightforward: just update version number in the spec file and run + 'git-import-orig-rpm'. +- git-import-orig: implement --create-missing-branches option. +- Fixes and new features in GitRepository class + * GitRepository/get_commit_info: correctly handle file renames/copies. + * GitRepository.create_branch: add 'force' option + * GitRepository.archive: add 'paths' option + * GitRepository/git_command: strip stderr output in case of error. + * GitRepository/add_remote_repo: fix the 'tags' argument. + * GitRepository: allow interactive commands. + * GitRepository: fix the 'edit' mode in commit methods. + * GitRepository.commit_files: add committer_info and edit arguments. + * GitRepository.commit_all: add committer_info argument. +- Fixes and new features in internal rpm/spec support + * rpm.SpecFile: add 'specpath' attribute + * rpm: correctly handle 'NoSource' and 'NoPatch' tags in spec. + * rpm: Implement spec_from_repo() helper function + * rpm: track all "section" directives in spec file. + * rpm: add gbp.rpm.changelog module. + This new module contains basic containers and functionality for parsing + and updating rpm changelogs. It is coupled with the rpm packaging policy + class which now has definitions for rpm changelog formatting. + * rpm: support for getting/setting changelog in spec. + SpecFile objects now support reading and writing of the %changelog + section. + * rpm: store full path of spec file sources +- Fix detection of prefix directory in tarballs + gbs import failed to import tarball properly if paths in the archive + were prefixed with "./". + +* Tue Jan 07 2014 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.8 +- Rebase on top of upstream version 0.6.8 + +* Mon Dec 02 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.6 +- Rebase on top of upstream version 0.6.6 +- UpstreamSource: fix archive prefix guessing +- pq-rpm: create diff up to the last merge commit + Before, merge commits broke patch generation, or, (most probably) caused + the generated patches to be unapplicable (similar to how + git-format-patch behaves). + Now, changes up to the last merge commit are squashed into one diff if + merge commits are found in the revision list from which patches are to + be generated. Individual patches (one per commit) are generated from the + last merge commit up to the exported revision. +- pq-rpm: magic word HEAD for patch-squashing + When given as the squash-point, 'HEAD' translates to the end-commit. + This allows one to configure gbp to always squash all commits into one + monolithic diff. + +* Thu Oct 17 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.3 +- buildpackage: support 'commit' variable for VCS tags +- Clone a repository to a specific directory +- Fix gbs clone failure if repo url is like host:repo.git +- SpecFile.set_tag: change the default place for new tags +- remove 'repo' param to adapt to changes of write_patch_file +- pq: pass commit_info to format_patch() +- pq: pass commit_info to format_patch() +- pq.write_patch_file: drop unused argument +- pq: fix generation of series file +- common/pq: fix length of patch filenames +- buildpackage: refactor prefix handling +- tests: remove unused import in submodule tests +- tests: upper case global variables in submodule tests +- tests: add some docstrings to git submodule tests +- tests: use eq_ and ok_ from nose tools in submodule tests +- tests: use sanitize some submodule tests +- pq-rpm: don't overwrite patches in the same series +- pq: don't overwrite patches in the same series +- rpm: support guessing spec file from git treeish +- rpm.SpecFile: support parsing spec as raw text data +- rpm: minor docstring fixes +- rpm: change guess_spec() to return SpecFile object +- GitRepository.list_tree: add 'paths' option +- common/pq: support more flexible pq-branch naming +- pq-rpm: drop unused 'tries' option +- GitRepository: deprecate the get_remote_repos method +- GitRepository.has_remote_repo: use get_remotes method +- git: new class and method for remote repositories +- debian packaging: change to 1.0 source package format +- Version bump, rebase on top of 0.6.3 + * Disable cover-min-percentage setting of nose + * docs: minor sgml syntax fix +- rpm tests: slight modificatin of import-srpm tests +- ComponentTestBase: use eq_() ok_() from nose.tools +- tests: add tests for git-import-orig-rpm +- ComponentTestBase: keep tmpdir if GBP_TESTS_NOCLEAN is in env +- ComponentTestBase: fix env restore in teardown +- config: restore mangled env in doctests +- import-orig-rpm: remove unneeded try-except +- import-orig-rpm: don't crash on invalid gbp.conf +- ComponentTestBase: more verbose output in case of branch mismatch +- rpm tests: test --filter option of git-import-srpm +- tests.testutils: add ls_zip() helper +- import-orig: rework sourcecode preparation and filtering +- import-orig: new function for filtering/re-packing sources +- buildpackage: fix handling of empty tarball prefix +- rpm: import orig: import readline in the common module +- import orig: import readline in the common module +- UpstreamSource.unpack: return UpstreamSource instance +- UpstreamSource.pack: reuse unpacked dir if no filter is used +- rpm: UpstreamSource: implement prefix guessing +- UpstreamSource: implement prefix guessing +- UpstreamSource: check that the sources exist +- UpstreamSource: store the absolute path +- rpm: UpstreamSource: move version guessing logic to PkgPolicy +- UpstreamSource: move version guessing logic to PkgPolicy +- UpstreamSource.guess_version: don't check for directories +- Fix `fatal: fetch --all does not take a repository argument` + +* Thu Aug 22 2013 Markus Lehtonen <markus.lehtonen@linux.intel.com> 0.6.0git20130530 +- rpm: Improve logging in case of rpmlib error +- Add clean method to GitRepository class +- Add all_remotes option in git fetch command +- Add tags option in git push command +- rpm: print a warning if importing gbp-specific librpm fails +- rpm: implement a wrapper module for rpm lib +- rpm: simplify SpecFile._parse_filtered_spec() +- Fix pylint warnings, follow Markus' sugesstion +- rpm: enhance spec parsing error messages +- GitRepository/add_files: consistently update all tracked files +- GitRepository: Add refspec option to fetch method +- GitRepository: Add all option to pull method +- GitRepository: Add force option to push method diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec new file mode 100755 index 00000000..9207d87b --- /dev/null +++ b/packaging/git-buildpackage.spec @@ -0,0 +1,296 @@ +%{!?python3_sitelib: %define python3_sitelib %(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')} +# Add --without docs rpmbuild option, i.e. docs are enabled by default +#current disable docs. +%bcond_with docs + +Name: git-buildpackage +Summary: Build packages from git +Version: 0.9.29 +Release: 0 +Group: Development/Tools/Building +License: GPLv2 +BuildArch: noarch +URL: https://honk.sigxcpu.org/piki/projects/git-buildpackage/ +Source0: %{name}_%{version}.tar.gz + + +# Conditional package names for requirements +%if 0%{?fedora} || 0%{?centos_ver} +%define dpkg_pkg_name dpkg-devel +%else +%define dpkg_pkg_name dpkg +%endif + +%if 0%{?suse_version} && 0%{?suse_version} < 1230 +%define devscripts_pkg_name devscripts-fixes +%else +%define devscripts_pkg_name devscripts +%endif + +%if 0%{?fedora} +%define man_pkg_name man-db +%else +%define man_pkg_name man +%endif + +%if 0%{?fedora} || 0%{?centos_ver} || 0%{?tizen_version:1} +%define python_pkg_name python3 +%else +%define python_pkg_name python3 +%endif + +%if 0%{?tizen_version:1} +%define rpm_python_pkg_name python3-rpm +%else +%define rpm_python_pkg_name python3-rpm +%endif + +Requires: %{name}-common = %{version}-%{release} +Requires: %{dpkg_pkg_name} +Requires: %{devscripts_pkg_name} +BuildRequires: python3 +BuildRequires: python3-setuptools + +%if %{with docs} +BuildRequires: docbook-utils +BuildRequires: gtk-doc +BuildRequires: epydoc +%if 0%{?fedora} +BuildRequires: perl-podlators +%endif +%endif + +%if 0%{?do_unittests} +BuildRequires: python3-coverage +BuildRequires: python3-nose +BuildRequires: git-core +BuildRequires: %{man_pkg_name} +BuildRequires: %{dpkg_pkg_name} +BuildRequires: rpm-build +BuildRequires: %{rpm_python_pkg_name} +BuildRequires: pristine-tar +BuildRequires: unzip +BuildRequires: libzip +BuildRequires: gnupg +# Missing dep of dpkg in openSUSE +%if 0%{?suse_version} +BuildRequires: perl-TimeDate +%endif +%endif + +%description +Set of tools from Debian that integrate the package build system with Git. +This package contains the original Debian tools. + + +%package common +Summary: Common files for git-buildpackage debian and rpm tools +Group: Development/Tools/Building +Requires: git-core +Requires: %{man_pkg_name} +Requires: %{python_pkg_name} +Requires: python3-python-dateutil +%if 0%{?suse_version} || 0%{?tizen_version:1} +Recommends: pristine-tar +Recommends: unzip +Recommends: libzip +%else +Requires: pristine-tar +Requires: unzip +Requires: libzip +%endif + +%description common +Common files and documentation, used by both git-buildpackage debian and rpm tools + + +%package rpm +Summary: Build RPM packages from git +Group: Development/Tools/Building +Requires: %{name}-common = %{version}-%{release} +Requires: rpm +Requires: %{rpm_python_pkg_name} +%if 0%{?suse_version} || 0%{?tizen_version:1} +Recommends: rpm-build +%else +Requires: rpm-build +%endif +Provides: tizen-gbp-rpm = 20231130 + +%description rpm +Set of tools from Debian that integrate the package build system with Git. +This package contains the tools for building RPM packages. + + +%package bb +Summary: Build with BitBake from git +Group: Development/Tools/Building +Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-rpm = %{version}-%{release} +%if 0%{?suse_version} || 0%{?tizen_version:1} +Recommends: bitbake +%endif + +%description bb +Set of tools from Debian that integrate the package build system with Git. +This package contains the tools for building with the BitBake tool. + + +%if %{with docs} +%package doc +Summary: Documentation for the git-buildpackage suite +Group: Development/Tools/Building + +%description doc +This package contains documentation for the git-buildpackage suite - both the +Debian and the RPM tool set. +%endif + + +%prep +%setup -q -n %{name}-%{version} + + + +%build +WITHOUT_NOSETESTS=1 %{__python3} ./setup.py build + +%if %{with docs} +# Prepare apidocs +epydoc -n git-buildpackage --no-sourcecode -o docs/apidocs/ \ + gbp*.py git*.py gbp/ + +# HTML docs +HAVE_SGML2X=0 make -C docs/ +%endif + + +%if 0%{?do_unittests} +%check +GIT_CEILING_DIRECTORIES=%{_builddir} \ + GIT_AUTHOR_EMAIL=rpmbuild@example.com GIT_AUTHOR_NAME=rpmbuild \ + GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL \ + %{__python3} setup.py nosetests +%endif + + +%install +rm -rf %{buildroot} +WITHOUT_NOSETESTS=1 %{__python3} ./setup.py install --root=%{buildroot} --prefix=/usr +rm -rf %{buildroot}%{python3_sitelib}/*info + +#remove __pycache directory +find %{buildroot}%{python3_sitelib} -name "__pycache__" | xargs rm -rfv + +%if %{with docs} +# Install man pages +install -d %{buildroot}%{_mandir}/man1 %{buildroot}%{_mandir}/man5 +install docs/*.1 %{buildroot}%{_mandir}/man1/ +install docs/*.5 %{buildroot}%{_mandir}/man5/ + +# Install html documentation +mkdir -p %{buildroot}%{_docdir}/%{name} +cp -r docs/manual-html %{buildroot}%{_docdir}/%{name} +cp -r docs/apidocs %{buildroot}%{_docdir}/%{name} +%endif + +cat > files.list << EOF +%{_bindir}/gbp-pq +%{_bindir}/git-buildpackage +%{_bindir}/git-dch +%{_bindir}/git-import-dsc +%{_bindir}/git-import-dscs +%{_bindir}/git-import-orig +%{_bindir}/git-pbuilder +%{_bindir}/gbp-create-remote-repo +%{python3_sitelib}/gbp/deb +%{python3_sitelib}/gbp/scripts/pq.py* +%{python3_sitelib}/gbp/scripts/buildpackage.py* +%{python3_sitelib}/gbp/scripts/dch.py* +%{python3_sitelib}/gbp/scripts/import_dsc.py* +%{python3_sitelib}/gbp/scripts/import_dscs.py* +%{python3_sitelib}/gbp/scripts/import_orig.py* +%{python3_sitelib}/gbp/scripts/create_remote_repo.py* +EOF + +%if %{with docs} +cat >> files.list << EOF +%{_mandir}/man1/gbp-buildpackage.1* +%{_mandir}/man1/gbp-create-remote-repo.1* +%{_mandir}/man1/gbp-dch.1* +%{_mandir}/man1/gbp-import-dsc.1* +%{_mandir}/man1/gbp-import-dscs.1* +%{_mandir}/man1/gbp-import-orig.1* +%{_mandir}/man1/gbp-pq.1* +%{_mandir}/man1/git-pbuilder.1* +EOF +%endif + +# Disable the debian tools for CentOS +%if 0%{?centos_version} +for f in `cat files.list`; do + rm -rfv %{buildroot}/$f +done + +%else + +%files -f files.list +%defattr(-,root,root,-) +%endif + +%files common +%defattr(-,root,root,-) +%{_bindir}/gbp +%{_bindir}/gbp-clone +%{_bindir}/gbp-pull +%dir %{python3_sitelib}/gbp +%dir %{python3_sitelib}/gbp/git +%dir %{python3_sitelib}/gbp/pkg +%dir %{python3_sitelib}/gbp/scripts +%dir %{python3_sitelib}/gbp/scripts/common +%{python3_sitelib}/gbp/*.py* +%{python3_sitelib}/gbp/scripts/__init__.py* +%{python3_sitelib}/gbp/scripts/clone.py* +%{python3_sitelib}/gbp/scripts/config.py* +%{python3_sitelib}/gbp/scripts/pull.py* +%{python3_sitelib}/gbp/scripts/supercommand.py* +%{python3_sitelib}/gbp/scripts/common/*.py* +%{python3_sitelib}/gbp/git/*.py* +%{python3_sitelib}/gbp/pkg/*.py* +%config %{_sysconfdir}/git-buildpackage +%if %{with docs} +%{_mandir}/man1/gbp.1* +%{_mandir}/man1/gbp-clone.1* +%{_mandir}/man1/gbp-config.1* +%{_mandir}/man1/gbp-pull.1* +%{_mandir}/man5/*.5* +%endif + + +%files rpm +%defattr(-,root,root,-) +%dir %{python3_sitelib}/gbp/rpm +%{_bindir}/*rpm* +%{python3_sitelib}/gbp/scripts/*rpm*.py* +%{python3_sitelib}/gbp/rpm/*py* +%if %{with docs} +%{_mandir}/man1/gbp-buildpackage-rpm.1* +%{_mandir}/man1/gbp-import-orig-rpm.1* +%{_mandir}/man1/gbp-import-srpm.1* +%{_mandir}/man1/gbp-pq-rpm.1* +%{_mandir}/man1/gbp-rpm-ch.1* +%endif + + +%files bb +%defattr(-,root,root,-) +%dir %{python3_sitelib}/gbp/bb +%{python3_sitelib}/gbp/scripts/*bb*.py* +%{python3_sitelib}/gbp/bb/*py* + + +%if %{with docs} +%files doc +%defattr(-,root,root,-) +%{_docdir}/%{name}/ +%endif |