From 050fc47cf50171450f4b6bfd08ab6d4f47ed8f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 19:52:34 +0200 Subject: Add release 0.1.8-3.1 --- debian/changelog | 8 ++++++++ debian/libmongo-client-dev.maintscript | 1 + debian/libmongo-client-doc.maintscript | 2 -- debian/libmongo-client0-dbg.maintscript | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 debian/libmongo-client-dev.maintscript create mode 100644 debian/libmongo-client0-dbg.maintscript diff --git a/debian/changelog b/debian/changelog index dd95700..9aa3551 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libmongo-client (0.1.8-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * fix symlink_to_dir calls for libmongo-client0-dbg + and libmongo-client-dev (Closes: #860115). + + -- Ivo De Decker Wed, 12 Apr 2017 21:46:46 +0200 + libmongo-client (0.1.8-3) unstable; urgency=medium * debian/libmongo-client-doc.maintscript: diff --git a/debian/libmongo-client-dev.maintscript b/debian/libmongo-client-dev.maintscript new file mode 100644 index 0000000..02545a3 --- /dev/null +++ b/debian/libmongo-client-dev.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/libmongo-client-dev /usr/share/doc/libmongo-client0 0.1.8-3.1~ diff --git a/debian/libmongo-client-doc.maintscript b/debian/libmongo-client-doc.maintscript index 4b38012..615b4b7 100644 --- a/debian/libmongo-client-doc.maintscript +++ b/debian/libmongo-client-doc.maintscript @@ -1,3 +1 @@ symlink_to_dir /usr/share/doc/libmongo-client-doc /usr/share/doc/libmongo-client0 0.1.8-2.1~ -symlink_to_dir /usr/share/doc/libmongo-client-doc /usr/share/doc/libmongo-client0-dbg 0.1.8-2.1~ -symlink_to_dir /usr/share/doc/libmongo-client-doc /usr/share/doc/libmongo-client-dev 0.1.8-2.1~ diff --git a/debian/libmongo-client0-dbg.maintscript b/debian/libmongo-client0-dbg.maintscript new file mode 100644 index 0000000..ca07077 --- /dev/null +++ b/debian/libmongo-client0-dbg.maintscript @@ -0,0 +1 @@ +symlink_to_dir /usr/share/doc/libmongo-client0-dbg /usr/share/doc/libmongo-client0 0.1.8-3.1~ -- cgit v1.2.3 From c72a5416a2c5d5b1ecfd7e0b9bfbe4999a83094e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 19:57:16 +0200 Subject: Change to my new email address --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9aa3551..187b11a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libmongo-client (0.1.8-4) UNRELEASED; urgency=medium + + * Change to my new email address. + + -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 + libmongo-client (0.1.8-3.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 77d2f9f..4c0dcdd 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: libmongo-client Priority: extra -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 9~), libglib2.0-dev, perl, diff --git a/debian/copyright b/debian/copyright index 1858a45..381ae69 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ License: GPL-2+ Files: debian/* Copyright: 2011-2014 Gergely Nagy - 2014-2015 Jörg Frings-Fürst + 2014-2015 Jörg Frings-Fürst License: Apache-2.0 License: Apache-2.0 -- cgit v1.2.3 From 83bd24c66b46de4bd90006a90e0c474dad6240f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 20:18:04 +0200 Subject: Use the automatic debug symbol packages; Migrate to debhelper 11 --- debian/changelog | 7 +++++++ debian/compat | 2 +- debian/control | 20 +++----------------- debian/libmongo-client0-dbg.maintscript | 1 - debian/rules | 3 --- 5 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 debian/libmongo-client0-dbg.maintscript diff --git a/debian/changelog b/debian/changelog index 187b11a..ac54df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium * Change to my new email address. + * Use the automatic debug symbol packages: + - Remove libmongo-client0-dbg section from debian/control. + - Remove override_dh_strip from debian/rules. + - Remove debian/libmongo-client0-dbg.maintscript. + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/compat b/debian/compat index ec63514..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +11 diff --git a/debian/control b/debian/control index 4c0dcdd..aa84181 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: libmongo-client Priority: extra Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>= 9~), - libglib2.0-dev, perl, + debhelper (>= 11~), + libglib2.0-dev, + perl, dh-autoreconf Build-Depends-Indep: doxygen, @@ -54,21 +55,6 @@ Description: Development files for the alternate C driver for MongoDB as only it includes the header files and static libraries needed for compiling. -Package: libmongo-client0-dbg -Section: debug -Architecture: any -Multi-Arch: same -Depends: - libmongo-client0 (= ${binary:Version}), - ${misc:Depends} -Description: Alternate C driver for MongoDB (debugging symbols) - libmongo-client is an alternative C language driver to the MongoDB - document-oriented datastore. - . - This package contains detached debugging symbols. - . - Most people will not need this package. - Package: libmongo-client-doc Section: doc Architecture: all diff --git a/debian/libmongo-client0-dbg.maintscript b/debian/libmongo-client0-dbg.maintscript deleted file mode 100644 index ca07077..0000000 --- a/debian/libmongo-client0-dbg.maintscript +++ /dev/null @@ -1 +0,0 @@ -symlink_to_dir /usr/share/doc/libmongo-client0-dbg /usr/share/doc/libmongo-client0 0.1.8-3.1~ diff --git a/debian/rules b/debian/rules index 272002f..727a285 100755 --- a/debian/rules +++ b/debian/rules @@ -59,9 +59,6 @@ override_dh_compress: dh_compress -Xusr/share/doc/libmongo-client0/examples/ \ -Xusr/share/doc/libmongo-client0/html/ -override_dh_strip: - dh_strip --dbg-package=libmongo-client0-dbg - override_dh_makeshlibs: dh_makeshlibs dpkg-gensymbols -v$(UPSTREAM_VERSION) -plibmongo-client0 -- cgit v1.2.3 From 62c25b736fd469a61c93d9b27541c76ae254fd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 20:50:12 +0200 Subject: remove dh-autoreconf; Change VCS-* to point to the new repository --- debian/changelog | 2 ++ debian/control | 9 ++++----- debian/rules | 7 +++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac54df6..076834c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * debian/control: + - Change VCS-* to point to the new repository. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/control b/debian/control index aa84181..50e0c43 100644 --- a/debian/control +++ b/debian/control @@ -3,17 +3,16 @@ Priority: extra Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 11~), - libglib2.0-dev, - perl, - dh-autoreconf + libglib2.0-dev, + perl Build-Depends-Indep: doxygen, graphviz Standards-Version: 3.9.6 Section: libs Homepage: https://github.com/algernon/libmongo-client -Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/libmongo-client.git -Vcs-Git: git://anonscm.debian.org/collab-maint/libmongo-client.git +Vcs-Git: git://jff.email/opt/git/libmongo-client.git +Vcs-Browser: https://jff.email/cgit/libmongo-cliet.git Package: libmongo-client0 Architecture: any diff --git a/debian/rules b/debian/rules index 727a285..ace2370 100755 --- a/debian/rules +++ b/debian/rules @@ -21,9 +21,8 @@ export LDFLAGS #export CC=gcc-5 #export CXX=g++-5 - %: - dh $@ --with autoreconf + dh $@ ## # Arch dependent overrides @@ -37,8 +36,8 @@ override_dh_auto_configure-arch: override_dh_auto_build-arch: dh_auto_build -- V=1 -override_dh_auto_test-arch: - dh_auto_test -- V=1 +override_dh_auto_test-arch: ; +# dh_auto_test -- V=1 ## # Arch independent overrides -- cgit v1.2.3 From 3be0d97ee745b34dc9068eda56e2e384fc9f7f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 20:58:03 +0200 Subject: Declare compliance with Debian Policy 4.2.1; d/control: Replace Priority extra with optional --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 076834c..ec49fb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * Declare compliance with Debian Policy 4.2.1 (No changes needed). * debian/control: - Change VCS-* to point to the new repository. + - Replace Priority extra with optional. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/control b/debian/control index 50e0c43..eebb9f6 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: libmongo-client -Priority: extra +Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 11~), @@ -8,7 +8,7 @@ Build-Depends: Build-Depends-Indep: doxygen, graphviz -Standards-Version: 3.9.6 +Standards-Version: 4.2.1 Section: libs Homepage: https://github.com/algernon/libmongo-client Vcs-Git: git://jff.email/opt/git/libmongo-client.git -- cgit v1.2.3 From 1b65b0c47bcf308edba6cec6a7266b3ee1b0bf58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 22:11:49 +0200 Subject: d/libmongo-client-doc.install: Change directory to usr/share/doc/libmongo-client-doc --- debian/changelog | 3 +++ debian/control | 6 +++--- debian/libmongo-client-doc.install | 8 ++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec49fb1..c520449 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium * debian/control: - Change VCS-* to point to the new repository. - Replace Priority extra with optional. + - Remove trailing whitespaces. + * debian/libmongo-client-doc.install: Change directory to + usr/share/doc/libmongo-client-doc. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/control b/debian/control index eebb9f6..dc2f700 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Package: libmongo-client0 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Alternate C driver for the MongoDB document-oriented datastore @@ -41,8 +41,8 @@ Description: Alternate C driver for the MongoDB document-oriented datastore Package: libmongo-client-dev Section: libdevel Architecture: any -Depends: - libmongo-client0 (= ${binary:Version}), +Depends: + libmongo-client0 (= ${binary:Version}), pkg-config, libglib2.0-dev, ${misc:Depends} diff --git a/debian/libmongo-client-doc.install b/debian/libmongo-client-doc.install index 45dc8ae..2210799 100644 --- a/debian/libmongo-client-doc.install +++ b/debian/libmongo-client-doc.install @@ -1,4 +1,4 @@ -build-tree/docs/html/* usr/share/doc/libmongo-client0/html/ -docs/tutorial/examples/tut_* usr/share/doc/libmongo-client0/examples/tutorial/ -docs/tutorial/examples/GNUmakefile usr/share/doc/libmongo-client0/examples/tutorial/ -examples/*.c usr/share/doc/libmongo-client0/examples/ +build-tree/docs/html/* usr/share/doc/libmongo-client-doc/html/ +docs/tutorial/examples/tut_* usr/share/doc/libmongo-client-doc/examples/tutorial/ +docs/tutorial/examples/GNUmakefile usr/share/doc/libmongo-client-doc/examples/tutorial/ +examples/*.c usr/share/doc/libmongo-client-doc/examples/ -- cgit v1.2.3 From 980b617519d53ae68b07f2c1b897a689f45d06e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 22:15:13 +0200 Subject: d/copyright: Use secure copyright format URI --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c520449..ac62db3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,10 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Change VCS-* to point to the new repository. - Replace Priority extra with optional. - Remove trailing whitespaces. - * debian/libmongo-client-doc.install: Change directory to - usr/share/doc/libmongo-client-doc. + * debian/libmongo-client-doc.install: + - Change directory to usr/share/doc/libmongo-client-doc. + * debian/copyright: + - Use secure copyright format URI. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 -- cgit v1.2.3 From 5ff5ab7c5d8bc3c297e443e6e528c34021ff6d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 22:17:24 +0200 Subject: d/copyright: Bump year for debian/* to 2018 --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ac62db3..73c65ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Change directory to usr/share/doc/libmongo-client-doc. * debian/copyright: - Use secure copyright format URI. + - Bump year for debian/* to 2018. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/copyright b/debian/copyright index 381ae69..b68232b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ License: GPL-2+ Files: debian/* Copyright: 2011-2014 Gergely Nagy - 2014-2015 Jörg Frings-Fürst + 2014-2018 Jörg Frings-Fürst License: Apache-2.0 License: Apache-2.0 -- cgit v1.2.3 From 5a00fbdcd2fc0be0f3d5e324198b4d72317fe092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 22:41:37 +0200 Subject: d/rules: Remove unused .md5 files from documentation --- debian/changelog | 2 ++ debian/rules | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 73c65ea..8f27431 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium * debian/copyright: - Use secure copyright format URI. - Bump year for debian/* to 2018. + * debian/rules: + - Remove unused .md5 files from documentation. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/rules b/debian/rules index ace2370..388b48f 100755 --- a/debian/rules +++ b/debian/rules @@ -50,6 +50,7 @@ override_dh_auto_build-indep: -e "s,@top_srcdir@,../,g" \ <../Doxyfile.in >Doxyfile cd build-tree && doxygen + find . -name "*.md5" -exec rm {} \; ## # Overrides common to both -- cgit v1.2.3 From 4ec5f800f48b900c3d542d386e4dfbea1683766d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 22:43:15 +0200 Subject: d/copyright: add missing s --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index b68232b..94440f3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libmongo-client Upstream-Contact: Gergely Nagy Source: https://github.com/algernon/libmongo-client.git -- cgit v1.2.3 From a6157c88abf2724375ee7b0ba8273d15929434d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 23:24:04 +0200 Subject: d/rules: Add code remove unused .md5 files; Use /usr/share/dpkg/pkg-info.mk to get Upstream version; Remove now useless code --- debian/changelog | 4 +++- debian/rules | 19 +++---------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f27431..3618c40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,9 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Use secure copyright format URI. - Bump year for debian/* to 2018. * debian/rules: - - Remove unused .md5 files from documentation. + - Add code remove unused .md5 files from documentation. + - Use /usr/share/dpkg/pkg-info.mk to get Upstream version. + - Remove now useless code. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/rules b/debian/rules index 388b48f..9a96c74 100755 --- a/debian/rules +++ b/debian/rules @@ -6,20 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DH_OPTIONS += -O-Bbuild-tree -UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev) - -LDFLAGS += -fPIE -pie -Wl,-z,relro -Wl,-z,now -fPIC -CPPFLAGS += -D_FORTIFY_SOURCE=2 -fPIE -pie -Wl,-z,relro -Wl,-z,now -CFLAGS += -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIE -pie -Wl,-z,relro -Wl,-z,now -export CPPFLAGS -export CFLAGS -export LDFLAGS - -# -# Test for gcc-5 support -# -#export CC=gcc-5 -#export CXX=g++-5 +include /usr/share/dpkg/pkg-info.mk %: dh $@ @@ -46,7 +33,7 @@ override_dh_autoreconf-indep override_dh_auto_configure-indep: ; override_dh_auto_test-indep override_dh_auto_install-indep: ; override_dh_auto_build-indep: install -d build-tree/docs/html - cd build-tree && sed -e "s,@VERSION@,${UPSTREAM_VERSION},g" \ + cd build-tree && sed -e "s,@VERSION@,$(DEB_VERSION_UPSTREAM),g" \ -e "s,@top_srcdir@,../,g" \ <../Doxyfile.in >Doxyfile cd build-tree && doxygen @@ -61,4 +48,4 @@ override_dh_compress: override_dh_makeshlibs: dh_makeshlibs - dpkg-gensymbols -v$(UPSTREAM_VERSION) -plibmongo-client0 + dpkg-gensymbols -v$(DEB_VERSION_UPSTREAM) -plibmongo-client0 -- cgit v1.2.3 From fc0c3599dc2926284867ff285befebd2fbc4a7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Sep 2018 23:24:54 +0200 Subject: d/rules: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3618c40..7ca2e9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Use secure copyright format URI. - Bump year for debian/* to 2018. * debian/rules: - - Add code remove unused .md5 files from documentation. + - Add code to remove unused .md5 files from documentation. - Use /usr/share/dpkg/pkg-info.mk to get Upstream version. - Remove now useless code. -- cgit v1.2.3 From a4f2cc4296014eca8d97be5c785b321150a86a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Oct 2018 09:44:06 +0200 Subject: New debian/patches/0001-hardening.patch to fix hardening; d/rules: Fix tests --- debian/changelog | 2 ++ debian/patches/0001-hardening.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 ++-- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 debian/patches/0001-hardening.patch diff --git a/debian/changelog b/debian/changelog index 7ca2e9d..e1da291 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * New debian/patches/0001-hardening.patch to fix hardening. * debian/control: - Change VCS-* to point to the new repository. - Replace Priority extra with optional. @@ -22,6 +23,7 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Add code to remove unused .md5 files from documentation. - Use /usr/share/dpkg/pkg-info.mk to get Upstream version. - Remove now useless code. + - Fix tests. -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 diff --git a/debian/patches/0001-hardening.patch b/debian/patches/0001-hardening.patch new file mode 100644 index 0000000..e3c77eb --- /dev/null +++ b/debian/patches/0001-hardening.patch @@ -0,0 +1,20 @@ +Description: Fix hardening +Author: Jörg Frings-Fürst +Last-Update: 2018-10-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -73,8 +73,8 @@ int main() + return 0; + } + ]])],[blb_cv_glib_sane=yes],[blb_cv_glib_sane=no],[blb_cv_glib_sane=yes])]) +-CPPFLAGS=$old_CPPFLAGS +-LDFLAGS=$old_LDFLAGS ++CPPFLAGS="$old_CPPFLAGS -fPIE" ++LDFLAGS="$old_LDFLAGS -fPIE -pie" + + if test "x$blb_cv_glib_sane" = "xno"; then + AC_MSG_ERROR([Glib headers inconsistent with current compiler setting. You might be using 32 bit Glib with a 64 bit compiler, check PKG_CONFIG_PATH]) diff --git a/debian/patches/series b/debian/patches/series index 8587bd5..3879ee5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +0001-hardening.patch 0100-gcc5.patch diff --git a/debian/rules b/debian/rules index 9a96c74..3402cb8 100755 --- a/debian/rules +++ b/debian/rules @@ -23,8 +23,8 @@ override_dh_auto_configure-arch: override_dh_auto_build-arch: dh_auto_build -- V=1 -override_dh_auto_test-arch: ; -# dh_auto_test -- V=1 +override_dh_auto_test-arch: + cd build-tree/tests && make check ## # Arch independent overrides -- cgit v1.2.3 From 1bfb5d02a2726a5bbd2dc92fbf95208e53501f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Oct 2018 12:49:21 +0200 Subject: d/changelog: Change date / time to release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1da291..0140d76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libmongo-client (0.1.8-4) UNRELEASED; urgency=medium +libmongo-client (0.1.8-4) unstable; urgency=medium * Change to my new email address. * Use the automatic debug symbol packages: @@ -25,7 +25,7 @@ libmongo-client (0.1.8-4) UNRELEASED; urgency=medium - Remove now useless code. - Fix tests. - -- Jörg Frings-Fürst Sun, 30 Sep 2018 19:54:58 +0200 + -- Jörg Frings-Fürst Mon, 01 Oct 2018 12:48:31 +0200 libmongo-client (0.1.8-3.1) unstable; urgency=medium -- cgit v1.2.3 From 625b6aa73234d70e16ddd42189b91caf68fa05af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Oct 2018 14:34:34 +0200 Subject: Replace outdated README.source to explain the branching model used --- debian/README.source | 29 ++++++++++++++--------------- debian/changelog | 3 ++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/README.source b/debian/README.source index d390955..e4f2b3d 100644 --- a/debian/README.source +++ b/debian/README.source @@ -1,19 +1,18 @@ -Working with the Debianized libmongo-client -=========================================== +Hello, -The package is meant to be built from a git checkout, the original -tarballs are git snapshots aswell. +now I use the branching model from Vincent Driessen[1]. -Since I'm also upstream for the package, the upstream branch for -git-buildpackage has been set to the 'stable' branch, while the Debian -branch remained the default: 'debian'. This is set in the -debian/gbp.conf file. If one wants to build a snapshot of master, that -file will need an edit too. +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. -Other than this, whenever a new upload is finalised, the stable branch -gets merged into the debian branch, and all is well: the Debian branch -should contain the debianised sources, with all changes already -applied, based on whichever upstream source is appropriate. +Please upload unattended uploads use a branch feature/. --- -Gergely Nagy + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 0140d76..752306a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libmongo-client (0.1.8-4) unstable; urgency=medium - Bump minimum debhelper version in debian/control to >= 11. * Declare compliance with Debian Policy 4.2.1 (No changes needed). * New debian/patches/0001-hardening.patch to fix hardening. + * Replace outdated README.source to explain the branching model used. * debian/control: - Change VCS-* to point to the new repository. - Replace Priority extra with optional. @@ -25,7 +26,7 @@ libmongo-client (0.1.8-4) unstable; urgency=medium - Remove now useless code. - Fix tests. - -- Jörg Frings-Fürst Mon, 01 Oct 2018 12:48:31 +0200 + -- Jörg Frings-Fürst Mon, 01 Oct 2018 14:32:40 +0200 libmongo-client (0.1.8-3.1) unstable; urgency=medium -- cgit v1.2.3