[DRE-commits] [SCM] rdtool.git branch, master, updated. debian/0.6.34-1-5-g780f829

[Taku YASUI]

The following commit has been merged in the master branch:
commit a2e04696a5defadbd56cc815e67d7b25a02e0a30
Author: Taku YASUI <tach at debian.org>
Date:   Sat May 12 22:52:03 2012 +0900

    Fix file conflict of ruby-rd-html-ext
    
    Add librd-html-ext-ruby1.8 dummy package for replacing it.
    Change dummy package description.

diff --git a/debian/changelog b/debian/changelog
index 14d28f8..9d89298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rdtool (0.6.34-2) UNRELEASED; urgency=low
+
+  * Add librd-html-ext-ruby1.8 dummy package for replacing it.
+    - closes: 672531, #672444
+    - ruby-rd includes all of librd-html-ext-ruby1.8 files.
+  * Change dummy package description.
+
+ -- Taku YASUI <tach at debian.org>  Sat, 12 May 2012 22:35:50 +0900
+
 rdtool (0.6.34-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index fd1b3e4..36789c7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,9 +29,9 @@ Section: ruby
 Architecture: all
 Depends: ${misc:Depends}, libruby1.8, libruby1.9.1
 Conflicts: rdtool (<< 0.6.14-2)
-Provides: librd-ruby1.8
-Replaces: librd-ruby1.8 (<< 0.6.31-1~)
-Breaks: librd-ruby1.8 (<< 0.6.31-1~)
+Provides: librd-ruby1.8, librd-html-ext-ruby1.8, librd-html-ext-ruby
+Replaces: librd-ruby1.8 (<< 0.6.31-1~), librd-html-ext-ruby1.8 (<< 0.1.4-2)
+Breaks: librd-ruby1.8 (<< 0.6.31-1~), librd-html-ext-ruby1.8 (<< 0.1.4-2)
 Description: RDTool library for Ruby
  RD is multipurpose documentation format created for documentating Ruby and
  output of Ruby world.
@@ -61,6 +61,15 @@ Priority: extra
 Section: oldlibs
 Architecture: all
 Depends: ${misc:Depends}, ruby-rd
-Description: RDTool library for Ruby (transitional package)
- This is a dummy transition package that can be safely removed once no
- package depend on it.
+Description: Transitional package for ruby-rd
+ This is a transitional package to ease upgrades to the ruby-rd
+ package. It can safely be removed.
+
+Package: librd-html-ext-ruby1.8
+Section: oldlibs
+Architecture: all
+Priority: extra
+Depends: ${misc:Depends}, ruby-rd
+Description: Transitional package for ruby-rd
+ This is a transitional package to ease upgrades to the ruby-rd
+ package. It can safely be removed.

-- 
rdtool.git