[DRE-commits] r5358 - in trunk/camping/debian: . patches
Paul van Tilburg
paulvt at alioth.debian.org
Sun May 16 18:22:52 UTC 2010
Author: paulvt
Date: 2010-05-16 18:22:48 +0000 (Sun, 16 May 2010)
New Revision: 5358
Added:
trunk/camping/debian/camping.1
Modified:
trunk/camping/debian/README.Debian
trunk/camping/debian/changelog
trunk/camping/debian/control
trunk/camping/debian/copyright
trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff
trunk/camping/debian/rules
trunk/camping/debian/watch
Log:
* New upstream release.
* Camping has been adopted by the community after _why's disappearance,
due to this, the main site and code was moved.
* debian/camping.1: added, manpage no longer provided by upstream.
* 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.
* debian/copyright: updated for the new download location.
* debian/patches/01_add-activerecord-activesupport-loadpath.diff:
updated for current upstream, patch lib/camping/ar.rb instead
of bin/camping.
* 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.
Modified: trunk/camping/debian/README.Debian
===================================================================
--- trunk/camping/debian/README.Debian 2010-05-16 17:53:41 UTC (rev 5357)
+++ trunk/camping/debian/README.Debian 2010-05-16 18:22:48 UTC (rev 5358)
@@ -1,18 +1,18 @@
Camping for Debian
------------------
- Camping uses and thus depends on Active Support. Since this is currently
- contained in the Rails package, it is a dependency of this package.
- However, since the Rails package doesn't put the Active libraries in
- Ruby's standard $LOAD_PATH locations, Camping will be unable to find it.
- I have patched the camping script itself to include the path to the
- $LOAD_PATH, but, if you are writing a Camping dispatch-script or any
- other scripts that directly taps into the Camping API, you have to add
- this to the top of your script (i.e. before: require "camping"):
+ Camping can use and thus recommends on Active Support. Since this is
+ currently contained in the Rails package, it is a dependency of this
+ package. However, since the Rails package doesn't put the Active
+ libraries in Ruby's standard $LOAD_PATH locations, Camping will be unable
+ to find it. I have patched the camping script itself to include the path
+ to the $LOAD_PATH, but, if you are writing a Camping dispatch-script or
+ any other scripts that directly taps into the Camping API, you have to
+ add this to the top of your script (i.e. before: require "camping"):
$LOAD_PATH.unshift "/usr/share/rails/activesupport/lib"
Hopefully, the Active libraries will be split of the Rails package soon
and this will no longer be necessary.
- -- Paul van Tilburg <paulvt at debian.org> Sun, 5 Nov 2006 10:48:15 +0100
+ -- Paul van Tilburg <paulvt at debian.org> Sun, 16 May 2010 19:05:15 +0200
Added: trunk/camping/debian/camping.1
===================================================================
--- trunk/camping/debian/camping.1 (rev 0)
+++ trunk/camping/debian/camping.1 2010-05-16 18:22:48 UTC (rev 5358)
@@ -0,0 +1,46 @@
+.TH CAMPING "1" "May 2010" "camping 2.0" "User Commands"
+.SH NAME
+camping \- small Ruby web framework for MVC type applications
+.SH SYNOPSIS
+.B camping
+\fIapp1.rb app2.rb\fR...
+.SH DESCRIPTION
+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
+(written in Ruby) in a single file like many small CGIs, but to organize
+it as a Model-View-Controller application like Rails does. You can then
+easily move it to Rails once you've got it going.
+.SS "Specific options:"
+.TP
+\fB\-h\fR, \fB\-\-host\fR HOSTNAME
+Host for web server to bind to (default is all IPs)
+.TP
+\fB\-p\fR, \fB\-\-port\fR NUM
+Port for web server (defaults to 3301)
+.TP
+\fB\-d\fR, \fB\-\-database\fR FILE
+SQLite3 database path (defaults to ~/.camping.db)
+.TP
+\fB\-C\fR, \fB\-\-console\fR
+Run in console mode with IRB
+.TP
+\fB\-s\fR, \fB\-\-server\fR NAME
+Server to force (mongrel, webrick, console)
+.SS "Common options:"
+.TP
+\-?, \fB\-\-help\fR
+Show this message
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version
+.SH FILES
+.TP
+\fB~/.camping.db\fR
+The default database file.
+.SH SEE ALSO
+The Camping website on http://camping.rubyforge.org/.
+.SH AUTHOR
+This manual page was written by Paul van Tilburg <paulvt at debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
+
+
Modified: trunk/camping/debian/changelog
===================================================================
--- trunk/camping/debian/changelog 2010-05-16 17:53:41 UTC (rev 5357)
+++ trunk/camping/debian/changelog 2010-05-16 18:22:48 UTC (rev 5358)
@@ -1,8 +1,25 @@
-camping (1.5+svn242-2) UNRELEASED; urgency=low
+camping (2.0-1) UNRELEASED; urgency=low
- * debian/watch: added dversionmangle for svn snapshot version.
+ * New upstream release.
+ * Camping has been adopted by the community after _why's disappearance,
+ due to this, the main site and code was moved.
+ * debian/camping.1: added, manpage no longer provided by upstream.
+ * 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.
+ * debian/copyright: updated for the new download location.
+ * debian/patches/01_add-activerecord-activesupport-loadpath.diff:
+ updated for current upstream, patch lib/camping/ar.rb instead
+ of bin/camping.
+ * 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.
- -- Paul van Tilburg <paulvt at debian.org> Sun, 14 Feb 2010 17:10:32 +0100
+ -- Paul van Tilburg <paulvt at debian.org> Sun, 16 May 2010 19:52:27 +0200
camping (1.5+svn242-1) unstable; urgency=low
Modified: trunk/camping/debian/control
===================================================================
--- trunk/camping/debian/control 2010-05-16 17:53:41 UTC (rev 5357)
+++ trunk/camping/debian/control 2010-05-16 18:22:48 UTC (rev 5358)
@@ -4,17 +4,17 @@
Maintainer: Paul van Tilburg <paulvt at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends: cdbs, debhelper (>= 5), ruby-pkg-tools (>= 0.8), ruby
-Standards-Version: 3.7.3
-Homepage: http://code.whytheluckystiff.net/camping/
+Standards-Version: 3.8.4
+Homepage: http://camping.rubyforge.org/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/camping/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/camping/
Package: camping
Architecture: all
-Depends: ruby1.8, rails, libmarkaby-ruby1.8
-Recommends: libsqlite3-ruby1.8
+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
-Description: a small Ruby web framework for Model-View-Controller type applications
+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
(written in Ruby) in a single file like many small CGIs, but to organize
Modified: trunk/camping/debian/copyright
===================================================================
--- trunk/camping/debian/copyright 2010-05-16 17:53:41 UTC (rev 5357)
+++ trunk/camping/debian/copyright 2010-05-16 18:22:48 UTC (rev 5358)
@@ -1,7 +1,7 @@
This package was debianized by Paul van Tilburg <paulvt at debian.org> on
Fri, 4 Nov 2006 21:34:39 +0100.
-It was downloaded from: http://rubyforge.org/frs/?group_id=1273
+It was downloaded from: http://github.com/camping/camping/downloads
Copyright: (c) 2006 Why the lucky stiff <why at whytheluckystiff.net>
Modified: trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff
===================================================================
--- trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff 2010-05-16 17:53:41 UTC (rev 5357)
+++ trunk/camping/debian/patches/01_add-activerecord-activesupport-loadpath.diff 2010-05-16 18:22:48 UTC (rev 5358)
@@ -1,13 +1,15 @@
---- bin/camping.orig 2008-03-31 21:39:34.000000000 +0200
-+++ bin/camping 2008-03-31 22:04:25.000000000 +0200
-@@ -1,5 +1,10 @@
- #!/usr/bin/env ruby
-
-+# 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 'optparse'
- require 'ostruct'
- require 'stringio'
+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-05-16 17:53:41 UTC (rev 5357)
+++ trunk/camping/debian/rules 2010-05-16 18:22:48 UTC (rev 5358)
@@ -5,7 +5,3 @@
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::
- rm -f debian/camping.1
- gunzip -c doc/camping.1.gz > debian/camping.1
Modified: trunk/camping/debian/watch
===================================================================
--- trunk/camping/debian/watch 2010-05-16 17:53:41 UTC (rev 5357)
+++ trunk/camping/debian/watch 2010-05-16 18:22:48 UTC (rev 5358)
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/\+svn.*// \
-http://rubyforge.org/frs/?group_id=1273 .*camping-(.*)\.t.*
+ http://githubredir.debian.net/github/camping/camping/ ([.0-9]*).tar.gz
More information about the Pkg-ruby-extras-commits
mailing list