Cherry-picking upstream release 0.11.0.

* Bumped Standards to 4.1.1 - no changes needed
* Bumped liblxqt dependency to >= 0.12.0
* Added Breaks/Replaces for lxqt-common << 0.12.0

AUTHORS

@@ -4,7 +4,7 @@ Upstream Authors:
 
 Copyright:
     Copyright (c) 2010-2012 Razor team
-    Copyright (c) 2012-2016 LXQt team
+    Copyright (c) 2012-2017 LXQt team
 
 License: LGPL-2.1+
 The full text of the licenses can be found in the 'COPYING' file.

CHANGELOG

@@ -1,7 +1,37 @@
 
-lxqt-notificationd-0.11.1 / 2017-01-01
+lxqt-notificationd-0.12.0 / 2017-10-21
 ======================================
 
+  * Set patch version
+  * Don't export github templates
+  * Improvement for notification settings, see https://github.com/lxde/lxqt/issues/744#issuecomment-138601402
+  * Updated Lithuanian language
+  * Drops Qt5Core_VERSION_STRING
+  * lxqt-config-notificationd: set Qt::AA_UseHighDpiPixmaps to true
+  * Add a basic cli to lxqt-config-notificationd Add a basic cli to lxqt-notificationd
+  * Added default CMAKE_BUILD_TYPE and LXQT_NOTIFICATION_PATCH_VERSION
+  * Create lxqt-config-notificationd_pl_PL.desktop
+  * Fixes a FTBFS in superbuild mode
+  * Added merged autostart to CMakeLists.txt
+  * Updated *_da.desktop files and removed *_da_DK.desktop files
+  * Update desktop entries and Replace fr_FR by fr
+  * Update Greek translation (el) Remove country variant from language code
+  * CMake: Adds Runtime and Devel install COMPONENTs
+  * Coding style changes
+  * Updates the build system to use the Targets infrastructure
+  * Drops hardcoded /etc/xdg paths
+  * Updated german translation, replaced Qt4 by Qt in all xsession/translations
+  * Updates translations infrastructure
+  * Update the required minimum cmake version
+  * remove dead template lines switch OnlyShowIn from Razor -> LXQt stringchanges LxQt -> LXQt
+  * Support lxqt-session and add necessary xdg autostart desktop entry files.
+  * Fix a typo: singals -> signals
+  * Bump year
+
+0.11.1 / 2017-01-01
+===================
+
+  * Release 0.11.1: Update changelog
   * Updated da translation. Removed da_DK
   * Update and rename French .desktop file
   * Make CMakeList.txt more uniform.

CMakeLists.txt

@@ -12,14 +12,24 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
 
 find_package(Qt5DBus REQUIRED)
-find_package(Qt5LinguistTools REQUIRED QUIET)
+find_package(Qt5LinguistTools REQUIRED)
 find_package(Qt5Widgets REQUIRED)
-message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+message(STATUS "Building with Qt${Qt5Core_VERSION}")
 
 find_package(KF5WindowSystem REQUIRED)
 
 find_package(lxqt REQUIRED)
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
+# Patch Version
+set(LXQT_NOTIFICATIOND_PATCH_VERSION 0)
+
+set(LXQT_NOTIFICATIOND_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_NOTIFICATIOND_PATCH_VERSION})
+add_definitions("-DLXQT_NOTIFICATIOND_VERSION=\"${LXQT_NOTIFICATIOND_VERSION}\"")
+
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
 
 # Translations **********************************
@@ -27,3 +37,6 @@ include(LXQtTranslate)
 
 add_subdirectory(config)
 add_subdirectory(src)
+
+## merged from lxqt-common
+add_subdirectory(autostart)

autostart/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+
+file(GLOB DESKTOP_FILES_IN *.desktop.in)
+
+# Translations **********************************
+lxqt_translate_desktop(DESKTOP_FILES
+    SOURCES
+        ${DESKTOP_FILES_IN}
+)
+add_custom_target(lxqt_notificationd_autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES})
+#************************************************
+
+install(FILES
+    ${DESKTOP_FILES}
+    DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
+    COMPONENT Runtime
+)

autostart/lxqt-notifications.desktop.in

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Notification Daemon
+TryExec=lxqt-notificationd
+Exec=lxqt-notificationd
+OnlyShowIn=LXQt;
+X-LXQt-Module=true
+
+#TRANSLATIONS_DIR=translations

autostart/translations/lxqt-notifications_ar.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[ar]=بريمج الإشعارات

autostart/translations/lxqt-notifications_cs.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[cs]=Oznamovací démon

autostart/translations/lxqt-notifications_cs_CZ.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[cs_CZ]=Oznamovací démon

autostart/translations/lxqt-notifications_da.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[da]=Notifikationsbaggrundsprogram

autostart/translations/lxqt-notifications_de.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[de]=Benachrichtigungsdaemon

autostart/translations/lxqt-notifications_el.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[el]=Υπηρεσία ειδοποιήσεων

