[DRE-commits] [SCM] ruby-log4r.git branch, master, updated. debian/1.1.10-1

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 0ca74050c58c893c8c380218c8294183224db7c4
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Tue Mar 27 10:03:24 2012 -0600

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index ccc628a..0d832b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-log4r (1.1.10-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org>  Tue, 27 Mar 2012 09:52:15 -0600
+
 ruby-log4r (1.1.9-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index de5839c..8488cd9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.4~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-log4r.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-log4r.git;a=summary
 Homepage: http://log4r.rubyforge.org
@@ -29,6 +29,7 @@ Description: Logging library for Ruby
 # Transitional packages
 Package: liblog4r-ruby
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-log4r
 Description: Transitional package for ruby-log4r
@@ -37,6 +38,7 @@ Description: Transitional package for ruby-log4r
 
 Package: liblog4r-ruby1.8
 Section: oldlibs
+Priority: extra
 Architecture: all
 Depends: ${misc:Depends}, ruby-log4r
 Description: Transitional package for ruby-log4r
diff --git a/debian/patches/dont-require-rubygems b/debian/patches/dont-require-rubygems
index def2bc4..25a32f6 100644
--- a/debian/patches/dont-require-rubygems
+++ b/debian/patches/dont-require-rubygems
@@ -7,20 +7,20 @@ Author: Gunnar Wolf <gwolf at debian.org>
 
 Index: ruby-log4r/lib/log4r/formatter/log4jxmlformatter.rb
 ===================================================================
---- ruby-log4r.orig/lib/log4r/formatter/log4jxmlformatter.rb	2011-06-09 11:00:59.000000000 -0500
-+++ ruby-log4r/lib/log4r/formatter/log4jxmlformatter.rb	2011-06-09 11:01:23.000000000 -0500
+--- ruby-log4r.orig/lib/log4r/formatter/log4jxmlformatter.rb	2012-03-27 09:58:37.000000000 -0600
++++ ruby-log4r/lib/log4r/formatter/log4jxmlformatter.rb	2012-03-27 10:00:31.000000000 -0600
 @@ -6,7 +6,6 @@
  
  require "log4r/formatter/formatter"
  
 -require "rubygems"
- require "builder"
- 
- module Log4r
+ begin
+   require "builder"
+ rescue LoadError
 Index: ruby-log4r/lib/log4r/outputter/emailoutputter.rb
 ===================================================================
---- ruby-log4r.orig/lib/log4r/outputter/emailoutputter.rb	2011-06-09 11:00:59.000000000 -0500
-+++ ruby-log4r/lib/log4r/outputter/emailoutputter.rb	2011-06-09 11:01:08.000000000 -0500
+--- ruby-log4r.orig/lib/log4r/outputter/emailoutputter.rb	2012-03-27 09:58:37.000000000 -0600
++++ ruby-log4r/lib/log4r/outputter/emailoutputter.rb	2012-03-27 10:00:31.000000000 -0600
 @@ -111,7 +111,6 @@
  	  # >1.8.7 has smtp_tls built in, 1.8.6 requires smtp_tls
  	  if RUBY_VERSION < "1.8.7" then
@@ -29,3 +29,15 @@ Index: ruby-log4r/lib/log4r/outputter/emailoutputter.rb
  	      require 'smtp_tls'
  	      smtp.enable_starttls if smtp.respond_to?(:enable_starttls)
  	    rescue LoadError => e
+Index: ruby-log4r/lib/log4r/outputter/scribeoutputter.rb
+===================================================================
+--- ruby-log4r.orig/lib/log4r/outputter/scribeoutputter.rb	2012-03-27 09:51:40.000000000 -0600
++++ ruby-log4r/lib/log4r/outputter/scribeoutputter.rb	2012-03-27 10:01:18.000000000 -0600
+@@ -2,7 +2,6 @@
+ # Version:: $Id$
+ 
+ require "log4r/outputter/outputter"
+-require "rubygems"
+ require "scribe"
+ 
+ module Log4r
diff --git a/debian/ruby-log4r.docs b/debian/ruby-log4r.docs
index f038808..da8eb4f 100644
--- a/debian/ruby-log4r.docs
+++ b/debian/ruby-log4r.docs
@@ -1,2 +1,2 @@
 doc
-README
+

-- 
ruby-log4r.git