diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-26 17:34:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-26 17:34:01 -0700 |
| commit | b033b4e48195ef5974b7255f30de2cd7f67868b8 (patch) | |
| tree | eaa065e30f98110a82dec5992a45d1e4b0871fdf /debian | |
| parent | 09661fdbfc1631462bb5c9064349f74097369b4a (diff) | |
| parent | 85002315798dfcd28da6120ac3a461ca3fadfd2e (diff) | |
| download | git-b033b4e48195ef5974b7255f30de2cd7f67868b8.tar.gz git-b033b4e48195ef5974b7255f30de2cd7f67868b8.tar.xz | |
Merge refs/heads/master from .
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.gitignore | 6 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/git-core.doc-base | 5 | ||||
| -rw-r--r-- | debian/git-tk.files | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 000000000..335ce9c59 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,6 @@ +git-core +git-tk +*.debhelper +*.substvars +build-stamp +files diff --git a/debian/control b/debian/control index 5df89dde3..6735a0da0 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,15 @@ Source: git-core Section: devel Priority: optional Maintainer: Junio C Hamano <junkio@cox.net> -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 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 diff --git a/debian/git-core.doc-base b/debian/git-core.doc-base index f1bbea811..1ed46333d 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* diff --git a/debian/git-tk.files b/debian/git-tk.files index 3801e7564..e54f897ce 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.* |