[Python-apps-commits] r8207 - in packages/graphite-carbon/trunk/debian (4 files)
hggh-guest at users.alioth.debian.org
hggh-guest at users.alioth.debian.org
Tue Feb 21 19:48:40 UTC 2012
Date: Tuesday, February 21, 2012 @ 19:48:39
Author: hggh-guest
Revision: 8207
fixed missing stuff
Modified:
packages/graphite-carbon/trunk/debian/carbon-cache.init
packages/graphite-carbon/trunk/debian/control
packages/graphite-carbon/trunk/debian/copyright
packages/graphite-carbon/trunk/debian/rules
Modified: packages/graphite-carbon/trunk/debian/carbon-cache.init
===================================================================
--- packages/graphite-carbon/trunk/debian/carbon-cache.init 2012-02-21 19:28:06 UTC (rev 8206)
+++ packages/graphite-carbon/trunk/debian/carbon-cache.init 2012-02-21 19:48:39 UTC (rev 8207)
@@ -60,7 +60,7 @@
}
case "$1" in
- start)
+ start)
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
do_start
case "$?" in
@@ -68,7 +68,7 @@
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
- stop)
+ stop)
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
do_stop
case "$?" in
@@ -76,14 +76,14 @@
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
do_stop
case "$?" in
- 0|1)
+ 0|1)
do_start
case "$?" in
0) log_end_msg 0 ;;
@@ -91,12 +91,12 @@
*) log_end_msg 1 ;;
esac
;;
- *)
+ *)
log_end_msg 1
;;
esac
;;
- *)
+ *)
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 3
;;
Modified: packages/graphite-carbon/trunk/debian/control
===================================================================
--- packages/graphite-carbon/trunk/debian/control 2012-02-21 19:28:06 UTC (rev 8206)
+++ packages/graphite-carbon/trunk/debian/control 2012-02-21 19:48:39 UTC (rev 8207)
@@ -13,7 +13,7 @@
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, adduser, python-whisper, python-twisted-core
Description: backend data caching and persistence daemon for Graphite
- Carbon is an Twisted daemon that handels incoming time-series
+ Carbon is an Twisted daemon that process incoming time-series
data and saves that data as Whisper database files on disc.
.
Carbon daemon is needed for an fully functional graphite-web app.
Modified: packages/graphite-carbon/trunk/debian/copyright
===================================================================
--- packages/graphite-carbon/trunk/debian/copyright 2012-02-21 19:28:06 UTC (rev 8206)
+++ packages/graphite-carbon/trunk/debian/copyright 2012-02-21 19:48:39 UTC (rev 8207)
@@ -5,11 +5,11 @@
Files: *
Copyright: 2009 - 2011, Chris Davis <chrismd at gmail.com>
-License: Apache
+License: Apache-2.0
Files: lib/carbon/amqp_publisher.py
Copyright: 2009, Lucio Torre <lucio.torre at canonical.com>
-License: Apache
+License: Apache-2.0
Comment: no license information in the file. copyright holder
has changed license to Apache on 2012-01-23.
.
@@ -19,7 +19,7 @@
Files: lib/carbon/amqp_listener.py
Copyright: 2009, Lucio Torre <lucio.torre at canonical.com>
-License: Apache
+License: Apache-2.0
Comment: no license information in the file. copyright holder
has changed license to Apache on 2012-01-23.
.
@@ -29,7 +29,7 @@
Files: lib/carbon/amqp0-8.xml
Copyright: 2009, AMQP Working Group
-License:
+License: Custom-AMQP-Working-Group
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -54,9 +54,9 @@
Files: debian/*
Copyright: 2012, Jonas Genannt <jonas.genannt at capi2name.de>
-License: Apache
+License: Apache-2.0
-License: Apache
+License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Modified: packages/graphite-carbon/trunk/debian/rules
===================================================================
--- packages/graphite-carbon/trunk/debian/rules 2012-02-21 19:28:06 UTC (rev 8206)
+++ packages/graphite-carbon/trunk/debian/rules 2012-02-21 19:48:39 UTC (rev 8207)
@@ -4,11 +4,7 @@
dh $@ --with python2
override_dh_install:
- mv debian/graphite-carbon/usr/bin/carbon-cache.py debian/graphite-carbon/usr/bin/carbon-cache
- mv debian/graphite-carbon/usr/bin/carbon-relay.py debian/graphite-carbon/usr/bin/carbon-relay
- mv debian/graphite-carbon/usr/bin/carbon-aggregator.py debian/graphite-carbon/usr/bin/carbon-aggregator
- mv debian/graphite-carbon/usr/bin/carbon-client.py debian/graphite-carbon/usr/bin/carbon-client
- mv debian/graphite-carbon/usr/bin/validate-storage-schemas.py debian/graphite-carbon/usr/bin/validate-storage-schemas
+ rename 's/\.py//' debian/graphite-carbon/usr/bin/*.py
# clean unneeded stuff
[ -d debian/graphite-carbon/usr/conf ] && rm -r debian/graphite-carbon/usr/conf
[ -d debian/graphite-carbon/usr/storage ] && rm -r debian/graphite-carbon/usr/storage
More information about the Python-apps-commits
mailing list