mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-09 16:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixes for dependency packages, fix upstart script" from Takuya

Browse Source 
"Fixes #510, (part of) #493."
This commit is contained in:
Pekka Enberg
2015-10-30 15:41:40 +02:00
parent a3d26f699e 3bf69db90c
commit a9a8d1e8a2
7 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
scylla-server (0.10-1) unstable; urgency=medium
scylla-server (0.10-ubuntu1) trusty; urgency=medium
* Initial release.

6
debian/scylla-server.upstart vendored
View File

@@ -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

2
dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/changelog vendored
View File

@@ -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.

4
dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/control vendored
View File

@@ -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.

2
dist/ubuntu/dep/antlr3-tool-3.5.2/debian/changelog vendored
View File

@@ -1,4 +1,4 @@
antlr3-tool (3.5.2-1) unstable; urgency=medium
antlr3-tool (3.5.2-ubuntu1) trusty; urgency=medium
* Initial release.

4
dist/ubuntu/dep/antlr3-tool-3.5.2/debian/control vendored
View File

@@ -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.

84
dist/ubuntu/dep/thrift.diff vendored
View File

@@ -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 <roger@apache.org> Tue, 08 Jan 2013 22:40:12 +0100
-
-thrift (0.9.0) stable; urgency=low
-
- * update to 0.9.0
-
- -- Jake Farrell <jfarrell@apache.org> Wed, 10 Oct 2012 12:00:00 -0500
-
-thrift (0.7.0) stable; urgency=low
-
- * update to 0.7.0
-
- -- Jake Farrell <jfarrell@apache.org> 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 <roger@apache.org> 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 <roger@apache.org> 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 <yamashita@geishatokyo.com> 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 <yamashita@geishatokyo.com> Tue, 07 Dec 2010 01:00:17 +0900
-
-thrift (0.5.0) stable; urgency=low
-
- * update to 0.5.0
-
- -- Roger Meier <roger@apache.org> Fri, 08 Oct 2010 11:23:53 +0200
-
-thrift (0.4.0) stable; urgency=low
-
- * update to 0.4.0
-
- -- Roger Meier <roger@bufferoverflow.ch> Sun, 22 Aug 2010 21:26:00 +0100
-
-thrift (0.2008.12.30~8.04) hardy; urgency=low
-
- * Initial release.
-
- -- Esteve Fernandez <esteve@fluidinfo.com> Thu, 15 Jan 2009 11:34:24 +0100
+ -- Takuya ASADA <syuu@scylladb.com> 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