[DRE-commits] [SCM] ruby-will-paginate.git branch, master, updated. debian/3.0.2-1-4-g60661da

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 60661daa35bd98c57982a1d5519f288ca3f057e2
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 30 14:22:26 2012 -0300

    s/Conflicts/Breaks/

diff --git a/debian/changelog b/debian/changelog
index a6350a0..b2e56a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-ruby-will-paginate (3.0.3-1) UNRELEASED; urgency=low
+ruby-will-paginate (3.0.3-1) unstable; urgency=low
 
   * Team upload.
   * New upstream release.
   * Bump Standards-Version to 3.9.3; no changes needed.
   * Bump build dependency on gem2deb to >= 0.3.0~
+  * Use Breaks: instead of Conflicts: for transitional packages.
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 30 Jun 2012 14:14:27 -0300
 
diff --git a/debian/control b/debian/control
index 2003027..a7d3ade 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 | ruby-interpreter
 Replaces: libwill-paginate-ruby (<< 2.3.15-1~), libwill-paginate-ruby-doc (<< 2.3.15-1~), libwill-paginate-ruby1.8 (<< 2.3.15-1~)
-Conflicts: libwill-paginate-ruby (<< 2.3.15-1~), libwill-paginate-ruby-doc (<< 2.3.15-1~), libwill-paginate-ruby1.8 (<< 2.3.15-1~)
+Breaks: libwill-paginate-ruby (<< 2.3.15-1~), libwill-paginate-ruby-doc (<< 2.3.15-1~), libwill-paginate-ruby1.8 (<< 2.3.15-1~)
 Provides: libwill-paginate-ruby, libwill-paginate-ruby-doc, libwill-paginate-ruby1.8
 Description: Pagination for Rails
  The will_paginate library provides a simple, yet powerful and

-- 
ruby-will-paginate.git