[SCM] Repository for the KDE Debconf access library. branch, kubuntu_unstable, updated. debian/0.3-1-25-gc3622c2

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1fb0f0e53bfd653193863350e4c2a9dcf5cada5b
Merge: bd94b706a25f968ba5ee768a10706c1c22290fb1 197ee5fd4f04e69340b73754c6f39469a5bba45c
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Sep 8 21:44:32 2015 +0200

    Merge branch 'kubuntu_wily_archive' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog                                   | 43 +++++++------
 debian/control                                     | 39 +++++++-----
 debian/copyright                                   | 73 ++++++++++++++++------
 debian/debconf-kde1.install                        |  1 -
 debian/libdebconf-kde-dev.acc.in                   | 20 ++++++
 debian/libdebconf-kde-dev.install                  |  2 +-
 debian/libdebconf-kde1.install                     |  3 +-
 debian/patches/series                              |  1 +
 .../patches/upstream_fix-dependency-lookup.patch   | 27 ++++++++
 debian/source/local-options                        |  2 -
 debian/tests/acc                                   | 11 ++++
 debian/tests/control                               |  6 ++
 debian/tests/testsuite                             |  3 +
 debian/watch                                       |  2 +-
 14 files changed, 175 insertions(+), 58 deletions(-)

diff --cc debian/control
index 325c249,8d0a839..7276ef6
--- a/debian/control
+++ b/debian/control
@@@ -64,10 -74,10 +74,11 @@@ Description: Debconf KDE GUI frontend t
  
  Package: debconf-kde-data
  Architecture: all
+ Multi-Arch: foreign
  Depends: ${misc:Depends}
- Breaks: libdebconf-kde0 (<< 1.0.0)
- Replaces: libdebconf-kde0 (<< 1.0.0)
+ Breaks: libdebconf-kde0 (<= 0.3-1)
+ Replaces: libdebconf-kde0 (<= 0.3-1)
 +Multi-Arch: foreign
  Description: Debconf KDE data files
   Debconf KDE is a GUI library for including Debconf frontends in Qt-based
   applications.

-- 
Repository for the KDE Debconf access library.