[SCM] qapt packaging branch, master, updated. debian/3.0.0-5-7-g69cc68e

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2c3e9c4b2900ecdebb2c822a861019b9cb196503
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Sep 14 01:55:37 2015 +0200

    Add support for APT 1.1.
---
 debian/changelog       |   2 +-
 debian/patches/apt_1.1 | 167 +++++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series  |   1 +
 3 files changed, 169 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 661b392..efdedfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 libqapt (3.0.0-6~) UNRELEASED; urgency=medium
 
-  * 
+  * Add support for APT 1.1. (Closes: #798705) Thanks to Julian Andres Klode
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 14 Sep 2015 01:18:39 +0200
 
diff --git a/debian/patches/apt_1.1 b/debian/patches/apt_1.1
new file mode 100644
index 0000000..2a89353
--- /dev/null
+++ b/debian/patches/apt_1.1
@@ -0,0 +1,167 @@
+--- a/src/package.cpp
++++ b/src/package.cpp
+@@ -404,7 +404,7 @@ QStringList Package::availableVersions()
+         pkgCache::PkgFileIterator File = VF.File();
+ 
+         // Files without an archive will have a site
+-        QString archive = (File->Archive) ? QLatin1String(File.Archive()) :
++        QString archive = File.Archive() ? QLatin1String(File.Archive()) :
+                                             QLatin1String(File.Site());
+         versions.append(QLatin1String(Ver.VerStr()) % QLatin1String(" (") %
+                         archive % ')');
+--- a/src/debfile.cpp
++++ b/src/debfile.cpp
+@@ -53,7 +53,6 @@ class DebFilePrivate
+         bool isValid;
+         QString filePath;
+         debDebFile::MemControlExtract *extractor;
+-        pkgTagSection controlData;
+ 
+         void init();
+ };
+@@ -77,8 +76,6 @@ void DebFilePrivate::init()
+         // from exploding.
+         return;
+     }
+-
+-    controlData = extractor->Section;
+ }
+ 
+ DebFile::DebFile(const QString &filePath)
+@@ -103,47 +100,47 @@ QString DebFile::filePath() const
+ 
+ QString DebFile::packageName() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Package"));
++    return QString::fromStdString(d->extractor->Section.FindS("Package"));
+ }
+ 
+ QString DebFile::sourcePackage() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Source"));
++    return QString::fromStdString(d->extractor->Section.FindS("Source"));
+ }
+ 
+ QString DebFile::version() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Version"));
++    return QString::fromStdString(d->extractor->Section.FindS("Version"));
+ }
+ 
+ QString DebFile::architecture() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Architecture"));
++    return QString::fromStdString(d->extractor->Section.FindS("Architecture"));
+ }
+ 
+ QString DebFile::maintainer() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Maintainer"));
++    return QString::fromStdString(d->extractor->Section.FindS("Maintainer"));
+ }
+ 
+ QString DebFile::section() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Section"));
++    return QString::fromStdString(d->extractor->Section.FindS("Section"));
+ }
+ 
+ QString DebFile::priority() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Priority"));
++    return QString::fromStdString(d->extractor->Section.FindS("Priority"));
+ }
+ 
+ QString DebFile::homepage() const
+ {
+-    return QString::fromStdString(d->controlData.FindS("Homepage"));
++    return QString::fromStdString(d->extractor->Section.FindS("Homepage"));
+ }
+ 
+ QString DebFile::longDescription() const
+ {
+-    QString rawDescription = QLatin1String(d->controlData.FindS("Description").c_str());
++    QString rawDescription = QLatin1String(d->extractor->Section.FindS("Description").c_str());
+     // Remove short description
+     rawDescription.remove(shortDescription() + '
');
+ 
+@@ -174,14 +171,14 @@ QString DebFile::longDescription() const
+ 
+ QString DebFile::shortDescription() const
+ {
+-    QString longDesc = QLatin1String(d->controlData.FindS("Description").c_str());
++    QString longDesc = QLatin1String(d->extractor->Section.FindS("Description").c_str());
+ 
+     return longDesc.left(longDesc.indexOf(QLatin1Char('
')));
+ }
+ 
+ QString DebFile::controlField(const QLatin1String &field) const
+ {
+-    return QString::fromStdString(d->controlData.FindS(field.latin1()));
++    return QString::fromStdString(d->extractor->Section.FindS(field.latin1()));
+ }
+ 
+ QString DebFile::controlField(const QString &field) const
+@@ -266,52 +263,52 @@ QStringList DebFile::iconList() const
+ 
+ QList<DependencyItem> DebFile::depends() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Depends")), Depends);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Depends")), Depends);
+ }
+ 
+ QList<DependencyItem> DebFile::preDepends() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Pre-Depends")), PreDepends);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Pre-Depends")), PreDepends);
+ }
+ 
+ QList<DependencyItem> DebFile::suggests() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Suggests")), Suggests);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Suggests")), Suggests);
+ }
+ 
+ QList<DependencyItem> DebFile::recommends() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Recommends")), Recommends);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Recommends")), Recommends);
+ }
+ 
+ QList<DependencyItem> DebFile::conflicts() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Conflicts")), Conflicts);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Conflicts")), Conflicts);
+ }
+ 
+ QList<DependencyItem> DebFile::replaces() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Replaces")), Replaces);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Replaces")), Replaces);
+ }
+ 
+ QList<DependencyItem> DebFile::obsoletes() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Obsoletes")), Obsoletes);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Obsoletes")), Obsoletes);
+ }
+ 
+ QList<DependencyItem> DebFile::breaks() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Breaks")), Breaks);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Breaks")), Breaks);
+ }
+ 
+ QList<DependencyItem> DebFile::enhances() const
+ {
+-    return DependencyInfo::parseDepends(QString::fromStdString(d->controlData.FindS("Enhance")), Enhances);
++    return DependencyInfo::parseDepends(QString::fromStdString(d->extractor->Section.FindS("Enhance")), Enhances);
+ }
+ 
+ qint64 DebFile::installedSize() const
+ {
+-    QString sizeString = QLatin1String(d->controlData.FindS("Installed-Size").c_str());
++    QString sizeString = QLatin1String(d->extractor->Section.FindS("Installed-Size").c_str());
+ 
+     return sizeString.toLongLong();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 112dabe..e319359 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add_kf5iconthemes
+apt_1.1

-- 
qapt packaging