[DRE-commits] r3866 - in packages-wip/merb/trunk: . debian debian/patches

Joshua Timberman jtimberman-guest at alioth.debian.org
Thu Jul 30 22:59:08 UTC 2009


Author: jtimberman-guest
Date: 2009-07-30 22:59:08 +0000 (Thu, 30 Jul 2009)
New Revision: 3866

Added:
   packages-wip/merb/trunk/debian/
   packages-wip/merb/trunk/debian/README.Debian
   packages-wip/merb/trunk/debian/changelog
   packages-wip/merb/trunk/debian/compat
   packages-wip/merb/trunk/debian/control
   packages-wip/merb/trunk/debian/copyright
   packages-wip/merb/trunk/debian/dirs
   packages-wip/merb/trunk/debian/docs
   packages-wip/merb/trunk/debian/merb-core.manpages
   packages-wip/merb/trunk/debian/merb-slices.dirs
   packages-wip/merb/trunk/debian/merb-slices.manpages
   packages-wip/merb/trunk/debian/merb.1
   packages-wip/merb/trunk/debian/patches/
   packages-wip/merb/trunk/debian/patches/load_dependencies_uses_require
   packages-wip/merb/trunk/debian/patches/series
   packages-wip/merb/trunk/debian/rules
   packages-wip/merb/trunk/debian/slice.1
   packages-wip/merb/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: packages-wip/merb/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: packages-wip/merb/trunk/debian/README.Debian
===================================================================
--- packages-wip/merb/trunk/debian/README.Debian	                        (rev 0)
+++ packages-wip/merb/trunk/debian/README.Debian	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,18 @@
+merb for Debian
+---------------
+
+The Merb packages provide just enough of Merb to run an existing application
+but not the components required to generate a new application for development.
+
+This package patches merb-core to allow load_dependency to 'require' other 
+libraries, rather than trying to load them with Gem. This resolves ticket
+# 1281, on the Merb ticket system.
+
+  https://merb.lighthouseapp.com/projects/7433-merb/tickets/1281
+
+For more information about the libraries provided, see the RDoc documentation
+in libmerb-ruby-doc. For more information about Merb, visit its homepage at:
+
+  http://www.merbivore.com/
+
+ -- Joshua Timberman <joshua at opscode.com>  Mon, 27 Jul 2009 23:38:37 -0600

