diff -Nru rtags-2.33/debian/changelog rtags-2.33/debian/changelog --- rtags-2.33/debian/changelog 2019-07-22 21:52:22.000000000 +0000 +++ rtags-2.33/debian/changelog 2019-07-26 21:06:22.000000000 +0000 @@ -1,3 +1,12 @@ +rtags (2.33-2) unstable; urgency=medium + + * cherry-pick updated changelog from upstream + * update d/copyright + * refine description of systemd unit files in README.Debian + * update Standards-Version to 4.4.0 (no changes needed) + + -- Denis Danilov Fri, 26 Jul 2019 23:06:22 +0200 + rtags (2.33-1) unstable; urgency=medium * New upstream version 2.33 diff -Nru rtags-2.33/debian/control rtags-2.33/debian/control --- rtags-2.33/debian/control 2019-07-22 21:52:22.000000000 +0000 +++ rtags-2.33/debian/control 2019-07-26 21:06:22.000000000 +0000 @@ -11,7 +11,7 @@ llvm-7, pkg-config, zlib1g-dev -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Homepage: https://github.com/Andersbakken/rtags Vcs-Browser: https://salsa.debian.org/emacsen-team/rtags Vcs-Git: https://salsa.debian.org/emacsen-team/rtags.git diff -Nru rtags-2.33/debian/copyright rtags-2.33/debian/copyright --- rtags-2.33/debian/copyright 2019-07-22 21:52:22.000000000 +0000 +++ rtags-2.33/debian/copyright 2019-07-26 21:06:22.000000000 +0000 @@ -3,14 +3,14 @@ Source: https://github.com/Andersbakken/rtags Files: * -Copyright: 2011-2018 Anders Bakken - 2011-2018 Jan Erik Hanssen - 2015-2017 Christian Schwarzgruber +Copyright: 2011-2019 Anders Bakken + 2011-2019 Jan Erik Hanssen + 2015-2019 Christian Schwarzgruber License: GPL-3+ Files: src/rct/* -Copyright: 2012-2016 Anders Bakken - 2012-2016 Jan Erik Hanssen +Copyright: 2012-2019 Anders Bakken + 2012-2018 Jan Erik Hanssen License: BSD-4-Clause Files: src/rct/cJSON/* @@ -26,7 +26,7 @@ License: Expat Files: debian/* -Copyright: 2018 Denis Danilov +Copyright: 2018-2019 Denis Danilov License: GPL-3+ License: GPL-3+ diff -Nru rtags-2.33/debian/patches/0014-update-changelog.patch rtags-2.33/debian/patches/0014-update-changelog.patch --- rtags-2.33/debian/patches/0014-update-changelog.patch 1970-01-01 00:00:00.000000000 +0000 +++ rtags-2.33/debian/patches/0014-update-changelog.patch 2019-07-26 21:06:22.000000000 +0000 @@ -0,0 +1,25 @@ +From: Anders Bakken +Date: Fri, 21 Jun 2019 13:07:26 -0700 +Subject: update changelog + +--- + CHANGELOG | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/CHANGELOG b/CHANGELOG +index f307d99..8378b37 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,12 @@ ++2.33 ++========================= ++- Rework how daemons work. Make it possible to separately configure ++ how many daemons you have ++ ++2.32 ++========================= ++- Try to reduce memory usage with --rp-daemon ++ + 2.31 + ========================= + - Remove experimental lua support. It never worked correctly and I diff -Nru rtags-2.33/debian/patches/series rtags-2.33/debian/patches/series --- rtags-2.33/debian/patches/series 2019-07-22 21:52:22.000000000 +0000 +++ rtags-2.33/debian/patches/series 2019-07-26 21:06:22.000000000 +0000 @@ -11,3 +11,4 @@ 0011-make-build-reproducible.patch 0012-run-nosetests-with-system-binaries.patch 0013-drop-enable-compiler-manager.patch +0014-update-changelog.patch diff -Nru rtags-2.33/debian/rtags.README.Debian rtags-2.33/debian/rtags.README.Debian --- rtags-2.33/debian/rtags.README.Debian 2019-07-22 21:52:22.000000000 +0000 +++ rtags-2.33/debian/rtags.README.Debian 2019-07-26 21:06:22.000000000 +0000 @@ -16,7 +16,12 @@ to the `~/.config/rtags/rdmrc` file. -To manually start the `rtags-rdm` indexer, run `rtags-rdm` in a shell. +For users of `systemd` service manager, `rtags` package ships +user-mode unit files, where `rdm.service` service is socket activated. +You can check its current status by running the following commands: + + systemctl --user status rdm.socket + systemctl --user status rdm.service Emacs with `elpa-rtags` package can automatically start the indexer process unless the process is already running with the function @@ -25,8 +30,4 @@ (add-hook 'c-mode-hook 'rtags-start-process-unless-running) (add-hook 'c++-mode-hook 'rtags-start-process-unless-running) -Finally, users of `systemd` service manager can use the units shipped -within the `rtags` package by running the following commands: - - systemctl --user enable rdm.socket - systemctl --user start rdm.socket +To manually start the `rtags-rdm` indexer, run `rtags-rdm` in a shell.