Commit Graph

25 Commits

Author SHA1 Message Date
Junio C Hamano
90bc118fc5 Enable git-send-email-script on Debian.
You can define WITH_SEND_EMAIL to include the send-email command as
part of the installation.  Since Debian, unlike RPM/Fedora, has the
two necessary Perl modules available as part of the mainline
distribution, there is no reason for us to shy away from shipping
send-email.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26 21:46:32 -07:00
Tommi Virtanen
8500231579 [PATCH] git bugfixes and cleanups, mainly Debian things
Point Debian doc-base at the right files. Clean up.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26 13:01:12 -07:00
Tommi Virtanen
c68e10b197 [PATCH] git bugfixes and cleanups, mainly Debian things
Ignore generated files.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26 12:54:27 -07:00
Tommi Virtanen
88db5f809d [PATCH] git bugfixes and cleanups, mainly Debian things
Generate docs for gitk. Install them in the right deb package.

Signed-off-by: Tommi Virtanen <tv@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-26 12:52:25 -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
Junio C Hamano
755d62788f Merge master changes into release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-13 00:12:51 -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
Junio C Hamano
5b6a8b6490 Adjust binary packaging to dest=>DESTDIR change.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12 12:25:34 -07:00
Junio C Hamano
704a66f52e Make tools/ directory first-class citizen.
Tools directory being separate is just a historical
coincidence.  Build and install together with the main
directory, just like the clean target does. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12 10:38:24 -07:00
Junio C Hamano
8eb14dc188 Merge changes in the master branch into 0.99.5 preparation branch. 2005-08-11 22:12:29 -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
38b1afd812 Start preparing for 0.99.5
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-10 22:05:59 -07:00
Junio C Hamano
bf57030315 GIT 0.99.4.
Mark it official.  Finally.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-10 14:43:08 -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
Junio C Hamano
f29eaed12f Fix build rules for debian package.
Run install-tools target to install the tools to accept e-mail
patches.  Also clean up the main Makefile a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 22:29:21 -07:00
Junio C Hamano
7a59013290 GIT 0.99.4 (release candidate)
This is my first attempt to adjust Debian and RPM to pass
prefix, to prepare the 0.99.4 release.

It updates debian/rules and git-core.spec.in to properly pass
prefix when building binary packages.  It also updates
debian/changelog to make the resulting binary package name
0.99.4; this is not needed on the RPM side (it takes the version
number from the main Makefile).

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 17:23:52 -07:00
Kalle Valo
a765c99a41 [PATCH] Fix debian doc-base
Fixed location of HTML documents in debian doc-base file.

Without this fix debian package won't install properly (complains
about missing /usr/share/doc/git-core/html directory).

jc: thanks, Kalle.  I think debian/rules is still broken around
etcdir area, though.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-03 21:41: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
34862b2e24 [PATCH] Deb packaging needs two more configuration files
The deb package building needs these two new files to work correctly.

debian/compat sets the rules under which the debhelper scripts (dh_*)
operate.

debian/git-core.install tells dh_install what files to install in each
package that is generated.  There is only one package being generated,
so all files go into it.

(I missed these in the last patch, mostly because I needed to do this to
find stuff I had missed:
	find . -name .git -type d -prune -o -type f -print \
		| grep -v -e .tree1 -e .tree2 \
		| sed -e "s/^\.\///" \
		| sort >.tree1
	git-ls-files | grep -v -e .tree1 -e .tree2 \
		| sort >.tree2
	diff -u .tree1 .tree2
)

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
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