Added: packages-wip/merb/trunk/debian/changelog
===================================================================
--- packages-wip/merb/trunk/debian/changelog	                        (rev 0)
+++ packages-wip/merb/trunk/debian/changelog	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,5 @@
+merb (1.0.12-1) unstable; urgency=low
+
+   * Initial release (Closes: #538928)
+
+ -- Joshua Timberman <joshua at opscode.com>  Mon, 27 Jul 2009 23:38:37 -0600

Added: packages-wip/merb/trunk/debian/compat
===================================================================
--- packages-wip/merb/trunk/debian/compat	                        (rev 0)
+++ packages-wip/merb/trunk/debian/compat	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1 @@
+7

Added: packages-wip/merb/trunk/debian/control
===================================================================
--- packages-wip/merb/trunk/debian/control	                        (rev 0)
+++ packages-wip/merb/trunk/debian/control	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,189 @@
+Source: merb
+Section: ruby
+Priority: extra
+Maintainer: Joshua Timberman <joshua at opscode.com>
+Build-Depends: cdbs, debhelper (>= 7), ruby-pkg-tools (>= 0.14), quilt
+Build-Depends-Indep: ruby1.8, rake
+Standards-Version: 3.8.2
+Homepage: http://merbivore.com
+
+Package: merb-core
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}, ruby1.8, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Lightweight Ruby-based MVC framework for web development
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ The Merb packages provide just enough to run a basic Merb application.
+ .
+ This package contains the merb binary and associated files.
+
+Package: merb-slices
+Architecture: all
+Depends: ${misc:Depends}, ruby1.8, libmerb-slices-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Merb plugin to modularize an application by creating 'slices'
+ Usually these slices are reusable extractions from the main application.
+ A module is set up to serve as a namespace for controller, models, helpers,
+ etc.
+ .
+ Installing this package will provide the capability to run a Merb application
+ slice.
+ .
+ This package contains the slice binary and associated files.
+
+Package: libmerb-core-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Core libraries for the Merb MVC framework
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-core libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-core-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, ruby1.8, libextlib-ruby (>=0.9.8), liberubis-ruby (>=2.6.2), rake, libjson-ruby, librack-ruby, libmime-types-ruby
+Suggests: libmerb-ruby-doc
+Description: Core Ruby 1.8 libraries for the Merb MVC framework
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ This package provides the core libraries that provide enough of Merb 
+ to run an application.
+ .
+ This package contains merb-core libraries for Ruby 1.8.
+
+Package: libmerb-assets-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-assets-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Plugin library for Merb that provides helpers for assets
+ Provides extra functionality related to assets:
+  * Assets bundling.
+  * Assets hosts.
+  * Helpers to add asset links to views.
+  * Deployment-time assets processing (for instance, with YUI Compressor).
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-assets libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-assets-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Ruby 1.8 plugin library for Merb that provides helpers for assets
+ Provides extra functionality related to assets:
+  * Assets bundling.
+  * Assets hosts.
+  * Helpers to add asset links to views.
+  * Deployment-time assets processing (for instance, with YUI Compressor).
+ .
+ This package contains the merb-assets libraries for Ruby 1.8.
+
+Package: libmerb-haml-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-haml-ruby1.8
+Suggests: libmerb-ruby-doc, libhaml-ruby-doc
+Description: Plugin library for Merb that provides access to libhaml-ruby
+ Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or 
+ XML that's designed to express the structure of XHTML or XML documents 
+ in a non-repetitive, elegant, easy way, using indentation rather than
+ closing tags and allowing Ruby to be embedded with ease. It was originally
+ envisioned as a plugin for Ruby on Rails, but it can function as a 
+ stand-alone templating engine. 
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-haml libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-haml-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8, libhaml-ruby1.8
+Suggests: libmerb-ruby-doc, libhaml-ruby-doc
+Description: Ruby 1.8 library for Merb that provides access to libhaml-ruby
+ Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or 
+ XML that's designed to express the structure of XHTML or XML documents 
+ in a non-repetitive, elegant, easy way, using indentation rather than
+ closing tags and allowing Ruby to be embedded with ease. It was originally
+ envisioned as a plugin for Ruby on Rails, but it can function as a 
+ stand-alone templating engine. 
+ .
+ This package contains the merb-haml libraries for Ruby 1.8.
+
+Package: libmerb-helpers-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-helpers-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Plugin library for Merb that provides view helpers
+ This plugin provides the following helpers for your views:
+  * form_helpers
+  * date_time_helpers
+  * tag_helpers
+  * text_helpers
+ See the RDOC documentation and the package README for more information.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-helpers libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-helpers-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Ruby 1.8 library for Merb that provides view helpers
+ This plugin provides the following helpers for your views:
+  * form_helpers
+  * date_time_helpers
+  * tag_helpers
+  * text_helpers
+ See the RDOC documentation and the package README for more information.
+ .
+ This package contains the merb-helpers libraries for Ruby 1.8.
+
+Package: libmerb-slices-ruby
+Architecture: all
+Depends: ${misc:Depends}, libmerb-slices-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Library to support merb-slices application modularization
+ Usually these slices are reusable extractions from the main application.
+ A module is set up to serve as a namespace for controller, models, helpers,
+ etc.
+ .
+ This package is a dependency package, which depends on the package
+ containing actual Ruby merb-slices libraries for the default Ruby version
+ (currently 1.8).
+
+Package: libmerb-slices-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libmerb-core-ruby1.8
+Suggests: libmerb-ruby-doc
+Description: Ruby 1.8 library to support merb-slices application modularization
+ Usually these slices are reusable extractions from the main application.
+ A module is set up to serve as a namespace for controller, models, helpers,
+ etc.
+ .
+ Installing this package will provide the capability to run a Merb application
+ slice.
+ .
+ This package contains the merb-slices libraries for Ruby 1.8.
+
+Package: libmerb-ruby-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: ruby1.8
+Description: Documentation for Merb
+ Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
+ and template languages. Merb is plugin-based, so the core is small and
+ well organized.
+ .
+ This package provides generated HTML documentation (rdoc) for Merb.

