[DRE-commits] r4664 - in trunk/activeldap/debian: . patches

[Marc Dequènes]

Author: duck
Date: 2010-02-14 17:01:30 +0000 (Sun, 14 Feb 2010)
New Revision: 4664

Removed:
   trunk/activeldap/debian/libactiveldap-ruby1.8.install
Modified:
   trunk/activeldap/debian/changelog
   trunk/activeldap/debian/control
   trunk/activeldap/debian/control.in
   trunk/activeldap/debian/patches/bad_shebang
   trunk/activeldap/debian/patches/rails_load_path
Log:
synced with real latest version (1.0.9-1)

Modified: trunk/activeldap/debian/changelog
===================================================================
--- trunk/activeldap/debian/changelog	2010-02-14 16:59:18 UTC (rev 4663)
+++ trunk/activeldap/debian/changelog	2010-02-14 17:01:30 UTC (rev 4664)
@@ -1,3 +1,13 @@
+activeldap (1.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refreshed patches.
+  * Rails integration has changed; do not install 'rails/plugin/*' which
+    is no more.
+  * Bumped Standards-Version to 3.8.2.0 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 24 Jun 2009 23:12:45 +0200
+
 activeldap (1.0.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/activeldap/debian/control
===================================================================
--- trunk/activeldap/debian/control	2010-02-14 16:59:18 UTC (rev 4663)
+++ trunk/activeldap/debian/control	2010-02-14 17:01:30 UTC (rev 4664)
@@ -5,9 +5,7 @@
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
 Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/activeldap/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/activeldap/
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2.0
 Homepage: http://rubyforge.org/projects/ruby-activeldap
 
 Package: libactiveldap-ruby

Modified: trunk/activeldap/debian/control.in
===================================================================
--- trunk/activeldap/debian/control.in	2010-02-14 16:59:18 UTC (rev 4663)
+++ trunk/activeldap/debian/control.in	2010-02-14 17:01:30 UTC (rev 4664)
@@ -5,7 +5,7 @@
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: @cdbs@, ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
 Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2.0
 Homepage: http://rubyforge.org/projects/ruby-activeldap
 
 Package: libactiveldap-ruby

Deleted: trunk/activeldap/debian/libactiveldap-ruby1.8.install
===================================================================
--- trunk/activeldap/debian/libactiveldap-ruby1.8.install	2010-02-14 16:59:18 UTC (rev 4663)
+++ trunk/activeldap/debian/libactiveldap-ruby1.8.install	2010-02-14 17:01:30 UTC (rev 4664)
@@ -1 +0,0 @@
-rails/plugin/* /usr/share/rails/

Modified: trunk/activeldap/debian/patches/bad_shebang
===================================================================
--- trunk/activeldap/debian/patches/bad_shebang	2010-02-14 16:59:18 UTC (rev 4663)
+++ trunk/activeldap/debian/patches/bad_shebang	2010-02-14 17:01:30 UTC (rev 4664)
@@ -1,10 +1,10 @@
-Index: activeldap-0.8.2/lib/active_ldap.rb
+Index: activeldap-1.0.9/lib/active_ldap.rb
 ===================================================================
---- activeldap-0.8.2.orig/lib/active_ldap.rb	2007-06-18 19:29:06.272701831 +0200
-+++ activeldap-0.8.2/lib/active_ldap.rb	2007-06-18 19:29:39.273351547 +0200
+--- activeldap-1.0.9.orig/lib/active_ldap.rb	2009-06-04 03:45:01.000000000 +0200
++++ activeldap-1.0.9/lib/active_ldap.rb	2009-06-24 22:46:52.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/ruby
 +#
- # = Ruby/ActiveLdap
+ # = ActiveLdap
  #
- # "Ruby/ActiveLdap" Copyright (C) 2004,2005 Will Drewry mailto:will at alum.bu.edu
+ # "ActiveLdap" Copyright (C) 2004,2005 Will Drewry mailto:will at alum.bu.edu

Modified: trunk/activeldap/debian/patches/rails_load_path
===================================================================
--- trunk/activeldap/debian/patches/rails_load_path	2010-02-14 16:59:18 UTC (rev 4663)
+++ trunk/activeldap/debian/patches/rails_load_path	2010-02-14 17:01:30 UTC (rev 4664)
@@ -1,8 +1,8 @@
-Index: activeldap-1.0.2/lib/active_ldap.rb
+Index: activeldap-1.0.9/lib/active_ldap.rb
 ===================================================================
---- activeldap-1.0.2.orig/lib/active_ldap.rb	2009-03-20 14:27:04.000000000 +0100
-+++ activeldap-1.0.2/lib/active_ldap.rb	2009-03-20 14:27:47.000000000 +0100
-@@ -905,6 +905,14 @@
+--- activeldap-1.0.9.orig/lib/active_ldap.rb	2009-06-24 22:46:52.000000000 +0200
++++ activeldap-1.0.9/lib/active_ldap.rb	2009-06-24 22:47:03.000000000 +0200
+@@ -872,6 +872,14 @@
  # package, and I'd like to see it prove helpful to more people than just myself.
  #
  
@@ -15,5 +15,5 @@
 +end
 +
  require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
+   gem_name ||= library_name
    begin
-     if !gem_args.empty? and Object.const_defined?(:Gem)