[DRE-commits] r5477 - in trunk/camping/debian: . patches

[Paul van Tilburg]

Author: paulvt
Date: 2010-06-01 20:20:24 +0000 (Tue, 01 Jun 2010)
New Revision: 5477

Added:
   trunk/camping/debian/docs
Removed:
   trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff
Modified:
   trunk/camping/debian/changelog
   trunk/camping/debian/control
   trunk/camping/debian/rules
Log:
* debian/control:
  - Dropped the recommend on rails now that it has been split up.
  - Added libactiverecord-ruby1.8, mongrel and ${misc:Depends} to 
    the recommends.
* debian/docs: added to install the generated RDoc documentation.
    dropped, since the rails split up the libraries are available
    in $LOAD_PATH.
* debian/rules: 
  - Removed the manpage generation since the source is no
  - Generate and install RDoc documentation.



Modified: trunk/camping/debian/changelog
===================================================================
--- trunk/camping/debian/changelog	2010-06-01 10:22:53 UTC (rev 5476)
+++ trunk/camping/debian/changelog	2010-06-01 20:20:24 UTC (rev 5477)
@@ -7,19 +7,24 @@
   * debian/control: 
     - Bumped standards version to 3.8.4.
     - Updated the depends, now depends on librack-ruby1.8 and no
-      longer depends on but recommends libmarkaby-ruby1.8 and rails.
-    - Added mongrel and ${misc:Depends} to the recommends.
+      longer depends on but recommends libmarkaby-ruby1.8.
+    - Dropped the recommend on rails now that it has been split up.
+    - Added libactiverecord-ruby1.8, mongrel and ${misc:Depends} to 
+      the recommends.
   * debian/copyright: updated for the new download location.
+  * debian/docs: added to install the generated RDoc documentation.
   * debian/patches/01_add-activerecord-activesupport-loadpath.diff:
-    updated for current upstream, patch lib/camping/ar.rb instead
-    of bin/camping.
+      dropped, since the rails split up the libraries are available
+      in $LOAD_PATH.
   * debian/README.Debian: update the text to reflect that Camping now
     not depends but just recommends active record and support.
-  * debian/rules: removed the manpage generation since the source is no
-    longer provided.
-  * debian/watch: updated for the new location on github.
+  * debian/rules: 
+    - Removed the manpage generation since the source is no
+      longer provided.
+    - Generate and install RDoc documentation.
+  * debian/watch: updated for the new location on Github.
 
- -- Paul van Tilburg <paulvt at debian.org>  Sun, 16 May 2010 19:52:27 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Tue, 01 Jun 2010 22:14:14 +0200
 
 camping (1.5+svn242-1) unstable; urgency=low
 

Modified: trunk/camping/debian/control
===================================================================
--- trunk/camping/debian/control	2010-06-01 10:22:53 UTC (rev 5476)
+++ trunk/camping/debian/control	2010-06-01 20:20:24 UTC (rev 5477)
@@ -12,8 +12,7 @@
 Package: camping
 Architecture: all
 Depends: ruby1.8, librack-ruby1.8, ${misc:Depends}
-Recommends: rails, libsqlite3-ruby1.8 (>= 1.1.0.1), libmarkaby-ruby1.8, mongrel
-Suggests: libfcgi-ruby1.8
+Recommends: libactivesupport-ruby1.8, libsqlite3-ruby1.8 (>= 1.1.0.1), libmarkaby-ruby1.8, 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
  code.  The idea here is to store a complete fledgling web application

Added: trunk/camping/debian/docs
===================================================================
--- trunk/camping/debian/docs	                        (rev 0)
+++ trunk/camping/debian/docs	2010-06-01 20:20:24 UTC (rev 5477)
@@ -0,0 +1 @@
+doc/rdoc

Deleted: trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff
===================================================================
--- trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff	2010-06-01 10:22:53 UTC (rev 5476)
+++ trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff	2010-06-01 20:20:24 UTC (rev 5477)
@@ -1,15 +0,0 @@
-diff --git a/lib/camping/ar.rb b/lib/camping/ar.rb
-index b6d1f1d..cf12ba6 100644
---- a/lib/camping/ar.rb
-+++ b/lib/camping/ar.rb
-@@ -1,6 +1,10 @@
- class MissingLibrary < Exception #:nodoc: all
- end
- begin
-+    # Add active_record and active_support paths in Rails package since this is
-+    # not in a standard location.
-+    $LOAD_PATH.unshift "/usr/share/rails/activerecord/lib"
-+    $LOAD_PATH.unshift "/usr/share/rails/activesupport/lib"
-     require 'active_record'
- rescue LoadError => e
-     raise MissingLibrary, "ActiveRecord could not be loaded (is it installed?): #{e.message}"

Modified: trunk/camping/debian/rules
===================================================================
--- trunk/camping/debian/rules	2010-06-01 10:22:53 UTC (rev 5476)
+++ trunk/camping/debian/rules	2010-06-01 20:20:24 UTC (rev 5477)
@@ -5,3 +5,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+build/camping::
+	rdoc --fmt html --inline-source --fileboxes --line-numbers \
+	  --main README --title "Camping, a Microframework" --op doc/rdoc \
+	  README book/* lib/camping-unabridged.rb lib/camping/*.rb
+
+clean::
+	rm -rf doc