Added: packages-wip/merb/trunk/debian/copyright
===================================================================
--- packages-wip/merb/trunk/debian/copyright	                        (rev 0)
+++ packages-wip/merb/trunk/debian/copyright	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,28 @@
+This package was debianized by Joshua Timberman <joshua at opscode.com> on
+Mon, 27 Jul 2009 23:38:37 -0600.
+
+It was downloaded from <http://github.com/wycats/merb>
+
+Upstream Authors: Yehuda Katz <ykatz at engineyard.com>
+
+Copyright (c) 2008 Engine Yard Inc.
+
+    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
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+    
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

Added: packages-wip/merb/trunk/debian/dirs
===================================================================
--- packages-wip/merb/trunk/debian/dirs	                        (rev 0)
+++ packages-wip/merb/trunk/debian/dirs	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1 @@
+usr/bin

Added: packages-wip/merb/trunk/debian/docs
===================================================================
--- packages-wip/merb/trunk/debian/docs	                        (rev 0)
+++ packages-wip/merb/trunk/debian/docs	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,2 @@
+README
+TODO

Added: packages-wip/merb/trunk/debian/merb-core.manpages
===================================================================
--- packages-wip/merb/trunk/debian/merb-core.manpages	                        (rev 0)
+++ packages-wip/merb/trunk/debian/merb-core.manpages	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1 @@
+debian/merb.1

Added: packages-wip/merb/trunk/debian/merb-slices.dirs
===================================================================
--- packages-wip/merb/trunk/debian/merb-slices.dirs	                        (rev 0)
+++ packages-wip/merb/trunk/debian/merb-slices.dirs	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1 @@
+usr/bin

Added: packages-wip/merb/trunk/debian/merb-slices.manpages
===================================================================
--- packages-wip/merb/trunk/debian/merb-slices.manpages	                        (rev 0)
+++ packages-wip/merb/trunk/debian/merb-slices.manpages	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1 @@
+debian/slice.1

