[SCM] Kross interpreters packaging branch, kde4.12, updated. debian/4.11.5-3-15-g2879ce5

[Maximiliano Curia]

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

The following commit has been merged in the kde4.12 branch:
commit 2ef624be15c2bbc667b7c752be6fb1c28ac53bff
Merge: 676c519e163dff2e0f3a456bf08ab90746f31bfd e2841a5fbc715c1c684383fa404ca76c35ebc22b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Apr 12 20:09:46 2014 +0200

    Merge branch 'kde4.12' of git://git.debian.org/pkg-kde/kde-sc/kross-interpreters into kde4.12
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   | 18 +++++++++++---
 debian/control                                     |  2 +-
 debian/patches/avoid_imposing_a_ruby_version       | 25 -------------------
 debian/patches/series                              |  2 +-
 ...not-reject-ruby-versions-greater-than-1.9.patch | 29 ++++++++++++++++++++++
 5 files changed, 46 insertions(+), 30 deletions(-)

diff --cc debian/changelog
index 7853ff9,1c6f653..f8d18c4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,9 @@@
 -kross-interpreters (4:4.12.2-2) UNRELEASED; urgency=medium
 +kross-interpreters (4:4.12.2-2~) UNRELEASED; urgency=medium
  
-   * Build against ruby 2.0. (Closes: #739128)
-   * Add new patch: avoid_imposing_a_ruby_version
+   [ Pino Toscano ]
+   * Merge 4:4.11.5-3 upload.
  
-  -- Maximiliano Curia <maxy at debian.org>  Tue, 08 Apr 2014 16:07:28 +0200
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 12 Apr 2014 13:06:26 +0200
  
  kross-interpreters (4:4.12.2-1) experimental; urgency=medium
  

-- 
Kross interpreters packaging