diff --git a/debian/.gitignore b/debian/.gitignore index cf96ff5..558af68 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,7 +1,8 @@ /*.debhelper /*.log /*.substvars +/debhelper-build-stamp /files /lxqt-notificationd/ -/lxqt-notificationd-dbg/ + diff --git a/debian/changelog b/debian/changelog index 91115e5..11953fe 100644 --- a/debian/changelog +++ b/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 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 diff --git a/debian/control b/debian/control index 4427cb4..046c45d 100644 --- a/debian/control +++ b/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 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git -b debian/sid +Standards-Version: 4.1.1 +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/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. diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True