From 814be007dff08597f6f550f243916aae4bf1d0f8 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 26 Aug 2005 14:00:03 +0300 Subject: [PATCH] git bugfixes and cleanups, mainly Debian things Fix syntax error in debian Build-Depends-Indep, dpkg-checkbuilddeps used to give false ok results. Signed-off-by: Tommi Virtanen Signed-off-by: Junio C Hamano --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 5df89dde32..a044535065 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: git-core Section: devel Priority: optional Maintainer: Junio C Hamano -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 -- cgit v1.3 From 579fbe598ddd9608bd2fbcf8411299dde06d1912 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 26 Aug 2005 14:00:04 +0300 Subject: [PATCH] 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. Signed-off-by: Tommi Virtanen Signed-off-by: Junio C Hamano --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a044535065..6735a0da03 100644 --- a/debian/control +++ b/debian/control @@ -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 -- cgit v1.3 From 88db5f809d1e4a4afd28514151e97b40fd367661 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 26 Aug 2005 14:00:04 +0300 Subject: [PATCH] git bugfixes and cleanups, mainly Debian things Generate docs for gitk. Install them in the right deb package. Signed-off-by: Tommi Virtanen Signed-off-by: Junio C Hamano --- Documentation/Makefile | 2 +- debian/git-tk.files | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/Documentation/Makefile b/Documentation/Makefile index e928bcf280..bd6833b79e 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -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)) diff --git a/debian/git-tk.files b/debian/git-tk.files index 3801e7564b..e54f897ce3 100644 --- a/debian/git-tk.files +++ b/debian/git-tk.files @@ -1 +1,3 @@ /usr/bin/gitk +/usr/share/man/man1/gitk.* +/usr/share/doc/git-core/gitk.* -- cgit v1.3 From c68e10b197404a4af0e7b59b5be4167d214b08da Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 26 Aug 2005 14:00:05 +0300 Subject: [PATCH] git bugfixes and cleanups, mainly Debian things Ignore generated files. Signed-off-by: Tommi Virtanen Signed-off-by: Junio C Hamano --- .gitignore | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ Documentation/.gitignore | 5 +++++ debian/.gitignore | 6 ++++++ templates/.gitignore | 1 + tools/.gitignore | 2 ++ 5 files changed, 65 insertions(+) create mode 100644 .gitignore create mode 100644 Documentation/.gitignore create mode 100644 debian/.gitignore create mode 100644 templates/.gitignore create mode 100644 tools/.gitignore (limited to 'debian') diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..245f54e050 --- /dev/null +++ b/.gitignore @@ -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 diff --git a/Documentation/.gitignore b/Documentation/.gitignore new file mode 100644 index 0000000000..dad52b80d3 --- /dev/null +++ b/Documentation/.gitignore @@ -0,0 +1,5 @@ +*.xml +*.html +*.1 +*.7 +howto-index.txt diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000000..335ce9c596 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,6 @@ +git-core +git-tk +*.debhelper +*.substvars +build-stamp +files diff --git a/templates/.gitignore b/templates/.gitignore new file mode 100644 index 0000000000..ca680c5b9c --- /dev/null +++ b/templates/.gitignore @@ -0,0 +1 @@ +blt diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 0000000000..d1ea9ea306 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,2 @@ +git-mailinfo +git-mailsplit -- cgit v1.3 From 85002315798dfcd28da6120ac3a461ca3fadfd2e Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 26 Aug 2005 14:00:04 +0300 Subject: [PATCH] git bugfixes and cleanups, mainly Debian things Point Debian doc-base at the right files. Clean up. Signed-off-by: Tommi Virtanen Signed-off-by: Junio C Hamano --- debian/git-core.doc-base | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/git-core.doc-base b/debian/git-core.doc-base index f1bbea8119..1ed46333d1 100644 --- a/debian/git-core.doc-base +++ b/debian/git-core.doc-base @@ -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* -- cgit v1.3