[Debian-iot-packaging] [hoel] 02/02: Import Debian changes 1.2.1-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Thu Oct 5 20:21:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository hoel.
commit 3e82e6ce49b3661cb86763e7861ca63db36cb53e
Merge: f7091c1 1940cc8
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Thu Oct 5 19:25:48 2017 +0200
Import Debian changes 1.2.1-1
hoel (1.2.1-1) unstable; urgency=medium
* New upstream release
* debian/control: move to debian-iot group
* debian/control: bump soname of libhoel to 1.2
.gitignore | 2 +
README.md | 54 +++---
debian/changelog | 8 +
debian/control | 7 +-
debian/{libhoel1.1.install => libhoel1.2.install} | 0
debian/patches/activate-db.patch | 17 --
debian/patches/activate-db.patch.old | 21 +--
...vate-db.patch.old => activate-db.patch.old.old} | 0
debian/patches/hardening.patch | 8 +-
debian/patches/not-parallel.patch | 6 +-
debian/patches/series | 2 +-
examples/Makefile | 13 +-
examples/example_pgsql.c | 34 +++-
src/Makefile | 10 +-
src/hoel-pgsql.c | 184 +++++++++++++++++++--
src/hoel-simple-json.c | 48 ++----
src/hoel.c | 10 +-
src/hoel.h | 9 +-
test/core.c | 17 ++
19 files changed, 320 insertions(+), 130 deletions(-)
diff --cc debian/changelog
index 4ea8a77,0000000..e8c4d6f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,0 +1,23 @@@
++hoel (1.2.1-1) unstable; urgency=medium
++
++ * New upstream release
++ * debian/control: move to debian-iot group
++ * debian/control: bump soname of libhoel to 1.2
++
++ -- Thorsten Alteholz <debian at alteholz.de> Thu, 05 Oct 2017 19:25:48 +0200
++
+hoel (1.1.2-1) unstable; urgency=medium
+
+ * new upstream version
+ * change homepage URL (Closes: #869933)
+ * debian/control: bump standard to 4.1.0 (no changes)
+ * debian/control: add VCS URLs
+ * refresh patches
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sat, 02 Sep 2017 17:17:33 +0200
+
+hoel (1.1-1) unstable; urgency=medium
+
+ * Initial release
+
+ -- Thorsten Alteholz <debian at alteholz.de> Tue, 18 Jul 2017 14:32:33 +0200
diff --cc debian/control
index 3cce46f,0000000..1b78a4e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,42 -1,0 +1,43 @@@
+Source: hoel
+Section: devel
+Priority: optional
- Maintainer: Thorsten Alteholz <debian at alteholz.de>
++Maintainer: Debian IoT Maintainers <debian-iot-maintainers at lists.alioth.debian.org>
++Uploaders: Thorsten Alteholz <debian at alteholz.de>
+Build-Depends: debhelper (>= 10)
+ , liborcania-dev
+ , libyder-dev
+ , libjansson-dev
+ , libsqlite3-dev
+ , libpq-dev
+ , libmariadbclient-dev
+Standards-Version: 4.1.0
+Homepage: https://github.com/babelouest/hoel
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/hoel.git
+Vcs-Git: https://anonscm.debian.org/git/debian-iot/hoel.git
+
- Package: libhoel1.1
++Package: libhoel1.2
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: database abstraction library written in C
+ Simple and easy to use database access library. Works with SQLite 3,
+ MariaDB/Mysql and (barely) PostgreSQL databases. Uses a json-based
+ language with jansson to execute simples queries based on one table.
+
+Package: libhoel-dev
+Architecture: any
+Section: libdevel
- Depends: libhoel1.1 (= ${binary:Version})
++Depends: libhoel1.2 (= ${binary:Version})
+ , ${misc:Depends}
+ , libjansson-dev
+ , liborcania-dev
+ , libyder-dev
+ , libsqlite3-dev
+ , libpq-dev
+ , libmariadbclient-dev
+Description: database abstraction library written in C - development
+ Simple and easy to use database access library. Works with SQLite 3,
+ MariaDB/Mysql and (barely) PostgreSQL databases. Uses a json-based
+ language with jansson to execute simples queries based on one table.
+ .
+ This package contains the development files.
diff --cc debian/libhoel1.2.install
index 6ac0115,0000000..6ac0115
mode 100644,000000..100644
--- a/debian/libhoel1.2.install
+++ b/debian/libhoel1.2.install
diff --cc debian/patches/activate-db.patch.old
index a9ea34c,0000000..6c1a7d2
mode 100644,000000..100644
--- a/debian/patches/activate-db.patch.old
+++ b/debian/patches/activate-db.patch.old
@@@ -1,26 -1,0 +1,17 @@@
+Description: use sqlite as well
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: hoel-1.1/src/Makefile
++Index: hoel-1.1.2/src/Makefile
+===================================================================
- --- hoel-1.1.orig/src/Makefile 2017-05-27 02:06:41.000000000 +0200
- +++ hoel-1.1/src/Makefile 2017-07-25 13:55:04.662410701 +0200
- @@ -24,13 +24,14 @@
- FLAGS_SQLITE=-D_HOEL_SQLITE
- LIBS_SQLITE=-lsqlite3
++--- hoel-1.1.2.orig/src/Makefile 2017-09-03 12:48:33.213390633 +0200
+++++ hoel-1.1.2/src/Makefile 2017-09-03 12:48:47.950054099 +0200
++@@ -29,8 +29,8 @@
++ LIBS_MARIADB=$(shell mysql_config --libs)
+
- -# uncomment these lines if you want sqlite support
- +# uncomment these lines if you want mariadb support
- FLAGS_MARIADB=-D_HOEL_MARIADB -I/usr/include/mysql/
- -LIBS_MARIADB=-lmysqlclient
- +#LIBS_MARIADB=-lmysqlclient
- +LIBS_MARIADB=-lmariadbclient
-
- -# uncomment these lines if you want sqlite support
++ # comment/uncomment these lines to disable/enable postgresql support
+-# FLAGS_PGSQL=-D_HOEL_PGSQL -I/usr/include/postgresql/
+-# LIBS_PGSQL=-lpq
- +# uncomment these lines if you want postgresql support
++FLAGS_PGSQL=-D_HOEL_PGSQL -I/usr/include/postgresql/
++LIBS_PGSQL=-lpq
+
+ PREFIX=/usr/local
+ CFLAGS=-c -fPIC -Wall -I$(PREFIX)/include $(FLAGS_SQLITE) $(FLAGS_MARIADB) $(FLAGS_PGSQL) -D_REENTRANT $(ADDITIONALFLAGS)
diff --cc debian/patches/activate-db.patch.old.old
index a9ea34c,0000000..a9ea34c
mode 100644,000000..100644
--- a/debian/patches/activate-db.patch.old.old
+++ b/debian/patches/activate-db.patch.old.old
diff --cc debian/patches/hardening.patch
index 8337cb6,0000000..e8b5706
mode 100644,000000..100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@@ -1,24 -1,0 +1,24 @@@
+Description: add hardening flags
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: hoel-1.1.2/src/Makefile
++Index: hoel-1.2.1/src/Makefile
+===================================================================
- --- hoel-1.1.2.orig/src/Makefile 2017-09-03 12:49:31.484014093 +0200
- +++ hoel-1.1.2/src/Makefile 2017-09-03 12:49:31.480013913 +0200
++--- hoel-1.2.1.orig/src/Makefile 2017-10-05 19:32:26.552561322 +0200
+++++ hoel-1.2.1/src/Makefile 2017-10-05 19:32:26.548561181 +0200
+@@ -33,7 +33,7 @@
+ LIBS_PGSQL=-lpq
+
+ PREFIX=/usr/local
+-CFLAGS=-c -fPIC -Wall -I$(PREFIX)/include $(FLAGS_SQLITE) $(FLAGS_MARIADB) $(FLAGS_PGSQL) -D_REENTRANT $(ADDITIONALFLAGS)
++CFLAGS+=-c -fPIC -Wall -I$(PREFIX)/include $(FLAGS_SQLITE) $(FLAGS_MARIADB) $(FLAGS_PGSQL) -D_REENTRANT $(ADDITIONALFLAGS) $(CPPFLAGS)
+ LIBS=-L$(PREFIX)/lib -lc -ljansson -lyder -lorcania $(LIBS_SQLITE) $(LIBS_PGSQL) $(LIBS_MARIADB)
+ OUTPUT=libhoel.so
- VERSION=1.1.1
++ VERSION=1.2
+@@ -56,7 +56,7 @@
+ $(CC) $(CFLAGS) hoel-simple-json.c
+
+ libhoel.so: hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o
+- $(CC) -shared -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION) hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o $(LIBS)
++ $(CC) -shared -Wl,-soname,$(OUTPUT).$(VERSION) -o $(OUTPUT).$(VERSION) hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o $(LIBS) $(LDFLAGS)
+ ln -sf $(OUTPUT).$(VERSION) $(OUTPUT)
+
+ libhoel.a: hoel-sqlite.o hoel-mariadb.o hoel-pgsql.o hoel-simple-json.o hoel.o
diff --cc debian/patches/not-parallel.patch
index 3f68781,0000000..cf91f03
mode 100644,000000..100644
--- a/debian/patches/not-parallel.patch
+++ b/debian/patches/not-parallel.patch
@@@ -1,14 -1,0 +1,14 @@@
+Description: do not build targets in parallel
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: hoel-1.1/Makefile
++Index: hoel-1.2.1/Makefile
+===================================================================
- --- hoel-1.1.orig/Makefile 2017-05-27 02:06:41.000000000 +0200
- +++ hoel-1.1/Makefile 2017-07-25 13:36:11.710340739 +0200
++--- hoel-1.2.1.orig/Makefile 2017-10-05 19:32:39.185004617 +0200
+++++ hoel-1.2.1/Makefile 2017-10-05 19:32:39.181004476 +0200
+@@ -18,6 +18,7 @@
+ EXAMPLE_LOCATION=./examples
+ TEST_LOCATION=./test
+
++.NOTPARALLEL:
+ all: libhoel.so example_sqlite3 example_mariadb example_pgsql
+
+ debug:
diff --cc debian/patches/series
index 7cbcc20,0000000..a38c596
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,3 @@@
- activate-db.patch
++#applied upstream: activate-db.patch
+hardening.patch
+not-parallel.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/hoel.git
More information about the Debian-iot-packaging
mailing list