Merge rest of 0.1.2.28-rc-1 into trunk.

svn:r15200

diff --git a/debian/changelog b/debian/changelog
index a41c60f39d3f168a8b988b5582648b5b8ee4be2d..2c9a953e8a3f46a9360922e6525d0515ad60ee9e 100644 (file)
--- 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 af50d0414fa612d2225c9d8843c56030f0209d65..b3f2b0dadbaf96996854b952c8ded5592e6c4ff0 100755 (executable)
--- 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"; \