[SCM] rekonq packaging branch, experimental, updated. debian/1.0-1-5-g2876014

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/rekonq.git;a=commitdiff;h=2876014

The following commit has been merged in the experimental branch:
commit 2876014e3f1800d006151c6127e5fdd4155243f3
Merge: 5c105476424725b63e962fc436cf83fbf94551f7 027bc4eca768b1a2bd7f8bb564364b821a09ae32
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Sep 10 17:44:51 2012 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog |    7 +++++++
 debian/control   |    3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 0576911,9a95c34..6378e01
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
 -rekonq (1.0-2) UNRELEASED; urgency=low
++rekonq (1.1-2) UNRELEASED; urgency=low
+ 
+   [ Felix Geyer ]
+   * Remove myself from Uploaders.
+ 
+  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 12 Aug 2012 17:53:22 +0200
+ 
 +rekonq (1.1-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * Add shared-desktop-ontologies to Build-Depends.
 +
 + -- José Manuel Santamaría Lema <panfaust at gmail.com>  Mon, 10 Sep 2012 17:04:54 +0200
 +
  rekonq (1.0-1) experimental; urgency=low
  
    * New upstream release.

-- 
rekonq packaging