[MediaWiki-commits] [Gerrit] import debian/ directory - change (operations...python-diamond)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: import debian/ directory
..
import debian/ directory
this is a replaced version of upstream's to better fit recent standards
the patches are maintained in a separate patch-queue/master branch and some are
due to be sent upstream too
Change-Id: I54de8fd3152c657b682f87785ec267f6e82f4bb6
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/diamond.conf
A debian/diamond.init
A debian/diamond.install
A debian/diamond.service
A debian/diamond.upstart
A debian/dirs
A debian/gbp.conf
A debian/patches/0001-clean-version-artifacts-in-make-clean.patch
A debian/patches/0002-numa.py-use-usr-bin-env.patch
A debian/patches/0003-numa-use-bin-true-in-tests.patch
A debian/patches/0004-make-dseopscenter-test-pass.patch
A debian/patches/0005-disable-failing-kafka-test.patch
A debian/patches/0006-remove-distro-detection-from-setup.py.patch
A debian/patches/0007-add-transitional-dastatsd.patch
A debian/patches/series
A debian/postinst
A debian/rules
A debian/source/format
22 files changed, 843 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..9b440ff
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,7 @@
+diamond (3.5-1wmf1) trusty; urgency=medium
+
+ * Import upstream 3.5
++ do not import debian/ directory from upstream, replace with our own
+ * Add transitional package python-diamond
+
+ -- Filippo Giunchedi fili...@wikimedia.org Wed, 15 Oct 2014 16:17:36 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..7ba5d0e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,25 @@
+Source: diamond
+Section: python
+Priority: optional
+Maintainer: Filippo Giunchedi fili...@wikimedia.org
+Build-Depends: debhelper (= 9), python-all (= 2.7), python-mock,
python-configobj, dh-python, dh-systemd
+Standards-Version: 3.9.6
+X-Python-Version: = 2.7
+
+Package: diamond
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-configobj, adduser
+Provides: ${python:Provides}, python-diamond
+Replaces: python-diamond (= 3.4)
+Breaks: python-diamond (= 3.4)
+Description: System statistics collector for Graphite
+ Diamond is a daemon and toolset for gathering system statistics
+ and publishing them to Graphite.
+
+Package: python-diamond
+Architecture: all
+Depends: diamond
+Priority: extra
+Section: oldlibs
+Description: transitional package for diamond
+ This is a transitional package for diamond, it can be safely removed.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..65ece65
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: diamond
+Upstream-Contact: diamond mailing list diam...@librelist.com
+Source: https://github.com/BrightcoveOS/Diamond
+
+Files: *
+Copyright: 2010-2012 by Brightcove Inc.http://www.brightcove.com/
+ 2011-2012 by Ivan Pouzyrevsky
+ 2011-2012 by Rob Smith http://www.kormoc.com
+ 2012 Wijnand Modderman-Lenstra https://maze.io/
+License: MIT
+
+Files: debian/*
+Copyright: 2014 Filippo Giunchedi fgiunch...@wikimedia.org
+ 2014 Wikimedia Foundation
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
diff --git a/debian/diamond.conf b/debian/diamond.conf
new file mode 100644
index 000..a0b69d3
--- /dev/null
+++ b/debian/diamond.conf
@@ -0,0 +1,227 @@
+
+# Diamond Configuration File
+
+
[MediaWiki-commits] [Gerrit] import debian/ directory - change (operations...python-diamond)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168599
Change subject: import debian/ directory
..
import debian/ directory
this is a replaced version of upstream's to better fit recent standards
the patches are maintained in a separate patch-queue/master branch and some are
due to be sent upstream too
Change-Id: I54de8fd3152c657b682f87785ec267f6e82f4bb6
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/diamond.conf
A debian/diamond.default
A debian/diamond.upstart
A debian/dirs
A debian/gbp.conf
A debian/patches/0001-clean-version-artifacts-in-make-clean.patch
A debian/patches/0002-numa.py-use-usr-bin-env.patch
A debian/patches/0003-numa-use-bin-true-in-tests.patch
A debian/patches/0004-make-dseopscenter-test-pass.patch
A debian/patches/0005-disable-failing-kafka-test.patch
A debian/patches/series
A debian/postinst
A debian/python-diamond.diamond.init
A debian/python-diamond.diamond.upstart
A debian/python-diamond.install
A debian/rules
A debian/source/format
21 files changed, 659 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-diamond
refs/changes/99/168599/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..fac6190
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+python-diamond (3.5-1wmf1) trusty; urgency=medium
+
+ * Import upstream 3.5
++ do not import debian/ directory from upstream, replace with our own
+
+ -- Filippo Giunchedi fgiunch...@wikimedia.org Wed, 15 Oct 2014 16:17:36
+0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..fa8be11
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: python-diamond
+Section: python
+Priority: extra
+Maintainer: Wikimedia Foundation deb...@wikimedia.org
+Build-Depends: debhelper (= 9), python-all (= 2.6.6-3), dh-python,
python-mock, python-configobj
+Standards-Version: 3.9.6
+X-Python-Version: = 2.6
+
+Package: python-diamond
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-configobj, adduser
+Provides: ${python:Provides}
+Description: System statistics collector for Graphite.
+ Diamond is a daemon and toolset for gathering system statistics
+ and publishing them to Graphite.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..074260a
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,46 @@
+Files: *
+Copyright: (C) 2010-2012 by Brightcove Inc. http://www.brightcove.com/
+ (C) 2011-2012 by Ivan Pouzyrevsky
+ (C) 2011-2012 by Rob Smithhttp://www.kormoc.com
+ (C) 2012 Wijnand Modderman-Lenstrahttps://maze.io/
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Files: debian/*
+Copyright: (C) 2014 Filippo Giunchedifgiunch...@wikimedia.org
+ (C) 2014 Wikimedia Foundation
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR
