[SCM] qtruby packaging branch, master, updated. debian/4.11.3-2-2-g67e60e3
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Feb 3 12:45:30 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/qtruby.git;a=commitdiff;h=67e60e3
The following commit has been merged in the master branch:
commit 67e60e3cac89653d01a2c4d1ff0a880d71e9b9dd
Author: Maximiliano Curia <maxy at debian.org>
Date: Mon Feb 3 12:51:57 2014 +0100
wrap-and-sort
---
debian/control | 58 +++++++++++++++++++------------------
debian/copyright | 6 ++--
debian/ruby-phonon.install | 2 +-
debian/ruby-qscintilla2.install | 2 +-
debian/ruby-qt4-declarative.install | 2 +-
debian/ruby-qt4-script.install | 2 +-
debian/ruby-qt4-test.install | 2 +-
debian/ruby-qt4-uitools.install | 2 +-
debian/ruby-qt4-webkit.install | 2 +-
debian/ruby-qt4.install | 4 +--
debian/ruby-qwt5.install | 2 +-
11 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/debian/control b/debian/control
index 427ab97..db8062f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,17 @@ Uploaders: Torsten Marek <shlomme at debian.org>,
Maximiliano Curia <maxy at debian.org>,
Cédric Boutillier <boutil at debian.org>
Build-Conflicts: libruby1.8
-Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.6.8), cmake,
- smoke-dev-tools (>= 4:4.11), libsmokeqt4-dev (>= 4:4.11),
- ruby1.9.1, ruby1.9.1-dev,
- libqt4-dev, libqtwebkit-dev, libphonon-dev, libqscintilla2-dev
+Build-Depends: cmake,
+ debhelper (>= 9),
+ libphonon-dev,
+ libqscintilla2-dev,
+ libqt4-dev,
+ libqtwebkit-dev,
+ libsmokeqt4-dev (>= 4:4.11),
+ pkg-kde-tools (>= 0.6.8),
+ ruby1.9.1,
+ ruby1.9.1-dev,
+ smoke-dev-tools (>= 4:4.11)
Standards-Version: 3.9.5
Homepage: http://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/qtruby.git
@@ -21,7 +28,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/qtruby.git;a=sum
Package: libqtruby4shared2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: internal library for Qt 4 Ruby bindings
This package provides an internal library of Qt Ruby.
.
@@ -30,7 +37,7 @@ Description: internal library for Qt 4 Ruby bindings
Package: libqtruby4shared-dev
Section: libdevel
Architecture: any
-Depends: ${so:Depends}, ${misc:Depends}, smoke-dev-tools (>= 4:4.10)
+Depends: smoke-dev-tools (>= 4:4.10), ${misc:Depends}, ${so:Depends}
Description: internal library for Qt 4 Ruby bindings -- development
This package provides the development files of the internal Qt Ruby library.
.
@@ -38,7 +45,7 @@ Description: internal library for Qt 4 Ruby bindings -- development
Package: ruby-qscintilla2
Architecture: any
-Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: QScintilla2 bindings for the Ruby language
This package provides the Ruby bindings for the QScintilla2 library.
.
@@ -46,7 +53,7 @@ Description: QScintilla2 bindings for the Ruby language
Package: ruby-qt4
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: ruby1.9.1
Provides: libqt4-ruby, libqt4-ruby1.8
Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
@@ -63,7 +70,7 @@ Description: Qt 4 bindings for the Ruby language
Package: ruby-qt4-declarative
Architecture: any
-Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: QtDeclarative bindings for the Ruby language
This package provides the Ruby bindings for the QtDeclarative Qt 4 library.
.
@@ -76,7 +83,7 @@ Architecture: any
Breaks: kdebindings-dbg
Replaces: kdebindings-dbg
Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}
-Recommends: libsmokeqt4-dbg, libruby1.9.1-dbg
+Recommends: libruby1.9.1-dbg, libsmokeqt4-dbg
Description: Qt 4 bindings for the Ruby language -- debug symbols
This package provides the debug symbols of the Qt 4 Ruby bindings.
.
@@ -84,7 +91,7 @@ Description: Qt 4 bindings for the Ruby language -- debug symbols
Package: ruby-phonon
Architecture: any
-Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Description: Phonon bindings for the Ruby language
@@ -94,7 +101,7 @@ Description: Phonon bindings for the Ruby language
Package: ruby-qt4-script
Architecture: any
-Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Description: QtScript bindings for the Ruby language
@@ -104,7 +111,7 @@ Description: QtScript bindings for the Ruby language
Package: ruby-qt4-test
Architecture: any
-Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Description: QtTest bindings for the Ruby language
@@ -114,7 +121,7 @@ Description: QtTest bindings for the Ruby language
Package: ruby-qt4-uitools
Architecture: any
-Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Description: QtUiTools bindings for the Ruby language
@@ -124,7 +131,7 @@ Description: QtUiTools bindings for the Ruby language
Package: ruby-qt4-webkit
Architecture: any
-Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
Description: QtWebKit bindings for the Ruby language
@@ -132,20 +139,11 @@ Description: QtWebKit bindings for the Ruby language
.
This is part of the Qt Ruby module.
-#Package: ruby-qwt5
-#Architecture: any
-#Depends: ruby-qt4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-#Description: QWt5 bindings for the Ruby language
-# This package provides the Ruby bindings for the QWt5 library.
-# .
-# This is part of the Qt Ruby module.
-
-#Transitional packages: http://wiki.debian.org/Teams/Ruby/RubyInWheezy
Package: libqt4-ruby
Architecture: all
Section: oldlibs
Priority: extra
-Depends: ${misc:Depends}, ruby-qt4
+Depends: ruby-qt4, ${misc:Depends}
Description: transitional package for ruby-qt4
This is a transitional package to ease upgrades to the ruby-qt4 package.
It can safely be removed.
@@ -154,9 +152,13 @@ Package: libqt4-ruby1.8
Architecture: all
Section: oldlibs
Priority: extra
-Depends: ${misc:Depends}, ruby-qt4, ruby-phonon, ruby-qt4-script,
- ruby-qt4-test, ruby-qt4-uitools, ruby-qt4-webkit
+Depends: ruby-phonon,
+ ruby-qt4,
+ ruby-qt4-script,
+ ruby-qt4-test,
+ ruby-qt4-uitools,
+ ruby-qt4-webkit,
+ ${misc:Depends}
Description: transitional package for ruby-qt4
This is a transitional package to ease upgrades to the ruby-qt4 package.
It can safely be removed.
-
diff --git a/debian/copyright b/debian/copyright
index adbb5f8..e1e307a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ License: BSD-3-clause
2. Redistributions in binary form must reproduce the copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
+ 3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@@ -103,9 +103,9 @@ License:
files under the ./missing directory. See each file for the copying
condition.
.
- 5. The scripts and library files supplied as input to or produced as
+ 5. The scripts and library files supplied as input to or produced as
output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
+ copyright of the software, but belong to whomever generated them,
and may be sold commercially, and may be aggregated with this
software.
.
diff --git a/debian/ruby-phonon.install b/debian/ruby-phonon.install
index 7c37506..83c801b 100644
--- a/debian/ruby-phonon.install
+++ b/debian/ruby-phonon.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/phonon/phonon.rb
usr/lib/ruby/vendor_ruby/*/*/phonon.so
+usr/lib/ruby/vendor_ruby/*/phonon/phonon.rb
diff --git a/debian/ruby-qscintilla2.install b/debian/ruby-qscintilla2.install
index 3cd8108..112bcd8 100644
--- a/debian/ruby-qscintilla2.install
+++ b/debian/ruby-qscintilla2.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/qscintilla/qscintilla.rb
usr/lib/ruby/vendor_ruby/*/*/qscintilla.so
+usr/lib/ruby/vendor_ruby/*/qscintilla/qscintilla.rb
diff --git a/debian/ruby-qt4-declarative.install b/debian/ruby-qt4-declarative.install
index 1576645..247a16d 100644
--- a/debian/ruby-qt4-declarative.install
+++ b/debian/ruby-qt4-declarative.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/qtdeclarative/qtdeclarative.rb
usr/lib/ruby/vendor_ruby/*/*/qtdeclarative.so
+usr/lib/ruby/vendor_ruby/*/qtdeclarative/qtdeclarative.rb
diff --git a/debian/ruby-qt4-script.install b/debian/ruby-qt4-script.install
index 3a0a9fa..fa8e69e 100644
--- a/debian/ruby-qt4-script.install
+++ b/debian/ruby-qt4-script.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/qtscript/qtscript.rb
usr/lib/ruby/vendor_ruby/*/*/qtscript.so
+usr/lib/ruby/vendor_ruby/*/qtscript/qtscript.rb
diff --git a/debian/ruby-qt4-test.install b/debian/ruby-qt4-test.install
index 6e95b28..4d55d4c 100644
--- a/debian/ruby-qt4-test.install
+++ b/debian/ruby-qt4-test.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/qttest/qttest.rb
usr/lib/ruby/vendor_ruby/*/*/qttest.so
+usr/lib/ruby/vendor_ruby/*/qttest/qttest.rb
diff --git a/debian/ruby-qt4-uitools.install b/debian/ruby-qt4-uitools.install
index 92e8d8c..63fa331 100644
--- a/debian/ruby-qt4-uitools.install
+++ b/debian/ruby-qt4-uitools.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/qtuitools/qtuitools.rb
usr/lib/ruby/vendor_ruby/*/*/qtuitools.so
+usr/lib/ruby/vendor_ruby/*/qtuitools/qtuitools.rb
diff --git a/debian/ruby-qt4-webkit.install b/debian/ruby-qt4-webkit.install
index e7bff67..76b1e73 100644
--- a/debian/ruby-qt4-webkit.install
+++ b/debian/ruby-qt4-webkit.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/qtwebkit/qtwebkit.rb
usr/lib/ruby/vendor_ruby/*/*/qtwebkit.so
+usr/lib/ruby/vendor_ruby/*/qtwebkit/qtwebkit.rb
diff --git a/debian/ruby-qt4.install b/debian/ruby-qt4.install
index cc344f8..ed57a74 100644
--- a/debian/ruby-qt4.install
+++ b/debian/ruby-qt4.install
@@ -1,6 +1,6 @@
usr/bin/rbqtapi
usr/bin/rbrcc
usr/bin/rbuic4
-usr/lib/ruby/vendor_ruby/*/Qt/*.rb
-usr/lib/ruby/vendor_ruby/*/Qt*.rb
usr/lib/ruby/vendor_ruby/*/*/qtruby4.so
+usr/lib/ruby/vendor_ruby/*/Qt*.rb
+usr/lib/ruby/vendor_ruby/*/Qt/*.rb
diff --git a/debian/ruby-qwt5.install b/debian/ruby-qwt5.install
index b50895f..42a8571 100644
--- a/debian/ruby-qwt5.install
+++ b/debian/ruby-qwt5.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/vendor_ruby/*/qwt/qwt.rb
usr/lib/ruby/vendor_ruby/*/*/qwt.so
+usr/lib/ruby/vendor_ruby/*/qwt/qwt.rb
--
qtruby packaging
More information about the pkg-kde-commits
mailing list