[SCM] qapt packaging branch, experimental, updated. debian/1.4.0-1-68-g36e138e

[Maximiliano Curia]

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

The following commit has been merged in the experimental branch:
commit 622a8a1cd5030b638a2d03b27ddb7374180e9caf
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Feb 13 22:04:24 2015 +0100

    Conflicted file
---
 debian/libqapt-dev.install | 64 +++-------------------------------------------
 1 file changed, 3 insertions(+), 61 deletions(-)

diff --git a/debian/libqapt-dev.install b/debian/libqapt-dev.install
index 4554296..d18ba8b 100644
--- a/debian/libqapt-dev.install
+++ b/debian/libqapt-dev.install
@@ -1,64 +1,6 @@
-<<<<<<< HEAD
-usr/include/LibQApt/Backend
-usr/include/LibQApt/Changelog
-usr/include/LibQApt/Config
-usr/include/LibQApt/DebFile
-usr/include/LibQApt/DependencyInfo
-usr/include/LibQApt/DownloadProgress
-usr/include/LibQApt/Globals
-usr/include/LibQApt/History
-usr/include/LibQApt/MarkingErrorInfo
-usr/include/LibQApt/Package
-usr/include/LibQApt/SourceEntry
-usr/include/LibQApt/SourcesList
-usr/include/LibQApt/Transaction
-usr/include/libqapt/backend.h
-usr/include/libqapt/changelog.h
-usr/include/libqapt/config.h
-usr/include/libqapt/debfile.h
-usr/include/libqapt/dependencyinfo.h
-usr/include/libqapt/globals.h
-usr/include/libqapt/history.h
-usr/include/libqapt/package.h
-usr/include/libqapt/qaptversion.h
-usr/include/libqapt/transaction.h
-usr/include/libqapt/downloadprogress.h
-usr/include/libqapt/markingerrorinfo.h
-usr/include/libqapt/sourceentry.h
-usr/include/libqapt/sourceslist.h
-usr/lib/libqapt.so
-usr/lib/pkgconfig/libqapt.pc
-usr/lib/cmake/QApt/QAptConfig.cmake
-=======
-usr/include/QApt/Backend
-usr/include/QApt/Changelog
-usr/include/QApt/Config
-usr/include/QApt/DebFile
-usr/include/QApt/DependencyInfo
-usr/include/QApt/DownloadProgress
-usr/include/QApt/Globals
-usr/include/QApt/History
-usr/include/QApt/MarkingErrorInfo
-usr/include/QApt/Package
-usr/include/QApt/SourceEntry
-usr/include/QApt/SourcesList
-usr/include/QApt/Transaction
-usr/include/qapt/backend.h
-usr/include/qapt/changelog.h
-usr/include/qapt/config.h
-usr/include/qapt/debfile.h
-usr/include/qapt/dependencyinfo.h
-usr/include/qapt/downloadprogress.h
-usr/include/qapt/globals.h
-usr/include/qapt/history.h
-usr/include/qapt/markingerrorinfo.h
-usr/include/qapt/package.h
-usr/include/qapt/qaptversion.h
-usr/include/qapt/sourceentry.h
-usr/include/qapt/sourceslist.h
-usr/include/qapt/transaction.h
-usr/lib/*/cmake/QApt/*
+usr/include/QApt/
+usr/include/qapt/
+usr/lib/*/cmake/QApt/
 usr/lib/*/libQApt.so
 usr/lib/*/pkgconfig/libqapt.pc
 usr/lib/*/qt5/mkspecs/modules/qt_QApt.pri
->>>>>>> origin/kubuntu_vivid_archive

-- 
qapt packaging