[SCM] qtruby packaging branch, master, updated. 24c493e80d69a10fff0c5d88d3e8ba073a00fe00

David Palacio dpalacio-guest at alioth.debian.org
Mon Jul 11 23:18:24 UTC 2011


The following commit has been merged in the master branch:
commit 24c493e80d69a10fff0c5d88d3e8ba073a00fe00
Author: David Palacio <dpalacio at orbitalibre.org>
Date:   Mon Jul 11 18:19:06 2011 -0500

    Add inter-module dependencies.
    
    Breaks conflict with Provides. Remove Breaks from qt4-* modules.
---
 debian/changelog |    1 +
 debian/control   |   19 +++++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2aad68f..4df79eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtruby (4:4.6.80-1) UNRELEASED; urgency=low
   [ David Palacio ]
   * Source package `kdebindings` split.
   * Follow package naming guidelines for Ruby in Wheeze.
+  * Add inter-module dependencies.
 
   [ Pino Toscano ]
   * Add kdebindings-dbg to ruby-qt4-dbg Breaks/Replaces.
diff --git a/debian/control b/debian/control
index ea23e29..f1d1238 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Description: Qt 4 bindings for the Ruby language
 
 Package: ruby-qt4-declarative
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4, ${shlibs:Depends}, ${misc:Depends}
 Description: QtDeclarative bindings for the Ruby language
  This package provides the Ruby bindings for the QtDeclarative Qt 4 library.
  .
@@ -74,9 +74,8 @@ Description: Qt 4 bindings for the Ruby language -- debug symbols
 
 Package: ruby-qt4-phonon
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
-Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Description: Phonon bindings for the Ruby language
  This package provides the Ruby bindings for the Phonon library.
  .
@@ -84,9 +83,8 @@ Description: Phonon bindings for the Ruby language
 
 Package: ruby-qt4-script
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
-Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Description: QtScript bindings for the Ruby language
  This package provides the Ruby bindings for the QtScript Qt 4 library.
  .
@@ -94,9 +92,8 @@ Description: QtScript bindings for the Ruby language
 
 Package: ruby-qt4-test
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
-Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Description: QtTest bindings for the Ruby language
  This package provides the Ruby bindings for the QtTest Qt 4 library.
  .
@@ -104,9 +101,8 @@ Description: QtTest bindings for the Ruby language
 
 Package: ruby-qt4-uitools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
-Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Description: QtUiTools bindings for the Ruby language
  This package provides the Ruby bindings for the QtUiTools Qt 4 library.
  .
@@ -114,9 +110,8 @@ Description: QtUiTools bindings for the Ruby language
 
 Package: ruby-qt4-webkit
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
-Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Description: QtWebKit bindings for the Ruby language
  This package provides the Ruby bindings for the QtWebKit Qt 4 library.
  .
@@ -124,7 +119,7 @@ Description: QtWebKit bindings for the Ruby language
 
 Package: ruby-qwt5
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4, ${shlibs:Depends}, ${misc:Depends}
 Description: QWt5 bindings for the Ruby language
  This package provides the Ruby bindings for the QWt5 library.
  .

-- 
qtruby packaging



More information about the pkg-kde-commits mailing list