From a795d0c19012d1a71b7edad41de068a6b4020223 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 04:57:06 +0900 Subject: initial debian files --- .gitignore | 2 ++ debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 17 +++++++++++++++++ debian/copyright | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ debian/files | 1 + debian/rules | 19 +++++++++++++++++++ debian/source/format | 1 + debian/watch | 4 ++++ 9 files changed, 101 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/files create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/.gitignore b/.gitignore index 49be68c..83cfe53 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ build *.pyc dist/ MANIFEST +debian/python-sqlcipher +debian/*.log diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a4869b4 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +pysqlcipher (2.6.3~dev1-1) unstable; urgency=low + + * source package automatically created by stdeb 0.6.0+git + + -- Ben Carrillo Thu, 30 May 2013 03:33:25 +0900 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..1cbf946 --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: pysqlcipher +Maintainer: Ben Carrillo +Section: python +Priority: optional +Build-Depends: python-all-dev (>= 2.6.6-3), debhelper (>= 7) +Standards-Version: 3.9.1 + +Package: python-sqlcipher +Architecture: any +Depends: libsqlcipher0 (>=2.1.1-1), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} +Description: DB-API 2.0 interface for SQLCIPHER 3.x + Python interface to SQLCipher + . + pysqlcipher is an interface to the SQLite 3.x embedded relational + database engine. It is almost fully compliant with the Python database API + version 2.0. At the same time, it also exposes the unique features of + SQLCipher. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..72215e1 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,51 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: pysqlcipher +Upstream-Contact: kali@leap.se +Source: + +Files: setup.* + Copyright (C) 2013 Kali Kaneko + Copyright (C) 2005-2010 Gerhard Häring + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any + damages arising from the use of this software. + + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the + product documentation would be appreciated but is not + required. + + 2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + +Files: * + Copyright (C) 2005-2010 Gerhard Häring + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any + damages arising from the use of this software. + + Permission is granted to anyone to use this software for any + purpose, including commercial applications, and to alter it and + redistribute it freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the + product documentation would be appreciated but is not + required. + + 2. Altered source versions must be plainly marked as such, and + must not be misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..7ed1248 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +python-pysqlcipher_2.6.3~dev1-1_amd64.deb python optional diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..dc97b46 --- /dev/null +++ b/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#DH_VERBOSE=1 + +%: + dh $@ --with python2 --buildsystem=python_distutils + +build-python%: + python$* setup.py build_sqlcipher + +install-python%: + python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb + + +override_dh_auto_clean: + dh_auto_clean + rm -rf build + rm -rf docs/_build + rm -rf *.egg-info 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..7dec5aa --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 + +http://pypi.python.org/packages/source/p/pysqlcipher/pysqlcipher-(.*)\.tar\.gz + -- cgit v1.2.3 From 1389e9c5769a34c1908e2104514e8b0f5551f7c6 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 04:58:46 +0900 Subject: bump dev version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dff0c64..0620b58 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ sqlite = "sqlite" PYSQLITE_EXPERIMENTAL = False #DEV_VERSION = None -DEV_VERSION = "1" +DEV_VERSION = "2" sources = ["src/module.c", "src/connection.c", "src/cursor.c", "src/cache.c", "src/microprotocols.c", "src/prepare_protocol.c", "src/statement.c", -- cgit v1.2.3 From 13ea8f4baa6c119f0a49bb8d9251b3baac4f4ec5 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 05:07:42 +0900 Subject: fix rules --- .gitignore | 1 + debian/changelog | 2 +- debian/files | 1 - debian/rules | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 debian/files diff --git a/.gitignore b/.gitignore index 83cfe53..5107801 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dist/ MANIFEST debian/python-sqlcipher debian/*.log +debian/files diff --git a/debian/changelog b/debian/changelog index a4869b4..c8a3744 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pysqlcipher (2.6.3~dev1-1) unstable; urgency=low +pysqlcipher (2.6.3~dev02-1) unstable; urgency=low * source package automatically created by stdeb 0.6.0+git diff --git a/debian/files b/debian/files deleted file mode 100644 index 7ed1248..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -python-pysqlcipher_2.6.3~dev1-1_amd64.deb python optional diff --git a/debian/rules b/debian/rules index dc97b46..6d7b1af 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ install-python%: override_dh_auto_clean: - dh_auto_clean - rm -rf build - rm -rf docs/_build - rm -rf *.egg-info + dh_auto_clean + rm -rf build + rm -rf docs/_build + rm -rf *.egg-info -- cgit v1.2.3 From 06d4243b3ecf03add6cf0012686cda014ef9581d Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 05:35:28 +0900 Subject: going native --- .gitignore | 1 + debian/rules | 8 ++++---- debian/source/format | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5107801..9a69d09 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ MANIFEST debian/python-sqlcipher debian/*.log debian/files +debian/*.substvars diff --git a/debian/rules b/debian/rules index 6d7b1af..db8924e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,12 +5,12 @@ %: dh $@ --with python2 --buildsystem=python_distutils -build-python%: +override_dh_auto_build: python$* setup.py build_sqlcipher -install-python%: - python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb - +override_dh_auto_install: + python$* setup.py install --skip-build --root=debian/python-sqlcipher \ + --install-layout=deb override_dh_auto_clean: dh_auto_clean diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) -- cgit v1.2.3 From c7c1dc1fbc66aace6c561fce9080fba79dd04e56 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 05:46:50 +0900 Subject: add build step, we were missing python files --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index db8924e..4928b4f 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ override_dh_auto_build: python$* setup.py build_sqlcipher + python$* setup.py build override_dh_auto_install: python$* setup.py install --skip-build --root=debian/python-sqlcipher \ -- cgit v1.2.3 From 0e72eda1378ec2b810353e0379cd692d876b98c4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 05:47:35 +0900 Subject: ignore moar things --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9a69d09..8e5359b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ debian/python-sqlcipher debian/*.log debian/files debian/*.substvars +debian/*.debhelper -- cgit v1.2.3 From d38bb9b099e9783e1bddb6ddf265e8de96a849f6 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 31 May 2013 01:04:20 +0900 Subject: do not use amalgamation builder --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 4928b4f..401e052 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ override_dh_auto_build: python$* setup.py build_sqlcipher - python$* setup.py build + python$* setup.py build_py override_dh_auto_install: python$* setup.py install --skip-build --root=debian/python-sqlcipher \ -- cgit v1.2.3 From 2a9e7729483f3c4bbf68a8a749bc6b6695b2cd20 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 31 May 2013 01:19:22 +0900 Subject: add incude dir for libsqlcipher --- setup.cfg | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 1482ef6..9250c50 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [build_ext] libraries=sqlcipher +include_dirs=/usr/include/sqlcipher/ #define= -#include_dirs=/usr/local/include #library_dirs=/usr/local/lib #define=SQLITE_OMIT_LOAD_EXTENSION diff --git a/setup.py b/setup.py index f1f93e1..ac1a3cd 100644 --- a/setup.py +++ b/setup.py @@ -146,6 +146,7 @@ class LibSQLCipherBuilder(build_ext): description = ("Build C extension linking against libsqlcipher library.") def build_extension(self, ext): + ext.extra_compile_args.append("-I/usr/include/sqlcipher/") ext.extra_link_args.append("-lsqlcipher") build_ext.build_extension(self, ext) -- cgit v1.2.3 From 7c525ca351afd5782972b54653e7863e1decfb13 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 31 May 2013 01:20:00 +0900 Subject: add libsqlcipher-dev as build-dep --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1cbf946..ba08497 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pysqlcipher Maintainer: Ben Carrillo Section: python Priority: optional -Build-Depends: python-all-dev (>= 2.6.6-3), debhelper (>= 7) +Build-Depends: python-all-dev (>= 2.6.6-3), libsqlcipher-dev, debhelper (>= 7) Standards-Version: 3.9.1 Package: python-sqlcipher -- cgit v1.2.3 From 3f00ed690d09b59f9547fb33bdbe1d09ddc25ba4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 12:11:08 -0400 Subject: make changelog more suitable than the one generated by stdeb --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c8a3744..cac6195 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ pysqlcipher (2.6.3~dev02-1) unstable; urgency=low - * source package automatically created by stdeb 0.6.0+git + * Initial debian package -- Ben Carrillo Thu, 30 May 2013 03:33:25 +0900 -- cgit v1.2.3 From b3d76288ff3bbadeea65b1e651b37a9c661da6f6 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 12:11:45 -0400 Subject: switch to debhelper version compat 9, this should allow us to get some hardening flags enabled easier --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index ba08497..572832d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pysqlcipher Maintainer: Ben Carrillo Section: python Priority: optional -Build-Depends: python-all-dev (>= 2.6.6-3), libsqlcipher-dev, debhelper (>= 7) +Build-Depends: python-all-dev (>= 2.6.6-3), libsqlcipher-dev, debhelper (>= 9) Standards-Version: 3.9.1 Package: python-sqlcipher -- cgit v1.2.3 From 20677bd8b1736bb84d769d263cfdd16bd4fab0f7 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 12:12:00 -0400 Subject: add the debian/* files to the copyright notice --- debian/copyright | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/copyright b/debian/copyright index 72215e1..b0eabf7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -49,3 +49,11 @@ Files: * 3. This notice may not be removed or altered from any source distribution. + +Files: debian/* +Copyright: Copyright 2013 Kali Kaneko +License: GPL-3+ + +License: GPL-3+ + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. \ No newline at end of file -- cgit v1.2.3 From c8d53072ce6857f622ae912a085e921a06af8c07 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 12:12:12 -0400 Subject: add myself as uploader --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 572832d..75c1b80 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Section: python Priority: optional Build-Depends: python-all-dev (>= 2.6.6-3), libsqlcipher-dev, debhelper (>= 9) Standards-Version: 3.9.1 +Uploaders: Micah Anderson Package: python-sqlcipher Architecture: any -- cgit v1.2.3 From 46d434982cd47cdd48fdcf3fe3a0035680e005d1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 13:27:16 -0400 Subject: fix version so it matches native requirements --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cac6195..5728206 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pysqlcipher (2.6.3~dev02-1) unstable; urgency=low +pysqlcipher (2.6.3~dev02) unstable; urgency=low * Initial debian package -- cgit v1.2.3 From afc66177dc3ed7387c9d85a90bd566cf7cd27e24 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 13:28:48 -0400 Subject: update standards revision, no changes --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 75c1b80..5a8e493 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Ben Carrillo Section: python Priority: optional Build-Depends: python-all-dev (>= 2.6.6-3), libsqlcipher-dev, debhelper (>= 9) -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Uploaders: Micah Anderson Package: python-sqlcipher -- cgit v1.2.3 From f8a174b0f4a637c9867d037676069177945f0b3c Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 13:31:24 -0400 Subject: remove installation of unnecessary documentation into wrong location (usr/pysqlcipher-doc/) --- setup.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/setup.py b/setup.py index ac1a3cd..49b6667 100644 --- a/setup.py +++ b/setup.py @@ -306,13 +306,6 @@ def get_setup_args(): print "Fatal error: PYSQLITE_VERSION could not be detected!" sys.exit(1) - data_files = [("pysqlcipher-doc", - glob.glob("doc/*.html") - + glob.glob("doc/*.txt") - + glob.glob("doc/*.css")), - ("pysqlcipher-doc/code", - glob.glob("doc/code/*.py"))] - #XXX ? #py_modules = ["sqlcipher"], @@ -333,7 +326,6 @@ def get_setup_args(): packages=["pysqlcipher", "pysqlcipher.test"] + (["pysqlcipher.test.py25"], [])[sys.version_info < (2, 5)], scripts=[], - data_files=data_files, ext_modules=[ Extension( -- cgit v1.2.3 From 395787d20208c439797855313cc9bbb7fb76784a Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 4 Jun 2013 15:46:34 -0400 Subject: fix for backporting to wheezy: E: dh_python2:145: extension for python2.6 is missing. Build extensions for all supported Python versions --- debian/control | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/control b/debian/control index 5a8e493..16d3f52 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Priority: optional Build-Depends: python-all-dev (>= 2.6.6-3), libsqlcipher-dev, debhelper (>= 9) Standards-Version: 3.9.4 Uploaders: Micah Anderson +X-Python-Version: >= 2.5 Package: python-sqlcipher Architecture: any diff --git a/debian/rules b/debian/rules index 401e052..2d9c8f3 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,9 @@ override_dh_auto_install: python$* setup.py install --skip-build --root=debian/python-sqlcipher \ --install-layout=deb +override_dh_python2: + dh_python2 --no-guessing-versions + override_dh_auto_clean: dh_auto_clean rm -rf build -- cgit v1.2.3