[SCM] Repository for the KDE Debconf access library. branch, master, updated. debian/0.2-2-11-ga004df4

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit a004df43256c7c013e2fa0cf9f65e778fc045d68
Merge: d859b2c271cee55b4f5b5d0062f2209e34ca5961 cee2d5ef0ea24ee267c35ef54bf3ae55bc605cb4
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Tue Mar 19 18:59:32 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/kde-extras/debconf-kde
    
    Conflicts:
    	debian/control

 CMakeLists.txt                   |    3 +
 debian/changelog                 |    7 ++
 debian/control                   |    3 +-
 po/CMakeLists.txt                |   47 ++++++++++++++++
 po/bs/CMakeLists.txt             |    2 +
 po/bs/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/ca/CMakeLists.txt             |    2 +
 po/ca/libdebconf-kde.po          |   86 ++++++++++++-----------------
 po/ca at valencia/CMakeLists.txt    |    2 +
 po/ca at valencia/libdebconf-kde.po |   86 ++++++++++++-----------------
 po/cs/CMakeLists.txt             |    2 +
 po/cs/libdebconf-kde.po          |   86 ++++++++++++-----------------
 po/da/CMakeLists.txt             |    2 +
 po/da/libdebconf-kde.po          |   87 +++++++++++------------------
 po/de/CMakeLists.txt             |    2 +
 po/de/libdebconf-kde.po          |   89 ++++++++++++------------------
 po/el/CMakeLists.txt             |    2 +
 po/el/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/en_GB/CMakeLists.txt          |    2 +
 po/en_GB/libdebconf-kde.po       |   87 +++++++++++------------------
 po/es/CMakeLists.txt             |    2 +
 po/es/libdebconf-kde.po          |   87 +++++++++++------------------
 po/et/CMakeLists.txt             |    2 +
 po/et/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/eu/CMakeLists.txt             |    2 +
 po/eu/libdebconf-kde.po          |   86 ++++++++++++-----------------
 po/fi/CMakeLists.txt             |    2 +
 po/{ja => fi}/libdebconf-kde.po  |  113 ++++++++++++++++++--------------------
 po/fr/CMakeLists.txt             |    2 +
 po/fr/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/ga/CMakeLists.txt             |    2 +
 po/ga/libdebconf-kde.po          |   80 ++++++++++++---------------
 po/hu/CMakeLists.txt             |    2 +
 po/hu/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/ja/CMakeLists.txt             |    2 +
 po/ja/libdebconf-kde.po          |   80 ++++++++++++---------------
 po/lt/CMakeLists.txt             |    2 +
 po/lt/libdebconf-kde.po          |   80 ++++++++++++---------------
 po/nb/CMakeLists.txt             |    2 +
 po/nb/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/nds/CMakeLists.txt            |    2 +
 po/nds/libdebconf-kde.po         |   86 ++++++++++++-----------------
 po/nl/CMakeLists.txt             |    2 +
 po/nl/libdebconf-kde.po          |   86 ++++++++++++-----------------
 po/pl/CMakeLists.txt             |    2 +
 po/pl/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/pt/CMakeLists.txt             |    2 +
 po/pt/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/pt_BR/CMakeLists.txt          |    2 +
 po/pt_BR/libdebconf-kde.po       |   84 ++++++++++++----------------
 po/ro/CMakeLists.txt             |    2 +
 po/ro/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/ru/CMakeLists.txt             |    2 +
 po/ru/libdebconf-kde.po          |   87 +++++++++++------------------
 po/sk/CMakeLists.txt             |    2 +
 po/sk/libdebconf-kde.po          |   84 ++++++++++++----------------
 po/sl/CMakeLists.txt             |    2 +
 po/sl/libdebconf-kde.po          |   97 ++++++++++++++-------------------
 po/sv/CMakeLists.txt             |    2 +
 po/sv/libdebconf-kde.po          |   87 +++++++++++------------------
 po/th/CMakeLists.txt             |    2 +
 po/th/libdebconf-kde.po          |   82 ++++++++++++---------------
 po/tr/CMakeLists.txt             |    2 +
 po/tr/libdebconf-kde.po          |  104 ++++++++++++++++-------------------
 po/ug/CMakeLists.txt             |    2 +
 po/ug/libdebconf-kde.po          |   80 ++++++++++++---------------
 po/uk/CMakeLists.txt             |    2 +
 po/uk/libdebconf-kde.po          |   87 +++++++++++------------------
 po/x-test/libdebconf-kde.po      |   97 --------------------------------
 po/zh_CN/CMakeLists.txt          |    2 +
 po/zh_CN/libdebconf-kde.po       |   80 ++++++++++++---------------
 po/zh_TW/CMakeLists.txt          |    2 +
 po/zh_TW/libdebconf-kde.po       |   82 +++++++++++----------------
 src/DebconfGui.cpp               |    5 ++
 src/DebconfGui.h                 |    2 +
 src/debconf.cpp                  |   95 +++++++++++++++++++++++++++++++-
 src/debconf.h                    |    4 +
 77 files changed, 1473 insertions(+), 1787 deletions(-)

diff --cc debian/control
index 34badff,3607f60..3520f70
--- a/debian/control
+++ b/debian/control
@@@ -2,7 -2,9 +2,8 @@@ Source: debconf-kd
  Section: kde
  Priority: optional
  Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
- Uploaders: Matthias Klumpp <mak at debian.org>
 -Uploaders: Matthias Klumpp <matthias at tenstral.net>,
++Uploaders: Matthias Klumpp <mak at debian.org>,
+  José Manuel Santamaría Lema <panfaust at gmail.com>
 -DM-Upload-Allowed: yes
  Build-Depends: cmake,
                 debhelper (>= 9),
                 kdelibs5-dev,

-- 
Repository for the KDE Debconf access library.