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

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit becfc1b52a79a89527ec393086a7647e2bebc39e
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sat May 19 20:25:51 2012 +0200

    Prepare for an upload to experimental first

diff --git a/debian/NEWS b/debian/NEWS
index 265c385..c360e53 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-camping (2.1.498-1) UNRELEASED; urgency=low
+camping (2.1.498-1) experimental; 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
diff --git a/debian/camping.doc-base b/debian/camping.doc-base
new file mode 100644
index 0000000..59abd84
--- /dev/null
+++ b/debian/camping.doc-base
@@ -0,0 +1,11 @@
+Document: camping-doc
+Title: Documentation of the Camping web framework
+Author: Chris Lalancette et al.
+Abstract: This API documentation is generated with RDOC from the source of
+ the Camping, providing a small web framework for Model-View-Controller
+ type applications.
+Section: Programming/Ruby
+
+Format: HTML
+Index: /usr/share/doc/camping/rdoc/index.html
+Files: /usr/share/doc/camping/rdoc/*
diff --git a/debian/changelog b/debian/changelog
index 486f6c9..1a7f740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
-camping (2.1.498-1) UNRELEASED; urgency=low
-
-  NOTE: this is a prerelease, do not upload until 2.2 is released!
+camping (2.1.498-1) experimental; urgency=low
 
   * New upstream release (closes: #640065).
+  * Upload this prerelease of Camping version 2.2 to experimental first.
   * Source packages adapted according to the new Ruby policy:
     - Build for both ruby1.8 and ruby1.9.1 (Closes: #550806)
     - Migrated to pkg-ruby-extras git repos. Changed the Vcs-* fields in
@@ -13,6 +12,7 @@ camping (2.1.498-1) UNRELEASED; urgency=low
       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/camping.doc-base: added to register generated RDoc documentation.
   * debian/control:
     - Added a default DM-Upload-Allowed field set to yes.
     - Standards-Version bumped to 3.9.2; no changes required.

-- 
camping.git