[SCM] Kross interpreters packaging branch, master, updated. debian/4.11.5-2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kross-interpreters.git;a=commitdiff;h=7c6317c

The following commit has been merged in the master branch:
commit 7c6317c7746d7b71f2cb21da38d0bc8ce4915d4d
Merge: a24c754d62005928eeb81d143c37a1b9196b648d 3600495c70631735fd563041476fb69b10c18447
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Jan 28 11:08:12 2014 +0100

    Merge branch 'master' of git://git.debian.org/pkg-kde/kde-sc/kross-interpreters
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                                   | 14 +++++
 debian/control                                     | 15 +++++
 debian/krossruby.install                           |  1 +
 debian/patches/series                              |  1 +
 ...am_ruby-fix-rb_raise-calls-with-arguments.patch | 69 ++++++++++++++++++++++
 5 files changed, 100 insertions(+)

diff --cc debian/changelog
index 2818fbb,24b97ac..7cae2bb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,24 @@@
 +kross-interpreters (4:4.11.5-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Bump Standards-Version to 3.9.5, no changes needed.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 28 Jan 2014 10:47:37 +0100
 +
+ kross-interpreters (4:4.11.3-2) unstable; urgency=low
+ 
+   * Team upload.
+   * Add krossruby back: (Closes: #693533)
+     - copy control snippet and krossruby.install from the old kdebindings
+       packaging
+     - add the ruby and ruby-dev build dependencies
+     - backport upstream commit cc551d8feeed74ee923c53587ee08859560c3300 to fix
+       build of krossruby with -Werror=format-security; patch
+       upstream_ruby-fix-rb_raise-calls-with-arguments.patch.
+   * Bump Standards-Version to 3.9.5, no changes required.
+ 
+  -- Pino Toscano <pino at debian.org>  Fri, 10 Jan 2014 09:55:13 +0100
+ 
  kross-interpreters (4:4.11.3-1) unstable; urgency=low
  
    * New upstream release.
diff --cc debian/control
index 00e1792,f324ddd..2032c01
--- a/debian/control
+++ b/debian/control
@@@ -2,12 -2,10 +2,14 @@@ Source: kross-interpreter
  Section: kde
  Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Build-Depends: kde-sc-dev-latest (>= 4:4.11),
 - debhelper (>= 9), cmake, pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.11),
 - python-dev,
 - ruby, ruby-dev,
 +Build-Depends: cmake,
 +               debhelper (>= 9),
 +               kde-sc-dev-latest (>= 4:4.11),
 +               kdelibs5-dev (>= 4:4.11),
 +               pkg-kde-tools (>= 0.12),
 +               python-dev
++               ruby,
++               ruby-dev,
  Uploaders: Modestas Vainius <modax at debian.org>,
             Sune Vuorela <sune at debian.org>,
             Maximiliano Curia <maxy at debian.org>

-- 
Kross interpreters packaging