[SCM] stapler packaging branch, master, updated. upstream/1.167-8-g3f8fda7

[James Page]

The following commit has been merged in the master branch:
commit ec816e09579eaf9aa79bd597828ca51520129d05
Author: James Page <james.page at canonical.com>
Date:   Thu Sep 29 10:15:04 2011 +0100

    Refreshed patches

diff --git a/debian/patches/disable-jruby-bindings.patch b/debian/patches/disable-jruby-bindings.patch
index 43e53b3..da31e1f 100644
--- a/debian/patches/disable-jruby-bindings.patch
+++ b/debian/patches/disable-jruby-bindings.patch
@@ -2,15 +2,15 @@ Description: Disable jruby binding until upgraded in Debian
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: stapler-old/pom.xml
+Index: stapler-debian/pom.xml
 ===================================================================
---- stapler-old.orig/pom.xml	2011-06-24 15:50:27.256826272 +0100
-+++ stapler-old/pom.xml	2011-06-24 15:50:33.046826270 +0100
+--- stapler-debian.orig/pom.xml	2011-09-29 10:14:15.004583100 +0100
++++ stapler-debian/pom.xml	2011-09-29 10:14:27.724710651 +0100
 @@ -13,7 +13,6 @@
      <module>core</module>
      <module>jsp</module>
      <module>jelly</module>
 -    <module>jruby</module>
      <module>groovy</module>
+     <module>jrebel</module>
    </modules>
- 

-- 
stapler packaging