Added: packages-wip/merb/trunk/debian/merb.1
===================================================================
--- packages-wip/merb/trunk/debian/merb.1	                        (rev 0)
+++ packages-wip/merb/trunk/debian/merb.1	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,104 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
+.TH MERB "1" "July 2009" "merb 1.0.12" "User Commands"
+.SH NAME
+merb \- Start a merb application.
+.SH SYNOPSIS
+.B merb
+[\fIuGdcIpPhmailLerkKX\fR] [\fIargument\fR]
+.SH DESCRIPTION
+If no flags are given, Merb starts in the foreground on port 4000.
+.TP
+\fB\-u\fR, \fB\-\-user\fR USER
+This flag is for having merb run as a user other than the one currently logged in. Note: if you set this you must also provide a \fB\-\-group\fR option for it to take effect.
+.TP
+\fB\-G\fR, \fB\-\-group\fR GROUP
+This flag is for having merb run as a group other than the one currently logged in. Note: if you set this you must also provide a \fB\-\-user\fR option for it to take effect.
+.TP
+\fB\-d\fR, \fB\-\-daemonize\fR
+This will run a single merb in the background.
+.TP
+\fB\-N\fR, \fB\-\-no\-daemonize\fR
+This will allow you to run a cluster in console mode
+.TP
+\fB\-c\fR, \fB\-\-cluster\-nodes\fR NUM_MERBS
+Number of merb daemons to run.
+.TP
+\fB\-I\fR, \fB\-\-init\-file\fR FILE
+File to use for initialization on load, defaults to config/init.rb
+.TP
+\fB\-p\fR, \fB\-\-port\fR PORTNUM
+Port to run merb on, defaults to 4000.
+.TP
+\fB\-o\fR, \fB\-\-socket\-file\fR FILE
+Socket file to run merb on, defaults to [Merb.root]/log/merb.sock. This is for web servers, like thin, that use sockets.Specify this *only* if you *must*.
+.TP
+\fB\-s\fR, \fB\-\-socket\fR SOCKNUM
+Socket number to run merb on, defaults to 0.
+.TP
+\fB\-n\fR, \fB\-\-name\fR NAME
+Set the name of the application. This is used in the process title and log file names.
+.TP
+\fB\-P\fR, \fB\-\-pid\fR PIDFILE
+PID file, defaults to [Merb.root]/log/merb.main.pid for the master process and[Merb.root]/log/merb.[port number].pid for worker processes. For clusters, use %s to specify where in the file merb should place the port number. For instance: \fB\-P\fR myapp.%s.pid
+.TP
+\fB\-h\fR, \fB\-\-host\fR HOSTNAME
+Host to bind to (default is 0.0.0.0).
+.HP
+\fB\-m\fR, \fB\-\-merb\-root\fR /path/to/approot The path to the Merb.root for the app you want to run (default is current working directory).
+.TP
+\fB\-a\fR, \fB\-\-adapter\fR ADAPTER
+The rack adapter to use to run merb (default is mongrel)[mongrel, emongrel, thin, ebb, fastcgi, webrick]
+.TP
+\fB\-R\fR, \fB\-\-rackup\fR FILE
+Load an alternate Rack config file (default is config/rack.rb)
+.TP
+\fB\-i\fR, \fB\-\-irb\-console\fR
+This flag will start merb in irb console mode. All your models and other classes will be available for you in an irb session.
+.TP
+\fB\-S\fR, \fB\-\-sandbox\fR
+This flag will enable a sandboxed irb console. If your ORM supports transactions, all edits will be rolled back on exit.
+.TP
+\fB\-l\fR, \fB\-\-log\-level\fR LEVEL
+Log levels can be set to any of these options: debug < info < warn < error < fatal (default is info)
+.TP
+\fB\-L\fR, \fB\-\-log\fR LOGFILE
+A string representing the logfile to use. Defaults to [Merb.root]/log/merb.[main].log for the master process and [Merb.root]/log/merb[port number].logfor worker processes
+.TP
+\fB\-e\fR, \fB\-\-environment\fR STRING
+Environment to run Merb under [development, production, testing] (default is development)
+.HP
+\fB\-r\fR ['RUBY CODE'| FULL_SCRIPT_PATH]
+.TP
+\fB\-\-script\-runner\fR
+Command\-line option to run scripts and/or code in the merb app.
+.TP
+\fB\-K\fR, \fB\-\-graceful\fR PORT or all
+Gracefully kill one merb proceses by port number.  Use merb \fB\-K\fR all to gracefully kill all merbs.
+.TP
+\fB\-k\fR, \fB\-\-kill\fR PORT
+Force kill one merb worker by port number. This will cause the worker tobe respawned.
+.TP
+\fB\-\-fast\-deploy\fR
+Reload the code, but not yourinit.rb or gems
+.TP
+\fB\-X\fR, \fB\-\-mutex\fR on/off
+This flag is for turning the mutex lock on and off.
+.TP
+\fB\-D\fR, \fB\-\-debugger\fR
+Run merb using rDebug.
+.TP
+\fB\-V\fR, \fB\-\-verbose\fR
+Print extra information
+.TP
+\fB\-C\fR, \fB\-\-console\-trap\fR
+Enter an irb console on ^C
+.TP
+\-?, \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.
+.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).

