Skip to content

Commit 1b22d0c

Browse files
jul-stasjul-stas
committed
packaging: DEB build adapted to Scylla
1 parent c3bde56 commit 1b22d0c

15 files changed

+74
-58
lines changed

‎packaging/README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,13 @@ cat licenses/* > LICENSE.txt
1919
cd packaging/
2020
./build_rpm.sh
2121
```
22+
23+
## On a clean Ubuntu 18
24+
25+
```
26+
sudo apt-get update
27+
sudo apt-get install -y libuv1-dev openssl cmake make g++ git devscripts debhelper dh-exec libssl-dev zlib1g-dev
28+
git clone https://github.com/scylladb/cpp-driver.git
29+
cd cpp-driver/packaging
30+
./build_deb.sh
31+
```

‎packaging/build_deb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ check_command "lsb_release" "lsb-release"
3737
version=$(header_version "../include/cassandra.h")
3838
release=1
3939
dist=$(lsb_release -s -c)
40-
base="cassandra-cpp-driver-$version"
40+
base="scylla-cpp-driver-$version"
4141
archive="$base.tar.gz"
4242
files="CMakeLists.txt cmake cmake_uninstall.cmake.in driver_config.hpp.in include src"
4343

‎packaging/debian/cassandra-cpp-driver-dev.install‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎packaging/debian/cassandra-cpp-driver-dev.links‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packaging/debian/cassandra.pc‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎packaging/debian/cassandra_static.pc‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎packaging/debian/changelog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cassandra-cpp-driver (1.0.0-1) stable; urgency=low
1+
scylla-cpp-driver (1.0.0-1) stable; urgency=low
22

33
* Initial release
44

‎packaging/debian/control‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
Source: cassandra-cpp-driver
1+
Source: scylla-cpp-driver
22
Priority: extra
3-
Maintainer: Michael Penick <michael.penick@datastax.com>
3+
Maintainer: Juliusz Stasiewicz <juliusz.stasiewicz@scylladb.com>
44
Build-Depends: debhelper (>= 9.0.0), dh-exec, cmake, make,
55
libuv1-dev (>= 1.0.0),
66
libssl-dev
77
Standards-Version: 3.9.2
88
Section: libs
9-
Homepage: http://datastax.github.io/cpp-driver/
10-
Vcs-Git: git://github.com/datastax/cpp-driver.git
11-
Vcs-Browser: https://github.com/datastax/cpp-driver
9+
Homepage: https://github.com/scylladb/cpp-driver
10+
Vcs-Git: git://github.com/scylladb/cpp-driver.git
11+
Vcs-Browser: https://github.com/scylladb/cpp-driver
1212

13-
Package: cassandra-cpp-driver
13+
Package: scylla-cpp-driver
1414
Section: libs
1515
Architecture: any
1616
Pre-Depends: multiarch-support, ${misc:Pre-Depends}
1717
Depends: ${shlibs:Depends}, ${misc:Depends}
18-
Description: C/C++ client driver for Apache Cassandra and DataStax Products - runtime library
19-
A modern, feature-rich, and highly tunable C/C++ client library for Apache
18+
Description: C/C++ client driver for Scylla, Apache Cassandra and DataStax Products - runtime library
19+
A modern, feature-rich, shard-aware and highly tunable C/C++ client library for Scylla, Apache
2020
Cassandra and DataStax Products using Cassandra's native protocol and Cassandra Query
2121
Language along with extensions for DataStax Products.
2222

23-
Package: cassandra-cpp-driver-dev
23+
Package: scylla-cpp-driver-dev
2424
Section: libdevel
2525
Architecture: any
26-
Depends: cassandra-cpp-driver (= ${binary:Version}), ${misc:Depends}
27-
Description: C/C++ client driver for Apache Cassandra and DataStax Products - development files
28-
A modern, feature-rich, and highly tunable C/C++ client library for Apache
26+
Depends: scylla-cpp-driver (= ${binary:Version}), ${misc:Depends}
27+
Description: C/C++ client driver for Scylla, Apache Cassandra and DataStax Products - development files
28+
A modern, feature-rich, shard-aware and highly tunable C/C++ client library for Scylla, Apache
2929
Cassandra and DataStax Products using Cassandra's native protocol and Cassandra Query
3030
Language along with extensions for DataStax Products.
3131

32-
Package: cassandra-cpp-driver-dbg
32+
Package: scylla-cpp-driver-dbg
3333
Section: debug
3434
Architecture: any
35-
Depends: cassandra-cpp-driver (= ${binary:Version}), ${misc:Depends}
36-
Description: C/C++ client driver for Apache Cassandra and DataStax Products - debugging symbols
37-
A modern, feature-rich, and highly tunable C/C++ client library for Apache
35+
Depends: scylla-cpp-driver (= ${binary:Version}), ${misc:Depends}
36+
Description: C/C++ client driver for Scylla, Apache Cassandra and DataStax Products - debugging symbols
37+
A modern, feature-rich, shard-aware and highly tunable C/C++ client library for Scylla, Apache
3838
Cassandra and DataStax Products using Cassandra's native protocol and Cassandra Query
3939
Language along with extensions for DataStax Products.

‎packaging/debian/copyright‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
Format: http://dep.debian.net/deps/dep5
2-
Upstream-Name: cassandra-cpp-driver
3-
Source: https://github.com/datastax/cpp-driver
2+
Upstream-Name: scylla-cpp-driver
3+
Source: https://github.com/scylladb/cpp-driver
44

55
Files: *
66
Copyright: Copyright (c) DataStax, Inc.
7-
License: Apache-2.0
7+
Copyright (c) 2020 ScyllaDB
8+
License: Apache-2.0, AGPL-3
89
On Debian systems, the complete text of the Apache License Version 2.0
910
can be found in `/usr/share/common-licenses/Apache-2.0'.
1011

@@ -25,3 +26,7 @@ License: MIT
2526
Files: src/third_party/curl/*
2627
Copyright: Copyright (C) 1998 - 2012, Daniel Stenberg, <[email protected]>, et al.
2728
License: MIT
29+
30+
Files: src/optional/optional_akrzemi.hpp
31+
Copyright: Copyright (C) 2011 - 2012 Andrzej Krzemienski
32+
License: Boost Software License 1.0

‎packaging/debian/rules‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif
1414
export SOVER ?= $(shell dpkg-parsechangelog \
1515
| sed -rne 's/^Version: ([0-9.]+)([-+~][[:alpha:]][[:alnum:]]*)?([-+~][[:digit:]])?$$/\1\2/p' \
1616
| sed 's/[+~]/-/')
17-
export SONAME=libcassandra.so.$(SOVER)
17+
export SONAME=libscylla-cpp-driver.so.$(SOVER)
1818

1919
%:
2020
dh $@
@@ -29,9 +29,9 @@ override_dh_auto_build:
2929
dh_auto_build -- -j$(NUMJOBS)
3030

3131
override_dh_strip:
32-
dh_strip --dbg-package=cassandra-cpp-driver-dbg
33-
sed -i s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/ debian/cassandra-cpp-driver-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
34-
sed -i s/@DEB_VERSION_UPSTREAM@/$(DEB_VERSION_UPSTREAM)/ debian/cassandra-cpp-driver-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
32+
dh_strip --dbg-package=scylla-cpp-driver-dbg
33+
sed -i s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/ debian/scylla-cpp-driver-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
34+
sed -i s/@DEB_VERSION_UPSTREAM@/$(DEB_VERSION_UPSTREAM)/ debian/scylla-cpp-driver-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
3535

3636
override_dh_makeshlibs:
3737
dh_makeshlibs -V

0 commit comments

Comments
 (0)