kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
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>	19 years ago
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>	20 years ago
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>	20 years ago
Junio C Hamano	5b6a8b6490	Adjust binary packaging to dest=>DESTDIR change. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago

12 Commits (c6ae61590f79cb7ff848ef0f2c33396507e60442)