[SCM] qapt packaging branch, master, updated. debian/3.0.0-6-8-g3d741fd
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Sep 26 06:21:36 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qapt.git;a=commitdiff;h=503fa35
The following commit has been merged in the master branch:
commit 503fa3563399cceac06e5bad21e2400f42185b4b
Author: Maximiliano Curia <maxy at debian.org>
Date: Sat Sep 26 07:50:10 2015 +0200
Drop upstream applied patches.
---
debian/changelog | 1 +
debian/patches/add_kf5iconthemes | 13 ---
debian/patches/apt_1.1 | 167 ---------------------------------------
debian/patches/series | 2 -
4 files changed, 1 insertion(+), 182 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0141298..3f13fb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libqapt (3.0.1-1~) UNRELEASED; urgency=medium
* New upstream release (3.0.1).
+ * Drop upstream applied patches.
-- Maximiliano Curia <maxy at debian.org> Sat, 26 Sep 2015 07:35:16 +0200
diff --git a/debian/patches/add_kf5iconthemes b/debian/patches/add_kf5iconthemes
deleted file mode 100644
index 16ba9ba..0000000
--- a/debian/patches/add_kf5iconthemes
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qapt/CMakeLists.txt
-===================================================================
---- qapt.orig/CMakeLists.txt 2015-06-30 11:15:48.484922939 +0200
-+++ qapt/CMakeLists.txt 2015-06-30 11:39:36.788005922 +0200
-@@ -76,6 +76,8 @@
- find_package(KF5WidgetsAddons ${KF5_DEP_VERSION})
- find_package(KF5WindowSystem ${KF5_DEP_VERSION})
-
-+find_package(KF5IconThemes ${KF5_DEP_VERSION})
-+
- find_package(DebconfKDE)
- find_package(GStreamer)
- find_package(GLIB2)
diff --git a/debian/patches/apt_1.1 b/debian/patches/apt_1.1
deleted file mode 100644
index 2a89353..0000000
--- a/debian/patches/apt_1.1
+++ /dev/null
@@ -1,167 +0,0 @@
---- 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
deleted file mode 100644
index e319359..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-add_kf5iconthemes
-apt_1.1
--
qapt packaging
More information about the pkg-kde-commits
mailing list