summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-27 05:47:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-27 05:47:27 (GMT)
commit0f583175317a1c5c57b56c87856fbe46c3f3c296 (patch)
tree743751d750cb7355c02dd2aa7f53a655ba6fd11c /debian
parentb033b4e48195ef5974b7255f30de2cd7f67868b8 (diff)
parentaba2da13391d2adc72c0a2805e7196db2c803753 (diff)
downloadgit-0f583175317a1c5c57b56c87856fbe46c3f3c296.zip
git-0f583175317a1c5c57b56c87856fbe46c3f3c296.tar.gz
git-0f583175317a1c5c57b56c87856fbe46c3f3c296.tar.bz2
Merge master branch changes into release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules3
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0c87797..f3cf358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ git-core (0.99.6-0) unstable; urgency=low
-- Junio C Hamano <junkio@cox.net> Wed, 24 Aug 2005 23:09:35 -0700
+git-core (0.99.5-1) unstable; urgency=low
+
+ * Enable git-send-email-script on Debian. There is no reason to shy
+ away from it, since we have the necessary Perl modules available.
+
+ -- Junio C Hamano <junkio@cox.net> Thu, 25 Aug 2005 14:16:59 -0700
+
git-core (0.99.5-0) unstable; urgency=low
* GIT 0.99.5
diff --git a/debian/rules b/debian/rules
index c46b4d9..86464bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,9 @@ else
export MOZILLA_SHA1=YesPlease
endif
+# We do have the requisite perl modules in the mainline, and
+# have no reason to shy away from this script.
+export WITH_SEND_EMAIL=YesPlease
PREFIX := /usr
MANDIR := /usr/share/man/