[DRE-commits] [SCM] ruby-rmagick.git branch, master, updated. 8f9061a6d7efdf721cb3a53f54a46536822d3825

[Vincent Fourmond]

The following commit has been merged in the master branch:
commit e04f2efd12a40e2a6423c913b115fb866c379fd7
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Tue Jun 7 01:13:04 2011 +0200

    Use rubysetuprb as a build system

diff --git a/debian/changelog b/debian/changelog
index b0a1bf9..2cdef55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-ruby-rmagick (2.13.1-3) unstable; urgency=low
+ruby-rmagick (2.13.1-3) experimental; urgency=low
 
+  [ Gunnar Wolf ]
   * Updated packaging infrastructure to gem2deb
   * Now also finally supports Ruby 1.9.1!
 
- -- Gunnar Wolf <gwolf at debian.org>  Tue, 17 May 2011 11:55:20 -0500
+  [ Vincent Fourmond ]
+  * Upload to experimental to avoid disturbing ongoing imagemagick
+    transition
+  * Use the new rubysetuprb build system
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 07 Jun 2011 01:05:06 +0200
 
 librmagick-ruby (2.13.1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 3fe9391..1a0a1d1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at softwarelivre.org>, Gunnar Wolf <gwolf at debian.org>, Vincent Fourmond <fourmond at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.2), libmagickcore-dev (>= 7:6.6.0.4-2~), libwmf-bin, ghostscript, gsfonts, libmagickwand-dev
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.4~), 
+               libmagickcore-dev (>= 7:6.6.0.4-2~), libwmf-bin, 
+               ghostscript, gsfonts, libmagickwand-dev
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rmagick.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rmagick.git;a=summary
@@ -15,23 +17,36 @@ Package: ruby-rmagick
 Architecture: any
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
-Replaces: librmagick-ruby (<< 2.13.1-3~), librmagick-ruby1.8 (<< 2.13.1-3~), librmagick-ruby-doc (<< 2.13.1-3~)
-Conflicts: librmagick-ruby (<< 2.13.1-3~), librmagick-ruby1.8 (<< 2.13.1-3~), librmagick-ruby-doc (<< 2.13.1-3~)
+Replaces: librmagick-ruby (<< 2.13.1-3~), librmagick-ruby1.8 (<< 2.13.1-3~)
+Breaks: librmagick-ruby (<< 2.13.1-3~), librmagick-ruby1.8 (<< 2.13.1-3~)
 Provides: librmagick-ruby, librmagick-ruby1.8, librmagick-ruby-doc
 Description: ImageMagick API for Ruby (documentation)
  RMagick is an interface between the Ruby programming language and the
  ImageMagick image processing library.
 
+
+Package: ruby-rmagick-doc
+Section: doc
+Architecture: all
+Replaces: librmagick-ruby-doc (<< 2.13.1-3~)
+Breaks: librmagick-ruby-doc (<< 2.13.1-3~)
+Description: ImageMagick API for Ruby (documentation)
+ RMagick is an interface between the Ruby programming language and the
+ ImageMagick image processing library.
+ .
+ This package contains the documentation and some example scripts.
+
+
 # Transitional packages
-Package: libimagemagick-ruby
+Package: libimagemagick-ruby-doc
 Section: oldlibs
 Architecture: all
-Depends: ${misc:Depends}, ruby-imagemagick
+Depends: ${misc:Depends}, ruby-imagemagick-doc
 Description: Transitional package for ruby-imagemagick
  This is a transitional package to ease upgrades to the ruby-imagemagick
  package. It can safely be removed.
 
-Package: libimagemagick-ruby1.8
+Package: libimagemagick-ruby
 Section: oldlibs
 Architecture: all
 Depends: ${misc:Depends}, ruby-imagemagick
@@ -39,10 +54,11 @@ Description: Transitional package for ruby-imagemagick
  This is a transitional package to ease upgrades to the ruby-imagemagick
  package. It can safely be removed.
 
-Package: libimagemagick-ruby-doc
+Package: libimagemagick-ruby1.8
 Section: oldlibs
 Architecture: all
 Depends: ${misc:Depends}, ruby-imagemagick
 Description: Transitional package for ruby-imagemagick
  This is a transitional package to ease upgrades to the ruby-imagemagick
  package. It can safely be removed.
+
diff --git a/debian/rules b/debian/rules
index d7b2624..65e341a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
-	dh $@ --buildsystem=ruby --with ruby
+	dh $@ --buildsystem=rubysetuprb --with ruby
 
 override_dh_clean:
 	dh_clean

-- 
ruby-rmagick.git