aboutsummaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* Merge branch 'master' of .Junio C Hamano2005-09-18
|\
| * [PATCH] Debian: build-depend on "bc"Matthias Urlichs2005-09-16
| | | | | | | | | | | | | | | | | | 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>
| * Recommend 'less' for Debian.Junio C Hamano2005-09-15
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Prepare 0.99.7 release candidate branch.Junio C Hamano2005-09-10
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-10
| | | | | | | | | | | 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>
* Big tool rename.Junio C Hamano2005-09-07
| | | | | | | | | | | | | | | | | | | As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge master branch changes into release candidate branch.Junio C Hamano2005-08-26
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Enable git-send-email-script on Debian.Junio C Hamano2005-08-26
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge refs/heads/master from . Junio C Hamano2005-08-26
|\ \ | |/
| * [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | 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>
| * [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | Ignore generated files. Signed-off-by: Tommi Virtanen <tv@debian.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | 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>
| * [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | | | 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>
| * [PATCH] git bugfixes and cleanups, mainly Debian thingsTommi Virtanen2005-08-26
| | | | | | | | | | | | | | | | 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>
* | Prepare 0.99.6 branch.Junio C Hamano2005-08-24
|/
* Merge master changes into release candidate branch.Junio C Hamano2005-08-13
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Debianization updatesMatthias Urlichs2005-08-12
| | | | | | | | | | | | | | | | 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>
| * Fix debianization: mark git-tk architecture neutral.Junio C Hamano2005-08-12
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Adjust binary packaging to dest=>DESTDIR change.Junio C Hamano2005-08-12
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make tools/ directory first-class citizen.Junio C Hamano2005-08-12
| | | | | | | | | | | | | | | | 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>
* | Merge changes in the master branch into 0.99.5 preparation branch.Junio C Hamano2005-08-11
|\ \ | |/
| * Debian packaging fixes.Matthias Urlichs2005-08-11
| | | | | | | | | | | | | | | | | | | | | | - 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>
* | Start preparing for 0.99.5Junio C Hamano2005-08-10
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 0.99.4.v0.99.4Junio C Hamano2005-08-10
| | | | | | Mark it official. Finally. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update Maintainer field of debian/controlJunio C Hamano2005-08-07
| | | | | | | | | 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>
* Fix build rules for debian package.Junio C Hamano2005-08-06
| | | | | | | 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>
* GIT 0.99.4 (release candidate)Junio C Hamano2005-08-06
| | | | | | | | | | | | | 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>
* [PATCH] Fix debian doc-baseKalle Valo2005-08-03
| | | | | | | | | | | | 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>
* [PATCH] Add new dependencies caused by git-send-email-script to debian/controlRyan Anderson2005-08-02
| | | | | Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Deb Packaging fixes: Build against Mozilla libs for Debian, conflict with "git"Ryan Anderson2005-07-26
| | | | | | | | | | | | | | | | | 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>
* [PATCH] Deb packaging needs two more configuration filesRyan Anderson2005-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* [PATCH] Deb packages should include the binariesRyan Anderson2005-07-23
| | | | | | | | | | | | | | | | 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>
* [PATCH] debian/ fixesRyan Anderson2005-07-22
| | | | | | | | 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>
* [PATCH] Initial support for building a debian package (.deb)Eric W. Biederman2005-07-15
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>