[DRE-commits] r4004 - in trunk/merb/debian: . patches

Joshua Timberman jtimberman-guest at alioth.debian.org
Thu Aug 27 15:03:43 UTC 2009 

Author: jtimberman-guest
Date: 2009-08-27 15:03:43 +0000 (Thu, 27 Aug 2009)
New Revision: 4004

Added:
   trunk/merb/debian/README.source
   trunk/merb/debian/merb-slice.1
Modified:
   trunk/merb/debian/changelog
   trunk/merb/debian/control
   trunk/merb/debian/copyright
   trunk/merb/debian/merb-slices.manpages
   trunk/merb/debian/merb.1
   trunk/merb/debian/patches/load_dependencies_uses_require
   trunk/merb/debian/rules
   trunk/merb/debian/watch
Log:
rename slice binary, licensing information updates

Added: trunk/merb/debian/README.source
===================================================================
--- trunk/merb/debian/README.source	                        (rev 0)
+++ trunk/merb/debian/README.source	2009-08-27 15:03:43 UTC (rev 4004)
@@ -0,0 +1,42 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+The upstream source has also been modified to remove gems from the 
+specs, as the distributability is not confirmed for the gems. As
+a result, the spec tests for Merb will not work straight from the source
+tarball. These gems do not affect the outcome of the built package. The 
+following were removed:
+
+./merb-core/spec/public/core_ext/fixtures/gems/gems
+  bad_require_gem-0.0.1/
+  json_pure-1.1.3/
+  simple_gem-0.0.1/
+  simple_gem-0.0.2/
+./merb-core/spec10/public/core_ext/fixtures/gems/gems
+  bad_require_gem-0.0.1/
+  json_pure-1.1.3/
+  simple_gem-0.0.1/
+  simple_gem-0.0.2/
+./merb-core/spec10/public/webrat/test_app/gems/gems
+  abstract-1.0.0/
+  cgi_multipart_eof_fix-2.5.0/
+  daemons-1.0.10/
+  erubis-2.6.2/
+  extlib-0.9.8/
+  fastthread-1.0.1/
+  gem_plugin-0.2.3/
+  json_pure-1.1.3/
+  merb-core-0.9.14/
+  merb-helpers-0.9.14/
+  mime-types-1.15/
+  mongrel-1.1.5/
+  rack-0.4.0/
+  rake-0.8.3/
+  rspec-1.1.11/
+  thor-0.9.8/
+
+These gems would need to be manually retrieved and installed to the
+merb-core directories in order to run the spec tests.

Modified: trunk/merb/debian/changelog
===================================================================
--- trunk/merb/debian/changelog	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/changelog	2009-08-27 15:03:43 UTC (rev 4004)
@@ -1,5 +1,15 @@
-merb (1.0.12-1) unstable; urgency=low
+merb (1.0.12+dfsg-2) unstable; urgency=low
 
