aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-06-13 09:57:04 +0000
committerPeter Palfrader <peter@palfrader.org>2008-06-13 09:57:04 +0000
commit8f5afe4937d6b96832492aa616cdddca22ede897 (patch)
tree7f6b23710cef8483f658771f5e6dcc815b81e982
parentb2cd61258e52b10d8003c4206f2bf2b56b5bfb38 (diff)
downloadtor-8f5afe4937d6b96832492aa616cdddca22ede897.tar
tor-8f5afe4937d6b96832492aa616cdddca22ede897.tar.gz
Merge rest of 0.1.2.28-rc-1 into trunk.
svn:r15200
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules2
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index a41c60f39..2c9a953e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,15 +4,17 @@ tor (0.2.1.0-unreleased-1) XXperimental; urgency=low
-- Peter Palfrader <weasel@debian.org> Wed, 19 Mar 2008 20:09:25 +0100
-tor (0.2.0.27-rc-X) Xxperimental; urgency=low
+tor (0.2.0.28-rc-1) experimental; urgency=low
+ * New upstream version.
* Remove debian/patches/11_tor_as_root_more_helpful.dpatch as
it is no longer needed: We now setuid() to the Tor user
when run as root and it all just works.
* Add comments to the dpatch headers so lintian shuts up.
* Add patches/14_fix_geoip_warning: Change geoipdb open failed message.
+ * Require unit tests to pass again.
- -- Peter Palfrader <weasel@debian.org> Wed, 11 Jun 2008 12:55:49 +0200
+ -- Peter Palfrader <weasel@debian.org> Fri, 13 Jun 2008 10:28:36 +0200
tor (0.2.0.27-rc-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index af50d0414..b3f2b0dad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,7 +94,7 @@ build-stamp: config.status
src/or/test || true; \
else \
echo "src/or/test"; \
- src/or/test || true; \
+ src/or/test; \
fi; \
else \
echo -e "\n\nSkipping unittests\n\n"; \