1
0
mirror of https://github.com/git/git.git synced 2024-09-30 16:01:40 +02:00
Commit Graph

25 Commits

Author SHA1 Message Date
Junio C Hamano
b6ebac9e43 Merge branch 'svnup' of http://netz.smurf.noris.de/git/git
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-14 13:50:05 -08:00
Matthias Urlichs
0f3f5e3f69 Depend on asciidoc 7 (at least). 2005-11-14 17:41:31 +01:00
Junio C Hamano
6d5410d651 Merge branch 'svnup' of http://netz.smurf.noris.de/git/git 2005-11-14 00:25:48 -08:00
Junio C Hamano
ac0b86dadf Debian: build-depend on libexpat-dev.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-13 01:57:33 -08:00
Matthias Urlichs
ceae78b438 debian packaging: git-cvs needs cvsps 2005-11-12 23:15:50 +01:00
Junio C Hamano
9eba845f20 Further Debian split fixes.
The doc installation was flattened, breaking links to howto/.
Silly cut&paste error made git-doc depend on tk8.4.  Doh.
Move most of the documentation (except manuals) to git-doc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06 01:12:32 -08:00
Junio C Hamano
d071e8dbb6 Package split: Debian.
As discussed on the list, split the foreign SCM interoperability
packages and documentation from the git-core binary package.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06 01:12:31 -08:00
Junio C Hamano
a34484e1c9 We do not depend on patch.
Deb packaging claim we depend on patch, but I think we use git-apply
where it matters.  When a patch does not apply with git-apply, using
GNU patch still is helpful sometimes.  So demote it from "Depends" to
"Suggests".

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-16 12:01:28 -07:00
Junio C Hamano
29504118f8 Merge branch 'svn' of http://netz.smurf.noris.de/git/git
[jc: I have my pre-commit hook enabled to catch trailing whitespaces,
 and fixed them up while merging.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-16 11:55:35 -07:00
Aneesh Kumar
e70ec8632c debian packaging
Make it build with stable testing and unstable.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-14 17:15:11 -07:00
Matthias Urlichs
c6582aba52 svn import: add libsvn-core-perl to Debian's control file
Added libsvn-core-perl to debian/control, "Recommends:" section.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
2005-10-10 13:10:01 +02:00
Matthias Urlichs
2842375859 [PATCH] Debian: build-depend on "bc"
Build systems should run tests. This patch adds the necessary
debian/control and debian/rules bits ("bc" was missing,
t/t4002-diff-basic.sh wants it).

Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-16 15:16:42 -07:00
Junio C Hamano
b93aa3ec95 Recommend 'less' for Debian.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-15 23:33:03 -07:00
Junio C Hamano
720d150c48 Add a new merge strategy by Fredrik Kuivinen.
I really wanted to try this out, instead of asking for an adjustment
to the 'git merge' driver and waiting.  For now the new strategy is
called 'fredrik' and not in the list of default strategies to be tried.

The script wants Python 2.4 so this commit also adjusts Debian and RPM
build procecure files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10 19:46:53 -07:00
Tommi Virtanen
579fbe598d [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 <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26 12:52:23 -07:00
Tommi Virtanen
814be007df [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 <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26 12:52:16 -07:00
Matthias Urlichs
af36b70ef9 Debianization updates
git-tk should be architecture independent.
git-core forgot to depend on perl.

Signed-Off-By: Matthias Urlichs <smurf@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12 21:16:01 -07:00
Junio C Hamano
b8c20680c8 Fix debianization: mark git-tk architecture neutral.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12 13:32:02 -07:00
Matthias Urlichs
5acc5bfd63 Debian packaging fixes.
- Split gitk off to its own package;
  it needs tk installed, but nothing else does.
- Refer to GPL properly, don't install COPYING.
- Fix maintainer.
- Use dh_movefiles instead of dh_install;
  we don't want to list everything *except* gitk.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-11 18:26:14 -07:00
Junio C Hamano
b1d096f292 Update Maintainer field of debian/control
My understanding is that having my name there is just as wrong
as having name of Linus, since neither of us is a debian
maintainer, but at least this would prevent people from bugging
Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-07 23:21:38 -07:00
Ryan Anderson
6ff3376ca6 [PATCH] Add new dependencies caused by git-send-email-script to debian/control
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-02 22:53:15 -07:00
Ryan Anderson
a977d2cf58 Deb Packaging fixes: Build against Mozilla libs for Debian, conflict with "git"
This patch includes two fixes to the git-core Debian package:

    * Conflict with the GNU Interactive Tools package, which _also_
      wants to install /usr/bin/git.

    * Compile against the unencumbered Mozilla SHA1 code, instead of
      the iffy OpenSSL code, as much as possible.  This makes it easier to get
      the package included for distribution with Debian.

This has been based upon the original patch by Sebastian Kuzminsky
<seb@highlab.com>, but has been fixed up based upon feedback.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-26 22:23:19 -07:00
Ryan Anderson
71fb3de0ee [PATCH] Deb packages should include the binaries
The Deb packages were missing a dependency on "build install" from the
binary target - this fixes that, and cleans up some inconsistencies
elsewhere in the rulesets.

Traditionally, Debian packaging uses a file called "build-stamp" (or
"install-stamp", etc) in the main source tree.  The initial deb package
support for Git tried to move this "build-stamp" file into the debian/
directory, but some instances were missed.  That problem, however, was
incidental - the real fix is the missing dependency mentioned above.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-23 11:05:58 -07:00
Ryan Anderson
f2a1f9a56e [PATCH] debian/ fixes
Make debian/rules executable, and correct the spelling of rsync in
debian/control.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-22 17:48:45 -07:00
Eric W. Biederman
7421abfdbd [PATCH] Initial support for building a debian package (.deb)
It's not any harder to include debian package support than to include a
spec file so here is the setup to build the equivalent debian package.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15 11:38:24 -07:00