Added: packages-wip/merb/trunk/debian/patches/load_dependencies_uses_require
===================================================================
--- packages-wip/merb/trunk/debian/patches/load_dependencies_uses_require	                        (rev 0)
+++ packages-wip/merb/trunk/debian/patches/load_dependencies_uses_require	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,26 @@
+# Merb's dependency method, which calls load_dependency needs to have
+# a fallback to simply use require if a gem is not found.
+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
++++ merb-1.0.12/merb-core/lib/merb-core/core_ext/kernel.rb	2009-07-29 16:20:51.000000000 -0600
+@@ -141,8 +141,17 @@
+       return unless dep.require_as
+       Gem.activate(dep)
+     rescue Gem::LoadError => e
+-      e.set_backtrace dep.original_caller
+-      Merb.fatal! "The gem #{name}, #{ver.inspect} was not found", e
++      begin
++        Merb.logger.debug "Falling back to a regular require"
++        if name.kind_of?(Gem::Dependency)
++          require name.name
++        else
++          require name
++        end 
++      rescue LoadError => le
++        e.set_backtrace dep.original_caller
++        Merb.fatal! "The gem #{name}, #{ver.inspect} was not found and we could not require it"
++      end 
+     end
+   
+     begin

Added: packages-wip/merb/trunk/debian/patches/series
===================================================================
--- packages-wip/merb/trunk/debian/patches/series	                        (rev 0)
+++ packages-wip/merb/trunk/debian/patches/series	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1 @@
+load_dependencies_uses_require

