From 9eb8aa7ea31def746e554c6e4b5bb3933aae554a Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 30 Oct 2015 00:51:42 +0900 Subject: [PATCH 1/5] dist: fix warning when building antlr3-tool ubuntu package --- dist/ubuntu/dep/antlr3-tool-3.5.2/debian/changelog | 2 +- dist/ubuntu/dep/antlr3-tool-3.5.2/debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/changelog b/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/changelog index 48aea2b3cd..5dcdf4bead 100644 --- a/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/changelog +++ b/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/changelog @@ -1,4 +1,4 @@ -antlr3-tool (3.5.2-1) unstable; urgency=medium +antlr3-tool (3.5.2-ubuntu1) trusty; urgency=medium * Initial release. diff --git a/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/control b/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/control index 7964044672..a3fcb95b7a 100644 --- a/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/control +++ b/dist/ubuntu/dep/antlr3-tool-3.5.2/debian/control @@ -8,5 +8,5 @@ Build-Depends: debhelper (>= 9) Package: antlr3-tool Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-7-jre-headless -Description: antlr3-tool - antlr3-tool +Description: language tool for constructing recognizers, compilers etc + A language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions containing actions in a variety of target languages. From a165d6aa0129e06d18ef8393073e068e780dab7f Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 30 Oct 2015 00:52:00 +0900 Subject: [PATCH 2/5] dist: fix warning when building antlr3-c++-dev ubuntu package --- dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/changelog | 2 +- dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/changelog b/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/changelog index a135faa088..6b3d4eb176 100644 --- a/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/changelog +++ b/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/changelog @@ -1,4 +1,4 @@ -antlr3-c++-dev (3.5.2-1) unstable; urgency=medium +antlr3-c++-dev (3.5.2-ubuntu1) trusty; urgency=medium * Initial release. diff --git a/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/control b/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/control index cc78d948fa..632b32a677 100644 --- a/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/control +++ b/dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/control @@ -8,5 +8,5 @@ Build-Depends: debhelper (>= 9) Package: antlr3-c++-dev Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Description: antlr3-c++-dev - antlr3-c++-dev +Description: language tool for constructing recognizers, compilers etc + A language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions containing actions in a variety of target languages. From 37e00d3527d56151eca6311e11c859b970ea294f Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 30 Oct 2015 00:52:11 +0900 Subject: [PATCH 3/5] dist: fix warning when building thrift ubuntu package --- dist/ubuntu/dep/thrift.diff | 84 ++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-) diff --git a/dist/ubuntu/dep/thrift.diff b/dist/ubuntu/dep/thrift.diff index 73e47241fe..080cb5c59b 100644 --- a/dist/ubuntu/dep/thrift.diff +++ b/dist/ubuntu/dep/thrift.diff @@ -1,6 +1,78 @@ -diff -Nur debian/control /root/thrift-0.9.1/debian/control ---- debian/control 2013-08-18 14:58:22.000000000 +0000 -+++ /root/thrift-0.9.1/debian/control 2015-09-29 12:17:18.000000000 +0000 +diff -Nur ./debian/changelog ../thrift-0.9.1/debian/changelog +--- ./debian/changelog 2013-08-15 23:04:29.000000000 +0900 ++++ ../thrift-0.9.1/debian/changelog 2015-10-29 23:03:25.797937232 +0900 +@@ -1,65 +1,4 @@ +-thrift (1.0.0-dev) stable; urgency=low +- * update version +- * fix libthrift0.install ++thrift (0.9.1-ubuntu1) trusty; urgency=medium ++ * Make it able to build on Ubuntu 14.04LTS + +- -- Roger Meier Tue, 08 Jan 2013 22:40:12 +0100 +- +-thrift (0.9.0) stable; urgency=low +- +- * update to 0.9.0 +- +- -- Jake Farrell Wed, 10 Oct 2012 12:00:00 -0500 +- +-thrift (0.7.0) stable; urgency=low +- +- * update to 0.7.0 +- +- -- Jake Farrell Tue, 10 Aug 2011 17:01:53 -0500 +- +-thrift (0.7.0-dev1) stable; urgency=low +- * added glib +- * fix location of libthrift.jar +- +- -- Roger Meier Tue, 12 Apr 2011 21:41:18 +0200 +- +-thrift (0.6.0-dev1) stable; urgency=low +- +- * update version field +- * added debian folder to thrift/contrib +- * changed a few details in control file +- * update copyright file +- +- -- Roger Meier Tue, 14 Dec 2010 12:12:33 -0800 +- +-thrift (0.5.0+nmu2) stable; urgency=low +- +- * Non-maintainer upload. +- * Merged THRIFT-71_v9.patch to skip ./bootstrap.sh if not exists. +- https://issues.apache.org/jira/secure/attachment/12465360/THRIFT-71_v9.patch +- +- -- Yamashita Yuu Tue, 07 Dec 2010 15:00:55 +0900 +- +-thrift (0.5.0+nmu1) stable; urgency=low +- +- * Non-maintainer upload. +- * Imported package information for php5-thrift from https://github.com/simplegeo/thrift. +- +- -- Yamashita Yuu Tue, 07 Dec 2010 01:00:17 +0900 +- +-thrift (0.5.0) stable; urgency=low +- +- * update to 0.5.0 +- +- -- Roger Meier Fri, 08 Oct 2010 11:23:53 +0200 +- +-thrift (0.4.0) stable; urgency=low +- +- * update to 0.4.0 +- +- -- Roger Meier Sun, 22 Aug 2010 21:26:00 +0100 +- +-thrift (0.2008.12.30~8.04) hardy; urgency=low +- +- * Initial release. +- +- -- Esteve Fernandez Thu, 15 Jan 2009 11:34:24 +0100 ++ -- Takuya ASADA Wed, 28 Oct 2015 05:11:38 +0900 +diff -Nur ./debian/control ../thrift-0.9.1/debian/control +--- ./debian/control 2013-08-18 23:58:22.000000000 +0900 ++++ ../thrift-0.9.1/debian/control 2015-10-28 00:54:05.950464999 +0900 @@ -1,12 +1,10 @@ Source: thrift Section: devel @@ -133,9 +205,9 @@ diff -Nur debian/control /root/thrift-0.9.1/debian/control - build services that work efficiently and seamlessly. - . - This package contains the PHP bindings for Thrift. -diff -Nur debian/rules /root/thrift-0.9.1/debian/rules ---- debian/rules 2013-08-15 14:04:29.000000000 +0000 -+++ /root/thrift-0.9.1/debian/rules 2015-09-29 12:32:28.000000000 +0000 +diff -Nur ./debian/rules ../thrift-0.9.1/debian/rules +--- ./debian/rules 2013-08-15 23:04:29.000000000 +0900 ++++ ../thrift-0.9.1/debian/rules 2015-10-28 00:54:05.950464999 +0900 @@ -45,18 +45,6 @@ # Compile C (glib) library $(MAKE) -C $(CURDIR)/lib/c_glib From 6aac9445889109cbdad9c773660bc477b628eeca Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 30 Oct 2015 00:53:20 +0900 Subject: [PATCH 4/5] dist: fix warning when building scylla-server ubuntu package --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a5f234be4..9fccc6b6e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scylla-server (0.10-1) unstable; urgency=medium +scylla-server (0.10-ubuntu1) trusty; urgency=medium * Initial release. From 3bf69db90cfacc6ba98d73be6dd0ab724d78c73d Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Fri, 30 Oct 2015 00:55:27 +0900 Subject: [PATCH 5/5] dist: handle SIGKILL correctly on upstart, also do not respawn process Fixes #510 --- debian/scylla-server.upstart | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/scylla-server.upstart b/debian/scylla-server.upstart index a075ec6a11..0957d2f291 100644 --- a/debian/scylla-server.upstart +++ b/debian/scylla-server.upstart @@ -7,12 +7,8 @@ description "ScyllaDB server" start on runlevel [2345] stop on runlevel [!2345] -respawn -respawn limit 10 5 umask 022 -expect fork - console log pre-start script @@ -26,7 +22,7 @@ script cd /var/lib/scylla . /etc/default/scylla-server export OPTS_FILE NETWORK_MODE TAP BRIDGE ETHDRV ETHPCIID NR_HUGEPAGES USER GROUP SCYLLA_ARGS - /usr/lib/scylla/scylla_run + exec /usr/lib/scylla/scylla_run end script post-stop script