[DRE-commits] [SCM] ruby-ole.git branch, master, updated. upstream/1.2.11.1-5-g3db0b7e
Antonio Terceiro
terceiro at softwarelivre.org
Fri Jul 29 07:49:32 UTC 2011
The following commit has been merged in the master branch:
commit 3db0b7e2a270bcd406fd42327feae022b1d4ad93
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date: Fri Jul 29 00:00:35 2011 -0700
Replaces Conflicts: with Breaks:
diff --git a/debian/changelog b/debian/changelog
index 033ae98..552b1c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
ruby-ole (1.2.11.1-5) unstable; urgency=low
+ [Antonio Terceiro]
+ * Team upload (not a NMU).
+ * Replace Conflicts: with Breaks: in debian/control
+
+ [Youhei SASAKI]
* Fix FTBFS: (Closes: #634449)
- debian/patches/move_propids_location: fix filepath
- debian/rules: running "dh_install data/*" before dh_ruby --install
diff --git a/debian/control b/debian/control
index b22d53d..0d2597f 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: libole-ruby (<< 1.2.11.1-4~), libole-ruby1.8 (<< 1.2.11.1-4~), libole-ruby1.9.1 (<< 1.2.11.1-4~), libole-ruby-doc (<< 1.2.11.1-4~)
-Conflicts: libole-ruby (<< 1.2.11.1-4~), libole-ruby1.8 (<< 1.2.11.1-4~), libole-ruby1.9.1 (<< 1.2.11.1-4~), libole-ruby-doc (<< 1.2.11.1-4~)
+Breaks: libole-ruby (<< 1.2.11.1-4~), libole-ruby1.8 (<< 1.2.11.1-4~), libole-ruby1.9.1 (<< 1.2.11.1-4~), libole-ruby-doc (<< 1.2.11.1-4~)
Provides: libole-ruby, libole-ruby1.8, libole-ruby1.9.1, libole-ruby-doc
Description: Ruby library for read/write access for OLE compound documents
Ruby-ole is a library for read/write access to OLE2 structured storage
--
ruby-ole.git
More information about the Pkg-ruby-extras-commits
mailing list