autostart/translations/lxqt-notifications_eo.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[eo]=Demono de atentigoj

autostart/translations/lxqt-notifications_es.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[es]=Demonio de notificaciones

autostart/translations/lxqt-notifications_es_VE.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[es_VE]=Demonio de notificaciones

autostart/translations/lxqt-notifications_eu.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[eu]=Jakinarazpen-deabrua

autostart/translations/lxqt-notifications_fi.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[fi]=Ilmoituspalvelu

autostart/translations/lxqt-notifications_fr.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[fr]=Démon de notification

autostart/translations/lxqt-notifications_hu.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[hu]=Értesítő szolgáltatás

autostart/translations/lxqt-notifications_it_IT.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[it_IT]=Demone delle notifiche

autostart/translations/lxqt-notifications_ja.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[ja]=通知デーモン

autostart/translations/lxqt-notifications_lt.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[lt]=Pranešimų tarnyba

autostart/translations/lxqt-notifications_nl.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[nl]=notificatie Daemon

autostart/translations/lxqt-notifications_pl_PL.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[pl_PL]=Daemon Powiadomień

autostart/translations/lxqt-notifications_pt.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[pt]=Serviço de notificações

autostart/translations/lxqt-notifications_pt_BR.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[pt_BR]=Daemon de notificação

autostart/translations/lxqt-notifications_ro_RO.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[ro_RO]=Daemon de notificare

autostart/translations/lxqt-notifications_ru.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[ru]=демон Cообщение 

autostart/translations/lxqt-notifications_ru_RU.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[ru_RU]=Служба уведомлений

autostart/translations/lxqt-notifications_sl.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[sl]=Obvestilnik

autostart/translations/lxqt-notifications_th_TH.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[th_TH]=ดีมอนการแจ้งเตือน

autostart/translations/lxqt-notifications_tr.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[tr]=Bildirim Artsüreci

autostart/translations/lxqt-notifications_uk.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[uk]=Демон сповіщень

autostart/translations/lxqt-notifications_zh_CN.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[zh_CN]=通知服务

autostart/translations/lxqt-notifications_zh_TW.desktop

@@ -0,0 +1,2 @@
+# Translations
+Name[zh_TW]=系統通知程序

config/basicsettings.cpp

@@ -43,7 +43,6 @@ BasicSettings::BasicSettings(LXQt::Settings* settings, QWidget *parent) :
     connect(topCenterRB,    SIGNAL(clicked()), this, SLOT(updateNotification()));
     connect(topRightRB,     SIGNAL(clicked()), this, SLOT(updateNotification()));
     connect(centerLeftRB,   SIGNAL(clicked()), this, SLOT(updateNotification()));
