[Debian-iot-packaging] [hoel] 02/02: Import Debian changes 1.1-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Mon Aug 28 20:02:41 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 40e444eef3bd6376b7996db06e1ca44adafa4b2a
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Tue Jul 18 14:32:33 2017 +0200
Import Debian changes 1.1-1
hoel (1.1-1) unstable; urgency=medium
* Initial release (Closes: #123456)
* TODO: ITP
* TODO: debian/copyright
---
debian/changelog | 7 ++++
debian/compat | 1 +
debian/control | 42 ++++++++++++++++++++
debian/copyright | 81 +++++++++++++++++++++++++++++++++++++++
debian/libhoel-dev.install | 2 +
debian/libhoel1.1.install | 1 +
debian/patches/activate-db.patch | 26 +++++++++++++
debian/patches/hardening.patch | 24 ++++++++++++
debian/patches/not-parallel.patch | 14 +++++++
debian/patches/series | 3 ++
debian/rules | 22 +++++++++++
debian/source/format | 1 +
debian/watch | 7 ++++
13 files changed, 231 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e634f4c
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,7 @@
+hoel (1.1-1) unstable; urgency=medium
+
+ * Initial release (Closes: #123456)
+ * TODO: ITP
+ * TODO: debian/copyright
+
+ -- Thorsten Alteholz <debian at alteholz.de> Tue, 18 Jul 2017 14:32:33 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..018bbe4
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,42 @@
+Source: hoel
+Section: devel
+Priority: optional
+Maintainer: 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.0.0
+Homepage: https://github.com/babelouest/yder
+#Vcs-Git: https://anonscm.debian.org/collab-maint/oauth2-server.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/oauth2-server.git
+
+Package: libhoel1.1
+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})
+ , ${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 --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..46bea8b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,81 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: hoel
+Source: https://github.com/babelouest/hoel
+
+Files: *
+Copyright: 2017 Nicolas Mora
+License: LGPL-2.1
+
+Files: test/core.c
+Copyright: 2017 nobody
+License: public-domain
+
+Files: Makefile examples/Makefile
+Copyright: 2014-2015 Nicolas Mora
+License: Expat
+
+Files: test/Makefile
+Copyright: 2017 Nicolas Mora
+License: GPL-3
+
+Files: debian/*
+Copyright: 2017 Thorsten Alteholz <debian at alteholz.de>
+License: LGPL-2.1
+
+License: LGPL-2.1
+ Permission to use and copy is granted subject to the terms of the "GNU
+ Lesser General Public License" (LGPL) as published by the Free Software
+ Foundation; version 2.1 of the License
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+License-Comment:
+ On Debian GNU systems, the complete text of the GNU Lesser General
+ Public License (LGPL) version 2.1 is available at
+ '/usr/share/common-licenses/LGPL-2.1'.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/>.
+
+License: public-domain
+ Public domain, no copyright. Use at your own risk.
+
+License: Expat
+ 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.
+
+License: GPL-3
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 3 of the License
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/libhoel-dev.install b/debian/libhoel-dev.install
new file mode 100644
index 0000000..5438fa6
--- /dev/null
+++ b/debian/libhoel-dev.install
@@ -0,0 +1,2 @@
+src/hoel.h usr/include
+src/lib*.so usr/lib
diff --git a/debian/libhoel1.1.install b/debian/libhoel1.1.install
new file mode 100644
index 0000000..6ac0115
--- /dev/null
+++ b/debian/libhoel1.1.install
@@ -0,0 +1 @@
+src/lib*.so.* usr/lib
diff --git a/debian/patches/activate-db.patch b/debian/patches/activate-db.patch
new file mode 100644
index 0000000..a9ea34c
--- /dev/null
+++ b/debian/patches/activate-db.patch
@@ -0,0 +1,26 @@
+Description: use sqlite as well
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: hoel-1.1/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
+
+-# 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
+-# 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 --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..bb1c780
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,24 @@
+Description: add hardening flags
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: hoel-1.1/src/Makefile
+===================================================================
+--- hoel-1.1.orig/src/Makefile 2017-07-19 10:04:37.292957024 +0200
++++ hoel-1.1/src/Makefile 2017-07-19 10:13:43.245858548 +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
+@@ -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)
+
+ clean:
diff --git a/debian/patches/not-parallel.patch b/debian/patches/not-parallel.patch
new file mode 100644
index 0000000..3f68781
--- /dev/null
+++ b/debian/patches/not-parallel.patch
@@ -0,0 +1,14 @@
+Description: do not build targets in parallel
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: hoel-1.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
+@@ -18,6 +18,7 @@
+ EXAMPLE_LOCATION=./examples
+ TEST_LOCATION=./test
+
++.NOTPARALLEL:
+ all: libhoel.so example_sqlite3 example_mariadb example_pgsql
+
+ debug:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7cbcc20
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+activate-db.patch
+hardening.patch
+not-parallel.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..36a34d0
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+ dh $@
+
+override_dh_auto_install:
+ echo dh_auto_install
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..f695718
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,7 @@
+version=4
+
+# https://github.com/babelouest/hoel
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%hoel-$1.tar.gz%" \
+ https://github.com/babelouest/hoel/tags \
+ (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
+
--
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