+   * Packaging approved for Ubuntu, updating for Debian.
+   * Rename merb-slices binary from slice to merb-slice.
+   * Repack upstream tarball, should not affect Debian packaging but noted:
+     + Replaced upstream empty LICENSE file with MIT license
+     + Removed object files which are part of the webrat spec testing.
+
+ -- Joshua Timberman <joshua at opscode.com>  Thu, 27 Aug 2009 08:56:09 -0600
+
+merb (1.0.12+dfsg-1) unstable; urgency=low
+
    * Initial release (Closes: #538928)
 
  -- Joshua Timberman <joshua at opscode.com>  Mon, 27 Jul 2009 23:38:37 -0600

Modified: trunk/merb/debian/control
===================================================================
--- trunk/merb/debian/control	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/control	2009-08-27 15:03:43 UTC (rev 4004)
@@ -35,7 +35,7 @@
  Installing this package will provide the capability to run a Merb application
  slice.
  .
- This package contains the slice binary and associated files.
+ This package contains the merb-slice binary and associated files.
 
 Package: libmerb-core-ruby
 Architecture: all

Modified: trunk/merb/debian/copyright
===================================================================
--- trunk/merb/debian/copyright	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/copyright	2009-08-27 15:03:43 UTC (rev 4004)
@@ -7,6 +7,8 @@
 
 Copyright (c) 2008 Engine Yard Inc.
 
+    Merb is released under the MIT License.
+
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
@@ -26,3 +28,11 @@
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+The Debian packaging is Copyright (c) 2009 Joshua Timberman and is licensed
+under the MIT License as above.
+
+./merb-core/spec/public/core_ext/fixtures/gems/gems
+./merb-core/spec10/public/core_ext/fixtures/gems/gems
+./merb-core/spec10/public/webrat/test_app/gems/gems
+    Files in these directories were removed as the distributability is not
+    confirmed for these gems. See README.source.

Added: trunk/merb/debian/merb-slice.1
===================================================================
--- trunk/merb/debian/merb-slice.1	                        (rev 0)
+++ trunk/merb/debian/merb-slice.1	2009-08-27 15:03:43 UTC (rev 4004)
@@ -0,0 +1,16 @@
+.TH MERB-SLICE "1" "July 2009"
+.SH NAME
+merb-slice \- Start a Merb slice.
+.SH SYNOPSIS
+.B merb-slice
+.SH DESCRIPTION
+The merb-slice command starts a Merb application as a slice.
+.SH SEE ALSO
+.br
+Documentation for Merb is maintained in RDoc via the package libmerb-ruby-doc, or available on the Merb web site, http://www.merbivore.com/
+.SH AUTHOR
+The upstream author of Merb is Yehuda Katz <ykatz at engineyard.com>. 
+This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man
+for the Debian and Ubuntu projects (but may be used by others). Permission is granted
+to copy, modify, merge, publish, and distribute this document under the terms of the
+MIT license.

Modified: trunk/merb/debian/merb-slices.manpages
===================================================================
--- trunk/merb/debian/merb-slices.manpages	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/merb-slices.manpages	2009-08-27 15:03:43 UTC (rev 4004)
@@ -1 +1 @@
-debian/slice.1
+debian/merb-slice.1

Modified: trunk/merb/debian/merb.1
===================================================================
--- trunk/merb/debian/merb.1	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/merb.1	2009-08-27 15:03:43 UTC (rev 4004)
@@ -96,9 +96,13 @@
 \-?, \fB\-H\fR, \fB\-\-help\fR
 Show this help message
 .SH "SEE ALSO"
-Full documentation for merb is available after the Merb packages are installed.
-For getting started instructions, see /usr/share/doc/merb/README.Debian.
+Documentation for Merb is maintained in RDoc via the package libmerb-ruby-doc, or available on the Merb web site, http://www.merbivore.com/
+.PP
+For getting started instructions, see /usr/share/doc/merb-core/README.Debian.
 .SH AUTHOR
 The upstream author of Merb is Yehuda Katz <ykatz at engineyard.com>. 
 This manual page was written by Joshua Timberman <joshua at opscode.com> with help2man
-for the Debian project (but may be used by others).
+for the Debian and Ubuntu projects (but may be used by others). Permission is granted
+to copy, modify, merge, publish, and distribute this document under the terms of the
+MIT license.
+

Modified: trunk/merb/debian/patches/load_dependencies_uses_require
===================================================================
--- trunk/merb/debian/patches/load_dependencies_uses_require	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/patches/load_dependencies_uses_require	2009-08-27 15:03:43 UTC (rev 4004)
@@ -1,5 +1,7 @@
-# Merb's dependency method, which calls load_dependency needs to have
+# Description: Merb's dependency method, which calls load_dependency needs to have
 # a fallback to simply use require if a gem is not found.
+# Patch: http://github.com/jtimberman/merb/commit/3633e6dfbc8f263667bd4af45f4beec2090c0e28
+# Upstream: https://merb.lighthouseapp.com/projects/7433-merb/tickets/1281
 Index: merb-1.0.12/merb-core/lib/merb-core/core_ext/kernel.rb
 ===================================================================
 --- merb-1.0.12.orig/merb-core/lib/merb-core/core_ext/kernel.rb	2009-07-29 16:20:14.000000000 -0600

Modified: trunk/merb/debian/rules
===================================================================
--- trunk/merb/debian/rules	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/rules	2009-08-27 15:03:43 UTC (rev 4004)
@@ -136,7 +136,8 @@
 	(cd merb-slices && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
 	(cd merb-slices && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
 	(cd merb-slices && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-slices-ruby1.8)
-	mv $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/bin/slice $(CURDIR)/debian/merb-slices/usr/bin/
+	rm $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/lib/ruby/1.8/generators/templates/common/LICENSE
+	mv $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/bin/slice $(CURDIR)/debian/merb-slices/usr/bin/merb-slice
 	rmdir $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/bin/
 
 install/libmerb-assets-ruby1.8::

Modified: trunk/merb/debian/watch
===================================================================
--- trunk/merb/debian/watch	2009-08-26 19:56:50 UTC (rev 4003)
+++ trunk/merb/debian/watch	2009-08-27 15:03:43 UTC (rev 4004)
@@ -1,2 +1,2 @@
 version=3
-http://githubredir.debian.net/github/wycats/merb /([0-9.]+).tar.gz
+http://githubredir.debian.net/github/wycats/merb /(.*).tar.gz

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