-    connect(centerCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
     connect(centerRightRB,  SIGNAL(clicked()), this, SLOT(updateNotification()));
     connect(bottomLeftRB,   SIGNAL(clicked()), this, SLOT(updateNotification()));
     connect(bottomCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
@@ -79,8 +78,6 @@ void BasicSettings::restoreSettings()
         topRightRB->setChecked(true);
     else if (QStringLiteral("center-left") == placement)
         centerLeftRB->setChecked(true);
-    else if (QStringLiteral("center-center") == placement)
-        centerCenterRB->setChecked(true);
     else if (QStringLiteral("center-right") == placement)
         centerRightRB->setChecked(true);
     else if (QStringLiteral("bottom-left") == placement)
@@ -93,7 +90,7 @@ void BasicSettings::restoreSettings()
 
 void BasicSettings::updateNotification()
 {
-    QString align;
+   QString align;
     if (topLeftRB->isChecked())
         align = QStringLiteral("top-left");
     else if (topCenterRB->isChecked())
@@ -102,8 +99,6 @@ void BasicSettings::updateNotification()
         align = QStringLiteral("top-right");
     else if (centerLeftRB->isChecked())
         align = QStringLiteral("center-left");
-    else if (centerCenterRB->isChecked())
-        align = QStringLiteral("center-center");
     else if (centerRightRB->isChecked())
         align = QStringLiteral("center-right");
     else if (bottomLeftRB->isChecked())

config/basicsettings.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>148</width>
+    <width>398</width>
-    <height>179</height>
+    <height>354</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -56,16 +56,6 @@
         </attribute>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QRadioButton" name="centerCenterRB">
-        <property name="text">
-         <string/>
-        </property>
-        <attribute name="buttonGroup">
-         <string notr="true">buttonGroup</string>
-        </attribute>
-       </widget>
-      </item>
       <item row="0" column="1">
        <spacer name="horizontalSpacer">
         <property name="orientation">
@@ -158,6 +148,38 @@
         </property>
        </spacer>
       </item>
+      <item row="1" column="0">
+       <spacer name="spacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>100</width>
+          <height>90</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="2">
+       <spacer name="spacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>100</width>
+          <height>90</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -169,7 +191,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>105</width>
-       <height>51</height>
+       <height>21</height>
       </size>
      </property>
     </spacer>

config/main.cpp

@@ -29,6 +29,7 @@
 
 #include <XdgIcon>
 #include <LXQt/Settings>
+#include <QCommandLineParser>
 
 #include "mainwindow.h"
 
@@ -36,6 +37,17 @@
 int main(int argc, char** argv)
 {
     LXQt::SingleApplication a(argc, argv);
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QStringLiteral("LXQt Config Notificationd"));
+    const QString VERINFO = QStringLiteral(LXQT_NOTIFICATIOND_VERSION
+                                           "\nliblxqt   " LXQT_VERSION
+                                           "\nQt        " QT_VERSION_STR);
+    a.setApplicationVersion(VERINFO);
+    parser.addVersionOption();
+    parser.addHelpOption();
+    parser.process(a);
 
     MainWindow w;
     w.setWindowIcon(QIcon::fromTheme("preferences-desktop-theme"));

config/translations/lxqt-config-notificationd_lt.desktop

@@ -1,4 +1,4 @@
 # Translations
-GenericName[lt]=Qlipper
+GenericName[lt]=LXQt pranešimų nustatymai
-Name[lt]=Energijos naudojimo nustatymai
+Name[lt]=Darbalaukio pranešimai
-Comment[lt]=Konfigūruoti freedesktop pranešimus LXQt darbalaukyje
+Comment[lt]=Konfigūruoti darbalaukio pranešimus

config/translations/lxqt-config-notificationd_pl_PL.desktop

@@ -1,4 +1,4 @@
 # Translations
-GenericName[pl_PL]=Konfiguracja wyglądu LXQt
+Name[pl_PL]=Powiadomienia ekranowe
-Name[pl_PL]=Konfiguracja wyglądu LXQt
+GenericName[pl_PL]=Ustawienia powiadomień LXQt
-Comment[pl_PL]=Konfiguruj powiadomienia freedesktop w LXQt
+Comment[pl_PL]=Konfiguruj powiadomienia ekranowe

debian/.gitignore

@@ -1,7 +1,8 @@
 /*.debhelper
 /*.log
 /*.substvars
+/debhelper-build-stamp
 /files
 
 /lxqt-notificationd/
-/lxqt-notificationd-dbg/
+

debian/changelog

@@ -1,3 +1,12 @@
+lxqt-notificationd (0.12.0-1) experimental; urgency=medium
+
+  * Cherry-picking upstream release 0.11.0.
+  * Bumped Standards to 4.1.1 - no changes needed
+  * Bumped liblxqt dependency to >= 0.12.0
+  * Added Breaks/Replaces for lxqt-common << 0.12.0
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 24 Oct 2017 18:24:23 +0200
+
 lxqt-notificationd (0.11.1-2) unstable; urgency=medium
 
   * Bumped Standards to 4.0.0 - no changes needed

debian/control

@@ -7,14 +7,14 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper (>= 10),
                libkf5windowsystem-dev,
-               liblxqt0-dev (>= 0.11.1),
+               liblxqt0-dev (>= 0.12.0),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libx11-dev,
                qtbase5-private-dev
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/sid
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/experimental
-Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git -b debian/sid
+Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git -b debian/experimental
 Homepage: https://github.com/lxde/lxqt-notificationd
 
 Package: lxqt-notificationd
@@ -23,6 +23,8 @@ Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: lxqt-notificationd-l10n,
             lxqt-qtplugin
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
 Provides: notification-daemon
 Description: LXQt notification daemon
  The LXQt notification daemon.

debian/gbp.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/sid
+debian-branch = debian/experimental
 upstream-branch = upstream/latest
 pristine-tar = True
 

src/main.cpp

@@ -27,6 +27,7 @@
 
 #include <QApplication>
 #include <QtDBus/QDBusConnection>
+#include <QCommandLineParser>
 
 #include <LXQt/Application>
 
@@ -66,9 +67,18 @@
 int main(int argc, char** argv)
 {
     LXQt::Application a(argc, argv);
-
     a.setQuitOnLastWindowClosed(false);
 
+    QCommandLineParser parser;
+    parser.setApplicationDescription(QStringLiteral("LXQt Notification Daemon"));
+    const QString VERINFO = QStringLiteral(LXQT_NOTIFICATIOND_VERSION
+                                           "\nliblxqt   " LXQT_VERSION
+                                           "\nQt        " QT_VERSION_STR);
+    a.setApplicationVersion(VERINFO);
+    parser.addVersionOption();
+    parser.addHelpOption();
+    parser.process(a);
+
     // Ensure the helper widgets are hidden
     a.setStyleSheet(a.styleSheet() +
                 "NotificationArea {background: transparent;}"

src/notifyd.h

@@ -109,7 +109,7 @@ signals:
      */
     void NotificationClosed(uint in0, uint in1);
 
-    // singals for our implementation - internal usage
+    // signals for our implementation - internal usage
 
     /*! Promote the external request for notification closing into the display engine.
      * \param id an notification ID (obtained from \c Notify)