[DRE-maint] Ubuntu activeldap 1.2.1-1ubuntu1

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Fri, 25 Jun 2010 11:22:30 +0200
Source: activeldap
Binary: libactiveldap-ruby libactiveldap-ruby-doc libactiveldap-ruby1.8
Architecture: source
Version: 1.2.1-1ubuntu1
Distribution: maverick
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Michael Bienia <geser at ubuntu.com>
Description: 
 libactiveldap-ruby - an object-oriented interface to LDAP for Ruby
 libactiveldap-ruby-doc - an object-oriented interface to LDAP for Ruby
 libactiveldap-ruby1.8 - an object-oriented interface to LDAP for Ruby
Changes: 
 activeldap (1.2.1-1ubuntu1) maverick; urgency=low
 .
   * debian/control: Make the build dependency on rdoc unversioned, as rdoc is
     now only a Provides from ruby.
Checksums-Sha1: 
 ace4b96ff40d1f147bbd4096194dbaaa04d72605 1929 activeldap_1.2.1-1ubuntu1.dsc
 370b911823a21d8c578b11b9e57ba61f6071b07c 4533 activeldap_1.2.1-1ubuntu1.debian.tar.gz
Checksums-Sha256: 
 7b443b3344802b83ec656054594e04c038435bd68c5847d8f97b8ee343416774 1929 activeldap_1.2.1-1ubuntu1.dsc
 2455552e4a8a6b1d0e8a5033b9c08c1b378cbdfa6ed270cdf4e9f73919ee8808 4533 activeldap_1.2.1-1ubuntu1.debian.tar.gz
Files: 
 e867641f2aa5be4253a3bc479240a5cf 1929 ruby optional activeldap_1.2.1-1ubuntu1.dsc
 da3820aac09f79a19ca4d9514ec985fe 4533 ruby optional activeldap_1.2.1-1ubuntu1.debian.tar.gz
Original-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
-------------- next part --------------
diff -pruN 1.2.1-1/debian/changelog 1.2.1-1ubuntu1/debian/changelog
--- 1.2.1-1/debian/changelog	2010-06-23 01:42:54.000000000 +0100
+++ 1.2.1-1ubuntu1/debian/changelog	2010-06-25 10:24:50.000000000 +0100
@@ -1,3 +1,10 @@
+activeldap (1.2.1-1ubuntu1) maverick; urgency=low
+
+  * debian/control: Make the build dependency on rdoc unversioned, as rdoc is
+    now only a Provides from ruby.
+
+ -- Michael Bienia <geser at ubuntu.com>  Fri, 25 Jun 2010 11:22:30 +0200
+
 activeldap (1.2.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -pruN 1.2.1-1/debian/control 1.2.1-1ubuntu1/debian/control
--- 1.2.1-1/debian/control	2010-06-23 01:38:18.000000000 +0100
+++ 1.2.1-1ubuntu1/debian/control	2010-06-25 10:26:10.000000000 +0100
@@ -1,11 +1,12 @@
 Source: activeldap
 Section: ruby
 Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
 Build-Depends: cdbs (>= 0.4.53),
  debhelper (>= 7.0.1), ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
-Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
+Build-Depends-Indep: rdoc, graphviz
 Standards-Version: 3.8.4
 Homepage: http://rubyforge.org/projects/ruby-activeldap
 
diff -pruN 1.2.1-1/debian/control.in 1.2.1-1ubuntu1/debian/control.in
--- 1.2.1-1/debian/control.in	2010-06-23 01:36:46.000000000 +0100
+++ 1.2.1-1ubuntu1/debian/control.in	2010-06-25 10:27:31.000000000 +0100
@@ -1,10 +1,11 @@
 Source: activeldap
 Section: ruby
 Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
 Build-Depends: @cdbs@, ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
-Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
+Build-Depends-Indep: rdoc, graphviz
 Standards-Version: 3.8.4
 Homepage: http://rubyforge.org/projects/ruby-activeldap