git bugfixes and cleanups, mainly Debian things
PATCH 1/1 git bugfixes and cleanups, mainly Debian things
Fix syntax error in debian Build-Depends-Indep, dpkg-checkbuilddeps used to give false ok results.
---
commit c87030106cfbe39f0ab2ed095f30f576235328fc
tree ca572653ccd5a4c35f9479c079c8a904d6fce2d1
parent 248542ea9ae9125a7ccf214b979ada9908ea1358
author Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:26 +0300 committer Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:26 +0300
debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
debian/control +1 -1
@@ -2,7 +2,7 @@ Source: git-core Section: devel Priority: optional Maintainer: Junio C Hamano <[email protected]> -Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev, asciidoc > 6.0.3, xmlto, debhelper (>= 4.0.0) +Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0) Standards-Version: 3.6.1 Package: git-core
PATCH 1/1 git bugfixes and cleanups, mainly Debian things
Make the git deb conflict with cogito versions prior to 0.13, as those versions used to contain git. Suggest cogito.
---
commit 62e16702fdb0cdc13822470f3a19b36956fd0d78
tree bf96bcbdf1ca99390e6d6cb894da8384270c585f
parent c87030106cfbe39f0ab2ed095f30f576235328fc
author Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:27 +0300 committer Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:27 +0300
debian/control | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
debian/control +2 -1
@@ -9,7 +9,8 @@ Package: git-core Architecture: any Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, patch, rcs Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl -Conflicts: git +Suggests: cogito +Conflicts: git, cogito (<< 0.13) Description: The git content addressable filesystem GIT comes in two layers. The bottom layer is merely an extremely fast and flexible filesystem-based database designed to store directory trees
PATCH 1/1 git bugfixes and cleanups, mainly Debian things
Point Debian doc-base at the right files. Clean up.
---
commit f4d2a91b2946330c4bf240cf73e64684cba43ddf
tree 8ccdaef874ab4161b7c22206672376fdfc338689
parent 62e16702fdb0cdc13822470f3a19b36956fd0d78
author Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:28 +0300 committer Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:28 +0300
debian/git-core.doc-base | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
debian/git-core.doc-base +2 -3
@@ -1,6 +1,5 @@ Document: git-core -Title: git-core -Author: +Title: git reference Abstract: This manual describes git Section: Devel
@@ -9,4 +8,4 @@ Index: /usr/share/doc/git-core/git.html Files: /usr/share/doc/git-core/*.html Format: text -Files: /usr/share/doc/git-core/git-core.txt +Files: /usr/share/doc/git-core/git.txt*
PATCH 1/1 git bugfixes and cleanups, mainly Debian things
Generate docs for gitk. Install them in the right deb package.
---
commit 56bb91cb027a0e0dc8d896d26906597088ee6372
tree 6be1279d6a87b42e9b726ee7883ebe4e81d1fd01
parent f4d2a91b2946330c4bf240cf73e64684cba43ddf
author Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:29 +0300 committer Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:29 +0300
Documentation/Makefile | 2 +- debian/git-tk.files | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-)
Documentation/Makefile +1 -1
@@ -1,4 +1,4 @@ -MAN1_TXT=$(wildcard git-*.txt) +MAN1_TXT=$(wildcard git-*.txt) gitk.txt MAN7_TXT=git.txt DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
debian/git-tk.files +2 -0
@@ -1 +1,3 @@ /usr/bin/gitk +/usr/share/man/man1/gitk.* +/usr/share/doc/git-core/gitk.*
PATCH 1/1 git bugfixes and cleanups, mainly Debian things
Ignore generated files.
---
commit de5b995a65645ecf09bfebff2ba7dc325979e4b3
tree 6a48d6719178c7e0d81cae7683e5b7294ee92781
parent 56bb91cb027a0e0dc8d896d26906597088ee6372
author Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:33 +0300 committer Tommi Virtanen <[email protected]> Fri, 26 Aug 2005 12:32:33 +0300
.gitignore | 51 ++++++++++++++++++++++++++++++++++++++++++++++ Documentation/.gitignore | 5 +++++ debian/.gitignore | 6 +++++ templates/.gitignore | 1 + tools/.gitignore | 2 ++ 5 files changed, 65 insertions(+), 0 deletions(-)
.gitignore new file +51 -0
@@ -0,0 +1,51 @@ +git-apply +git-build-rev-cache +git-cat-file +git-checkout-cache +git-clone-pack +git-commit-tree +git-convert-cache +git-daemon +git-diff-cache +git-diff-files +git-diff-helper +git-diff-stages +git-diff-tree +git-export +git-fetch-pack +git-fsck-cache +git-get-tar-commit-id +git-hash-object +git-http-pull +git-init-db +git-local-pull +git-ls-files +git-ls-tree +git-merge-base +git-merge-cache +git-mktag +git-pack-objects +git-patch-id +git-peek-remote +git-prune-packed +git-read-tree +git-receive-pack +git-rev-list +git-rev-parse +git-rev-tree +git-send-pack +git-show-branch +git-show-index +git-show-rev-cache +git-ssh-pull +git-ssh-push +git-stripspace +git-tar-tree +git-unpack-file +git-unpack-objects +git-update-cache +git-update-server-info +git-upload-pack +git-var +git-verify-pack +git-write-tree
Documentation/.gitignore new file +5 -0
@@ -0,0 +1,5 @@ +*.xml +*.html +*.1 +*.7 +howto-index.txt
debian/.gitignore new file +6 -0
@@ -0,0 +1,6 @@ +git-core +git-tk +*.debhelper +*.substvars +build-stamp +files
templates/.gitignore new file +1 -0
@@ -0,0 +1 @@ +blt
tools/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +git-mailinfo +git-mailsplit