Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hello, please unblock graphite-carbon 0.9.10-3 from sid. The new version fixes two bugs (#696228): - internal carbon logrotate confuses logrotated (eats up disc space) - on upgrade/reinstall postinst script hangs because of missing db_stop Please see attached debdiff. Thanks, Jonas -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBCAAGBQJQ+tZMAAoJEPBM7/YBbP/Qjy4P/3K1FcfWND0VU8yFW7fSzrrb AA/G+85mxVRl1vppA+WXQkFGwkFs/dLEOW5CxcYyfFJFGgoy8pb1rldFgpB0xGVO WAzGTatSdHPFL25gNliJWcg8KZMnWAfBdCdFiQ9vcjgopXZ6ACIbqAm5U1Rn6HWI GE0QRMUkJG/ntxSpiZ7VxfVYqVXZLVGUgZY2ObT4BBvyihzU5GNARtTNBNuFvsOa Ig5TMyjTV4NuED9iEl5jhmE1FAdxTRA5wy/gDQ4rU6xcIT9u+WQ/2YZZRjL7bLi7 2zROMJIU8qoLXGRCD/nWgJ3KxfJROAdTLIN+r1jiO04Zc/HtvVJyxt9MiNRcSVMI PWeDuMAsC9V83v5Rl58OF1LUK3mktOREGmoOyCVpCUy2YRalIJv3ZkNkLHZYHAg/ Q/4CHe41Xc0KHQcUldJ/Gf/W56VD/2PDanTq1Q5vfTnlilmrSxpC0iMjjwdg7vrE MBMRQFpmffmQdKdxV1Y65NUaAC077zjkLxartKws9vrILxsikcIeGQOaQlf9G6QG EWn8K5jW4nHg2eSsvXB8JRYufmHspTMO9BYqoHlXLMHDq/FWETaFn1nV0rz9tZhu B3mzQh6uZqJ8yCzHm93uv5ZXp5db+/nzl5nr0dYIb0SrxPTwzr8VdYMWRqfdQSlK uJS9KXBP6q+gYKQH4pmk =GlsV -----END PGP SIGNATURE-----
diff -Nru graphite-carbon-0.9.10/debian/changelog graphite-carbon-0.9.10/debian/changelog --- graphite-carbon-0.9.10/debian/changelog 2012-06-09 15:13:04.000000000 +0200 +++ graphite-carbon-0.9.10/debian/changelog 2013-01-19 17:57:03.000000000 +0100 @@ -1,3 +1,19 @@ +graphite-carbon (0.9.10-3) unstable; urgency=low + + * d/postinst: added db_stop to ensure correct restart of carbon + daemon (Closes: #696228) + * Added patch to disable internal logrotation of Carbon (Closes: #696228) + + -- Jonas Genannt <[email protected]> Sat, 19 Jan 2013 17:53:15 +0100 + +graphite-carbon (0.9.10-2) unstable; urgency=low + + * Added Japanese translation by victory <[email protected]> + (Closes: #692206) + * d/control: bumped standards version + + -- Jonas Genannt <[email protected]> Sun, 18 Nov 2012 13:58:17 +0100 + graphite-carbon (0.9.10-1) unstable; urgency=low * Adding upstream version 0.9.10. diff -Nru graphite-carbon-0.9.10/debian/control graphite-carbon-0.9.10/debian/control --- graphite-carbon-0.9.10/debian/control 2012-06-09 15:13:04.000000000 +0200 +++ graphite-carbon-0.9.10/debian/control 2013-01-19 17:57:03.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Jonas Genannt <[email protected]> Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 DM-Upload-Allowed: yes Homepage: https://launchpad.net/graphite diff -Nru graphite-carbon-0.9.10/debian/graphite-carbon.postinst graphite-carbon-0.9.10/debian/graphite-carbon.postinst --- graphite-carbon-0.9.10/debian/graphite-carbon.postinst 2012-06-09 15:13:04.000000000 +0200 +++ graphite-carbon-0.9.10/debian/graphite-carbon.postinst 2013-01-19 17:57:03.000000000 +0100 @@ -19,4 +19,6 @@ done fi +db_stop + #DEBHELPER# diff -Nru graphite-carbon-0.9.10/debian/patches/disable_internal_logroate.patch graphite-carbon-0.9.10/debian/patches/disable_internal_logroate.patch --- graphite-carbon-0.9.10/debian/patches/disable_internal_logroate.patch 1970-01-01 01:00:00.000000000 +0100 +++ graphite-carbon-0.9.10/debian/patches/disable_internal_logroate.patch 2013-01-19 17:57:03.000000000 +0100 @@ -0,0 +1,31 @@ +Description: disable internal Carbon logrotate, use logrotate #696228 +Author: Jonas Genannt <[email protected]> + +--- a/lib/carbon/log.py ++++ b/lib/carbon/log.py +@@ -3,14 +3,14 @@ + from zope.interface import implements + from twisted.python.log import startLoggingWithObserver, textFromEventDict, msg, err, ILogObserver + from twisted.python.syslog import SyslogObserver +-from twisted.python.logfile import DailyLogFile ++from twisted.python.logfile import LogFile + + class CarbonLogObserver(object): + implements(ILogObserver) + + def log_to_dir(self, logdir): + self.logdir = logdir +- self.console_logfile = DailyLogFile('console.log', logdir) ++ self.console_logfile = LogFile('console.log', logdir, maxRotatedFiles=None, rotateLength=None) + self.custom_logs = {} + self.observer = self.logdir_observer + +@@ -33,7 +33,7 @@ + log_type = event.get('type') + + if log_type is not None and log_type not in self.custom_logs: +- self.custom_logs[log_type] = DailyLogFile(log_type + '.log', self.logdir) ++ self.custom_logs[log_type] = LogFile(log_type + '.log', self.logdir, maxRotatedFiles=None, rotateLength=None) + + logfile = self.custom_logs.get(log_type, self.console_logfile) + logfile.write(message + '\n') diff -Nru graphite-carbon-0.9.10/debian/patches/series graphite-carbon-0.9.10/debian/patches/series --- graphite-carbon-0.9.10/debian/patches/series 2012-06-09 15:13:04.000000000 +0200 +++ graphite-carbon-0.9.10/debian/patches/series 2013-01-19 17:57:03.000000000 +0100 @@ -1,3 +1,4 @@ disable_install_opt.patch carbon.conf.debian.patch validate-storage-schemas.debian.patch +disable_internal_logroate.patch diff -Nru graphite-carbon-0.9.10/debian/po/ja.po graphite-carbon-0.9.10/debian/po/ja.po --- graphite-carbon-0.9.10/debian/po/ja.po 1970-01-01 01:00:00.000000000 +0100 +++ graphite-carbon-0.9.10/debian/po/ja.po 2013-01-19 17:57:03.000000000 +0100 @@ -0,0 +1,42 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# victory <[email protected]>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: graphite-carbon\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2012-06-16 17:51+0000\n" +"PO-Revision-Date: 2012-06-17 02:51+0900\n" +"Last-Translator: victory <[email protected]>\n" +"Language-Team: Japanese <[email protected]>\n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../graphite-carbon.templates:2001 +msgid "Remove database files when purging graphite-carbon?" +msgstr "graphite-carbon の完全削除でデータベースファイルを削除しますか?" + +#. Type: boolean +#. Description +#: ../graphite-carbon.templates:2001 +msgid "" +"The /var/lib/graphite/whisper directory contains the whisper database files." +msgstr "" +"/var/lib/graphite/whisper ディレクトリに whisper のデータベースファイルがあり" +"ます。" + +#. Type: boolean +#. Description +#: ../graphite-carbon.templates:2001 +msgid "" +"You may want to keep these database files even if you completely remove " +"graphite-carbon, in case you plan to reinstall it later." +msgstr "" +"graphite-carbon を完全に削除する場合でも、後で再インストールする予定であれば" +"データベースファイルは残しておくのがいいかもしれません。"
