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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit e51f02850aa9892cdb8ca79dab8080f849931df1
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Jan 25 13:51:34 2012 +0100

    Work on 2.2 prerelease package that replaces Markaby with Mab

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..58e8068
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,19 @@
+camping (2.1.498-1) UNRELEASED; urgency=low
+
+ As of version 2.2, Camping no longer uses Markaby as its default
+ templating engine but Mab (see also [1]).  Due to license issues, Markaby
+ development was halted[2] and also removed from Debian.  Mab is almost
+ fully backward compatible with Markaby but differs on two small points:
+
+ * in Markaby, the string resulting from `text "foo"` is not escaped,
+   in Mab it _is_ escaped, but it is not escaped in `text! "foo"`.
+
+ * in Markaby one can use <<, which is not present in Mab but still
+   provided by Camping::Mab
+
+ Of course, it is also possible to use Tilt instead of Mab.
+
+ 1: http://github.com/camping/mab#readme>
+ 2: http://rubyforge.org/pipermail/camping-list/2011-December/001709.html
+
+ -- Paul van Tilburg <paulvt at debian.org>  Wed, 25 Jan 2012 13:33:11 +0100
diff --git a/debian/changelog b/debian/changelog
index 0e4122c..9f5e727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-camping (2.1-1) UNRELEASED; urgency=low
+camping (2.1.498-1) UNRELEASED; urgency=low
+
+  NOTE: this is a prerelease, do not upload until 2.2 is released!
 
   * New upstream release (closes: #640065).
   * Source packages adapted according to the new Ruby policy:
@@ -10,6 +12,7 @@ camping (2.1-1) UNRELEASED; urgency=low
   * debian/README.Debian: dropped; there is no longer the need to explain
       the depend on rails as we can depend on activerecord specifcally now
       since the rails splitup.
+  * debian/NEWS: added to explain the replacement of Markaby by Mab.
   * debian/control:
     - Added a default DM-Upload-Allowed field set to yes.
     - Standards-Version bumped to 3.9.2; no changes required.
@@ -19,12 +22,13 @@ camping (2.1-1) UNRELEASED; urgency=low
     - 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.
+      between Mab and Tilt.
+    - Replaced the dependency on libmarkaby-ruby by ruby-mab.
   * 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, 17 Dec 2011 11:43:21 +0100
+ -- Paul van Tilburg <paulvt at debian.org>  Wed, 25 Jan 2012 13:45:56 +0100
 
 camping (2.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e957416..3e46a71 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 | ruby-tilt
+Recommends: ruby-activerecord-2.3, ruby-sqlite3 (>= 1.1.0.1), ruby-mab | 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