Added: packages-wip/merb/trunk/debian/rules
===================================================================
--- packages-wip/merb/trunk/debian/rules	                        (rev 0)
+++ packages-wip/merb/trunk/debian/rules	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,172 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+CDBS_NO_DOC_SYMLINKING = ""
+
+PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb
+DEB_RUBY_SETUP_CMD = debian-setup.rb
+DEB_RUBY_CONFIG_ARGS = --installdirs=std
+
+# command to install symlink to packaged setup.rb: used in both build and clean
+# targets
+DEB_RUBY_INSTALL_SETUP_CMD = \
+  if [ ! -L $(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f $(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+DEB_RUBY_REMOVE_SETUP_CMD = \
+  if [ -L $(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm $(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build $(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_CORE_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-core/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-core/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-core/$(DEB_RUBY_SETUP_CMD) merb-core/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-core/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_CORE_REMOVE_SETUP_CMD = \
+  if [ -L merb-core/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-core/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-core/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-core/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-core/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HAML_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-haml/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-haml/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-haml/$(DEB_RUBY_SETUP_CMD) merb-haml/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-haml/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HAML_REMOVE_SETUP_CMD = \
+  if [ -L merb-haml/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-haml/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-haml/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-haml/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-haml/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_SLICES_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-slices/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-slices/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-slices/$(DEB_RUBY_SETUP_CMD) merb-slices/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-slices/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_SLICES_REMOVE_SETUP_CMD = \
+  if [ -L merb-slices/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-slices/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-slices/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-slices/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-slices/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_ASSETS_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-assets/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-assets/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-assets/$(DEB_RUBY_SETUP_CMD) merb-assets/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-assets/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_ASSETS_REMOVE_SETUP_CMD = \
+  if [ -L merb-assets/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-assets/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-assets/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-assets/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-assets/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HELPERS_INSTALL_SETUP_CMD = \
+  if [ ! -L merb-helpers/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    if [ -f merb-helpers/$(DEB_RUBY_SETUP_CMD) ] ; then \
+      mv merb-helpers/$(DEB_RUBY_SETUP_CMD) merb-helpers/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+    fi ; \
+    ln -s $(PACKAGED_RUBY_SETUP_CMD) merb-helpers/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+MERB_HELPERS_REMOVE_SETUP_CMD = \
+  if [ -L merb-helpers/$(DEB_RUBY_SETUP_CMD) ] ; then \
+    rm merb-helpers/$(DEB_RUBY_SETUP_CMD) ; \
+  fi ; \
+  if [ -f merb-helpers/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+    mv merb-helpers/$(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build merb-helpers/$(DEB_RUBY_SETUP_CMD) ; \
+  fi
+
+install/merb-core::
+	dh_installchangelogs
+	dh_installdirs
+
+install/merb-slices::
+	dh_installchangelogs
+	dh_installdirs
+
+install/libmerb-core-ruby1.8::
+	$(MERB_CORE_INSTALL_SETUP_CMD)
+	(cd merb-core && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-core && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-core && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-core-ruby1.8)
+	mv $(CURDIR)/debian/libmerb-core-ruby1.8/usr/bin/merb $(CURDIR)/debian/merb-core/usr/bin/
+	rm $(CURDIR)/debian/libmerb-core-ruby1.8/usr/bin/merb-specs
+	rmdir $(CURDIR)/debian/libmerb-core-ruby1.8/usr/bin/
+
+install/libmerb-haml-ruby1.8::
+	$(MERB_HAML_INSTALL_SETUP_CMD)
+	(cd merb-haml && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-haml && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-haml && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-haml-ruby1.8)
+
+install/libmerb-slices-ruby1.8::
+	$(MERB_SLICES_INSTALL_SETUP_CMD)
+	(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/
+	rmdir $(CURDIR)/debian/libmerb-slices-ruby1.8/usr/bin/
+
+install/libmerb-assets-ruby1.8::
+	$(MERB_ASSETS_INSTALL_SETUP_CMD)
+	(cd merb-assets && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-assets && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-assets && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-assets-ruby1.8)
+
+install/libmerb-helpers-ruby1.8::
+	$(MERB_HELPERS_INSTALL_SETUP_CMD)
+	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS))
+	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup)
+	(cd merb-helpers && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=../debian/libmerb-helpers-ruby1.8)
+
+install/libmerb-ruby-doc::
+	rdoc --all --inline-source --fileboxes --line-numbers --fmt=html -o debian/$(cdbs_curpkg)/usr/share/doc/libmerb-ruby-doc/rdoc merb-core/lib merb-haml/lib merb-helpers/lib merb-assets/lib merb-slices/lib
+
+clean::
+	$(DEB_RUBY_INSTALL_SETUP_CMD)
+	$(MERB_CORE_INSTALL_SETUP_CMD)
+	$(MERB_HAML_INSTALL_SETUP_CMD)
+	$(MERB_SLICES_INSTALL_SETUP_CMD)
+	$(MERB_ASSETS_INSTALL_SETUP_CMD)
+	$(MERB_HELPERS_INSTALL_SETUP_CMD)
+	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) distclean
+	$(DEB_RUBY_REMOVE_SETUP_CMD)
+	$(MERB_CORE_REMOVE_SETUP_CMD)
+	$(MERB_HAML_REMOVE_SETUP_CMD)
+	$(MERB_SLICES_REMOVE_SETUP_CMD)
+	$(MERB_ASSETS_REMOVE_SETUP_CMD)
+	$(MERB_HELPERS_REMOVE_SETUP_CMD)
+	rm -f $(DEB_SRCDIR)/.config
+	rm -f $(DEB_SRCDIR)/InstalledFiles


Property changes on: packages-wip/merb/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: packages-wip/merb/trunk/debian/slice.1
===================================================================
--- packages-wip/merb/trunk/debian/slice.1	                        (rev 0)
+++ packages-wip/merb/trunk/debian/slice.1	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,16 @@
+.TH SLICE "1" "July 2009"
+.SH NAME
+slice \- Start a Merb slice.
+.SH SYNOPSIS
+.B slice
+.SH DESCRIPTION
+The slice command starts a Merb application as a slice.
+.SH SEE ALSO
+.br
+Full documentation of merb is available after the Merb packages are installed.
+.SH AUTHOR
+Merb was written by Yehuda Katz <ykatz at engineyard.com>.
+.PP
+This manual page was written by Joshua Timberman <joshua at opscode.com>,
+for the Debian project (and may be used by others).
+

Added: packages-wip/merb/trunk/debian/watch
===================================================================
--- packages-wip/merb/trunk/debian/watch	                        (rev 0)
+++ packages-wip/merb/trunk/debian/watch	2009-07-30 22:59:08 UTC (rev 3866)
@@ -0,0 +1,2 @@
+version=3
+http://githubredir.debian.net/github/wycats/merb /(.*).tar.gz




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