Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: sni-qt

sni-qt (0.2.7+17.04.20170112-0ubuntu1) zesty; urgency=medium * fsutils: always use $XDG_RUNTIME_DIR if it's set for saving icons -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 12 Jan 2017 17:12:41 +0000 sni-qt (0.2.7+17.04.20161124.2-0ubuntu1) zesty; urgency=medium * statusnotifieritem: reset app usertime on activation to ensure compiz will raise it (LP: #627195) * IconCache: get the proper theme path based on the fact we're using a themed icon or not (LP: #1600136) -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 24 Nov 2016 18:38:52 +0000 sni-qt (0.2.7+15.10.20150729-0ubuntu1) wily; urgency=low [ Robert Bruce Park ] * Inline packaging metadata. * This builds off of robru's work in lp:~robru/sni-qt/inline- packaging, with the following changes: raring->UNRELEASED Don't bother setting gensymbols flag, we don't use symbols Run all tests, using xvfb. [ Didier Roche ] * Automatic snapshot from revision 93 (bootstrap) [ Alberts Muktupāvels ] * Fix RegisterStatusNotifier method call to match specification. [ Aurelien Gateau ] * Add Qt patch added: patches/ patches/qsystemtrayicon-plugin-system- 4.7.4.diff * Use an icon in systray menu [ Aurélien Gâteau ] * Update maintainer [ Dmitry Shachnev ] * Fix pixmap types in org.kde.StatusNotifierItem.xml. [ Michael Terry ] * This builds off of robru's work in lp:~robru/sni-qt/inline- packaging, with the following changes: raring->UNRELEASED Don't bother setting gensymbols flag, we don't use symbols Run all tests, using xvfb. -- CI Train Bot <ci-train-bot@canonical.com> Wed, 29 Jul 2015 17:00:47 +0000 sni-qt (0.2.6-0ubuntu1) quantal; urgency=low * New upstream release (lp: #1020419). * debian/patches/do-not-delete-cwd-if-tmp-dir-is-not-writable.diff, debian/patches/do-not-eat-cpu-with-animated-icons.diff: - dropped, the patches are in the new version -- Sebastien Bacher <seb128@ubuntu.com> Tue, 31 Jul 2012 13:19:47 +0200 sni-qt (0.2.5-0ubuntu3) oneiric-proposed; urgency=low * Backport r88.1.4 from upstream trunk: avoid causing unity-panel-service to eat all CPU when an application uses an animated icon (LP: #865601) -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Tue, 25 Oct 2011 15:52:35 -0400 sni-qt (0.2.5-0ubuntu2) oneiric-proposed; urgency=high * Backport r91 from upstream trunk: prevent deletion of cwd if tmp dir is not writable (LP: #874447) -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Sat, 15 Oct 2011 16:08:57 +0200 sni-qt (0.2.5-0ubuntu1) oneiric; urgency=low * New upstream release. - Prefix log output with pid of application. - Use a placeholder menu if there is none defined yet (LP: #860395) -- Didier Roche <didrocks@ubuntu.com> Wed, 28 Sep 2011 12:24:50 +0200 sni-qt (0.2.4-0ubuntu1) oneiric; urgency=low * New upstream release. - Make sure GTK notices icon updates (LP: #812884). - Prevent applications from stealing icons from each others (LP: #850139) - Turn debug into a runtime option. -- Didier Roche <didrocks@ubuntu.com> Mon, 26 Sep 2011 11:17:11 +0200 sni-qt (0.2.2-0ubuntu3) oneiric; urgency=low * Multi-Arch support (LP: #838470). * Update Vcs-Bzr url. -- Aurélien Gâteau <aurelien.gateau@canonical.com> Wed, 07 Sep 2011 18:53:05 +0200 sni-qt (0.2.2-0ubuntu2) oneiric; urgency=low * debian/sni-qt.conf: - add clementine and speedcrunch whitelist for activate entry (LP: #842752) * debian/rules: - remove the verbose mode, sni-qt seems to work quite well :) -- Didier Roche <didrocks@ubuntu.com> Tue, 06 Sep 2011 18:03:18 +0200 sni-qt (0.2.2-0ubuntu1) oneiric; urgency=low * New upstream release: - Add the ability to show an Activate entry to the menu if the app does not provide it. - Survive a restart of the StatusNotifierWatcher process. - Build with -fvisibility=hidden and move all classes into a SniQt namespace to reduce risks of symbol clashes. - Rename _qt_sni_category to _sni_qt_category. - Touch the icon theme dir, so that GTK looks into it and find new icons. - Add build-time option to enable debug output - Document the _qt_sni_property hack * Cherry-pick some upstream commits to get a better localtion of sni-qt.conf file and translation fixes when the Qt app doesn't load it properly * debian/rules: - Add -DSNI_DEBUG_OUTPUT to get some debug info * debian/sni-qt.conf, debian/sni-qt.install: - List Mumble and skype as candidate for "activate" entry menu -- Didier Roche <didrocks@ubuntu.com> Thu, 04 Aug 2011 14:56:54 +0200 sni-qt (0.2.0-0ubuntu1) oneiric; urgency=low * New upstream release. * debian/copyright: - add the BSD notice for new example files * debian/rules: - auto tests changed their location -- Didier Roche <didrocks@ubuntu.com> Thu, 07 Jul 2011 18:10:35 +0200 sni-qt (0.1.5-0ubuntu1) oneiric; urgency=low * Initial package -- Didier Roche <didrocks@ubuntu.com> Fri, 01 Jul 2011 16:56:24 +0200

Modifications :
  1. Download patch src/iconcache.h

    --- 0.2.7+15.10.20150729-2/src/iconcache.h 2015-07-29 17:00:28.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/src/iconcache.h 2017-01-12 17:12:20.000000000 +0000 @@ -19,6 +19,7 @@ // Qt #include <QObject> +#include <QIcon> #include <QStringList> class QIcon; @@ -35,8 +36,7 @@ public: static const int MaxIconCount; - QString themePath() const; - + QString themePath(const QIcon& icon = QIcon()) const; QString nameForIcon(const QIcon& icon) const; // Internal, testing only
  2. Download patch src/statusnotifieritem.cpp

    --- 0.2.7+15.10.20150729-2/src/statusnotifieritem.cpp 2015-07-29 17:00:41.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/src/statusnotifieritem.cpp 2017-01-12 17:12:20.000000000 +0000 @@ -36,6 +36,10 @@ #include <QTranslator> #include <QWheelEvent> +#if defined(Q_WS_X11) +#include <QX11Info> +#endif + static const char* SNI_CATEGORY_PROPERTY = "_sni_qt_category"; static const char* DEFAULT_CATEGORY = "ApplicationStatus"; @@ -174,7 +178,7 @@ void StatusNotifierItem::showMessage(con void StatusNotifierItem::Activate(int, int) { SNI_DEBUG; - sendActivated(QSystemTrayIcon::Trigger); + sendActivatedByTrigger(); } void StatusNotifierItem::ContextMenu(int, int) @@ -200,7 +204,7 @@ void StatusNotifierItem::SecondaryActiva QString StatusNotifierItem::iconThemePath() const { - return m_iconCache->themePath(); + return m_iconCache->themePath(trayIcon->icon()); } QString StatusNotifierItem::iconName() const @@ -288,6 +292,12 @@ DBusToolTip StatusNotifierItem::toolTip( void StatusNotifierItem::sendActivatedByTrigger() { +#if defined(Q_WS_X11) + // Workarounds LP: #627195 + if (QString::fromUtf8(getenv("XDG_CURRENT_DESKTOP")).split(':').contains("Unity")) { + QX11Info::setAppUserTime(0); + } +#endif sendActivated(QSystemTrayIcon::Trigger); }
  3. Download patch debian/rules

    --- 0.2.7+15.10.20150729-2/debian/rules 2015-09-06 09:36:23.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/debian/rules 2017-01-27 23:43:01.000000000 +0000 @@ -1,13 +1,11 @@ #!/usr/bin/make -f # -*- makefile -*- -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - %: - dh $@ --parallel + dh $@ override_dh_auto_test: - xvfb-run -a dh_auto_test + xvfb-run dh_auto_test override_dh_makeshlibs: dh_makeshlibs -Nsni-qt
  4. Download patch .pc/.version

    --- 0.2.7+15.10.20150729-2/.pc/.version 2017-01-27 23:43:01.746056994 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/.pc/.version 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2
  5. Download patch src/fsutils.cpp

    --- 0.2.7+15.10.20150729-2/src/fsutils.cpp 2015-07-29 17:00:28.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/src/fsutils.cpp 2017-01-12 17:12:27.000000000 +0000 @@ -32,16 +32,31 @@ namespace FsUtils { QString generateTempDir(const QString& prefix) { - QDir dir = QDir::temp(); + QDir dir; + QString path = QString::fromUtf8(getenv("XDG_RUNTIME_DIR")); + + if (!path.isEmpty()) { + dir.setPath(path); + } else if (!getenv("SNAP")) { + dir = QDir::temp(); + } else { + // Try to get the .cache from $XDG_CACHE_HOME, if it's not set, + // it has to be in ~/.cache as per XDG standard + path = QString::fromUtf8(getenv("XDG_CACHE_HOME")); + if (path.isEmpty()) { + path = QDir::cleanPath(QDir::homePath() + "/.cache"); + } + + dir.setPath(path); + } + if (!dir.mkpath(".")) { qCritical("Failed to generate temporary file for prefix %s: could not create %s", qPrintable(prefix), qPrintable(dir.path())); return QString(); } - QString tmpl = QString("%1/%2-XXXXXX") - .arg(dir.path()) - .arg(prefix); + QString tmpl = QDir::cleanPath(dir.path() + '/' + prefix + "-XXXXXX"); QByteArray ba = QFile::encodeName(tmpl); const char* name = mkdtemp(ba.data()); if (!name) {
  6. Download patch debian/control

    --- 0.2.7+15.10.20150729-2/debian/control 2015-08-02 21:38:48.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/debian/control 2017-01-27 23:43:01.000000000 +0000 @@ -1,8 +1,7 @@ Source: sni-qt Section: x11 Priority: optional -Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> -Uploaders: Felix Geyer <fgeyer@debian.org> +Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com> Build-Depends: cmake, debhelper (>= 9), libdbusmenu-qt-dev, @@ -10,16 +9,16 @@ Build-Depends: cmake, pkg-config, qt4-qmake, xvfb, - xauth -Standards-Version: 3.9.6 +Standards-Version: 3.9.2 Homepage: https://launchpad.net/sni-qt -Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/sni-qt.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/sni-qt.git +# If you aren't a member of ~canonical-dx-team but need to upload packaging changes, +# just go ahead. ~canonical-dx-team will notice and sync up the code again. +Vcs-Bzr: https://code.launchpad.net/~canonical-dx-team/sni-qt/trunk Package: sni-qt Architecture: any Pre-Depends: ${misc:Pre-Depends} -Depends: libqtgui4 (>= 4:4.8.7+dfsg-2~), ${misc:Depends}, ${shlibs:Depends} +Depends: libqtcore4 (>= 4:4.7.3-1ubuntu3~), ${misc:Depends}, ${shlibs:Depends} Multi-Arch: same Description: indicator support for Qt This plugin provides indicator support for Qt. It allows applications
  7. Download patch src/iconcache.cpp

    --- 0.2.7+15.10.20150729-2/src/iconcache.cpp 2015-07-29 17:00:28.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/src/iconcache.cpp 2017-01-12 17:12:20.000000000 +0000 @@ -26,7 +26,6 @@ #include <QDateTime> #include <QDebug> #include <QDir> -#include <QIcon> #include <QList> const int IconCache::MaxIconCount = 20; @@ -86,8 +85,18 @@ IconCache::IconCache(const QString& base } } -QString IconCache::themePath() const +QString IconCache::themePath(const QIcon& icon) const { + if (!icon.isNull() && !icon.name().isEmpty() && QIcon::hasThemeIcon(icon.name())) { + QString dataHome = QString::fromUtf8(getenv("XDG_DATA_HOME")); + + if (dataHome.isEmpty()) { + dataHome = QDir::homePath() + "/.local/share"; + } + + return QDir::cleanPath(dataHome + "/icons"); + } + return m_themePath; }
  8. Download patch .pc/.quilt_series

    --- 0.2.7+15.10.20150729-2/.pc/.quilt_series 2017-01-27 23:43:01.746056994 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/.pc/.quilt_series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -series
  9. Download patch tests/auto/fsutilstest.cpp

    --- 0.2.7+15.10.20150729-2/tests/auto/fsutilstest.cpp 2015-07-29 17:00:28.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/tests/auto/fsutilstest.cpp 2017-01-12 17:12:27.000000000 +0000 @@ -49,6 +49,7 @@ private Q_SLOTS: { QDir::setCurrent(m_baseDirName); m_sandBoxDirName = m_baseDirName + "/sandbox"; + setenv("XDG_RUNTIME_DIR", m_sandBoxDirName.toLocal8Bit().constData(), 1 /*overwrite*/); setenv("TMPDIR", m_sandBoxDirName.toLocal8Bit().constData(), 1 /*overwrite*/); }
  10. Download patch debian/watch

    --- 0.2.7+15.10.20150729-2/debian/watch 2015-08-02 18:58:59.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -version=3 -http://archive.ubuntu.com/ubuntu/pool/main/s/sni-qt/sni-qt_([0-9+.]+)\.orig\.tar\.(?:bz2|gz|xz)
  11. Download patch tests/auto/iconcachetest.cpp

    --- 0.2.7+15.10.20150729-2/tests/auto/iconcachetest.cpp 2015-07-29 17:00:28.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/tests/auto/iconcachetest.cpp 2017-01-12 17:12:20.000000000 +0000 @@ -73,6 +73,32 @@ private Q_SLOTS: QVERIFY(info.isDir()); } + void testThemePathForIcon() + { + QList<int> sizes = QList<int>() << 16 << 22 << 32; + QIcon icon = createTestIcon(sizes, Qt::red); + + IconCache cache(m_sandBoxDirName); + QString themePath = cache.themePath(icon); + QCOMPARE(themePath, m_sandBoxDirName + "/icons"); + + QFileInfo info(themePath); + QVERIFY(info.isDir()); + } + + void testThemePathForThemedIcons() + { + IconCache cache(m_sandBoxDirName); + QIcon icon = QIcon::fromTheme("indicator-messages"); + QString themePath = cache.themePath(icon); + + if (icon.name().isEmpty()) { + QSKIP("Icon has not been found in theme, so there's nothing to test here", SkipSingle); + } + + QCOMPARE(themePath, QDir::homePath() + "/.local/share/icons"); + } + void testPixmapIcon() { IconCache cache(m_sandBoxDirName); @@ -82,7 +108,7 @@ private Q_SLOTS: QString name = cache.nameForIcon(icon); Q_FOREACH(int size, sizes) { - QString dirName = cache.themePath() + QString("/hicolor/%1x%1/apps").arg(size); + QString dirName = cache.themePath(icon) + QString("/hicolor/%1x%1/apps").arg(size); QVERIFY(QFile::exists(dirName)); QImage image; QVERIFY(image.load(dirName + "/" + name + ".png"));
  12. Download patch .pc/.quilt_patches

    --- 0.2.7+15.10.20150729-2/.pc/.quilt_patches 2017-01-27 23:43:01.746056994 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/.pc/.quilt_patches 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/patches
  13. Download patch debian/source/format

    --- 0.2.7+15.10.20150729-2/debian/source/format 2015-08-02 18:55:28.000000000 +0000 +++ 0.2.7+17.04.20170112-0ubuntu1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt)
  14. Download patch debian/copyright
  1. sni-qt