[DRE-commits] [SCM] camping.git branch, master, updated. upstream/2.1-5-g9947e73

Paul van Tilburg paulvt at debian.org
Sat Dec 17 10:45:45 UTC 2011


The following commit has been merged in the master branch:
commit 9947e73fae2e99117769f043ad4914fb18ddb6ce
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sat Dec 17 11:45:37 2011 +0100

    Added an alternative depend on ruby-tilt, so the user can choose between Markaby and Tilt.

diff --git a/debian/changelog b/debian/changelog
index 506c43c..0e4122c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,11 +18,13 @@ camping (2.1-1) UNRELEASED; urgency=low
     - Added a build-depend on ruby-rack-test required for running tests.
     - Switched the maintainer with the uploaders field as per new
       convention the team is the default maintainer.
+    - Added an alternative depend on ruby-tilt, so the user can choose
+      between Markaby and Tilt.
   * debian/copyright: reworked to fit the DEP5 format. 
   * debian/ruby-test.rb: adapted to run the test apps from test/.
   * debian/rules: ignore the tests for now (one test inexplicably fails). 
 
- -- Paul van Tilburg <paulvt at debian.org>  Sat, 24 Sep 2011 22:29:15 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Sat, 17 Dec 2011 11:43:21 +0100
 
 camping (2.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9075b13..e957416 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: camping
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-rack
-Recommends: ruby-activerecord, ruby-sqlite3 (>= 1.1.0.1), ruby-markaby
+Recommends: ruby-activerecord, ruby-sqlite3 (>= 1.1.0.1), ruby-markaby | ruby-tilt
 Suggests: mongrel
 Description: small Ruby web framework for Model-View-Controller type applications
  Camping is a web framework which consistently stays at less than 4kb of

-- 
camping.git



More information about the Pkg-ruby-extras-commits mailing list