diff options
-rw-r--r-- | debian/README.source | 29 | ||||
-rw-r--r-- | debian/changelog | 38 | ||||
-rw-r--r-- | debian/compat | 2 | ||||
-rw-r--r-- | debian/control | 37 | ||||
-rw-r--r-- | debian/copyright | 4 | ||||
-rw-r--r-- | debian/libmongo-client-dev.maintscript | 1 | ||||
-rw-r--r-- | debian/libmongo-client-doc.install | 8 | ||||
-rw-r--r-- | debian/libmongo-client-doc.maintscript | 2 | ||||
-rw-r--r-- | debian/patches/0001-hardening.patch | 20 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 28 |
11 files changed, 98 insertions, 72 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/<your title>. --- -Gergely Nagy <algernon@madhouse-project.org> + +Many thanks. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> 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 dd95700..752306a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,41 @@ +libmongo-client (0.1.8-4) unstable; 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. + * 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. + - Remove trailing whitespaces. + * debian/libmongo-client-doc.install: + - Change directory to usr/share/doc/libmongo-client-doc. + * debian/copyright: + - Use secure copyright format URI. + - Bump year for debian/* to 2018. + * debian/rules: + - 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 <debian@jff.email> Mon, 01 Oct 2018 14:32:40 +0200 + +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 <ivodd@debian.org> 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/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 77d2f9f..dc2f700 100644 --- a/debian/control +++ b/debian/control @@ -1,24 +1,24 @@ Source: libmongo-client -Priority: extra -Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> +Priority: optional +Maintainer: Jörg Frings-Fürst <debian@jff.email> Build-Depends: - debhelper (>= 9~), - libglib2.0-dev, perl, - dh-autoreconf + debhelper (>= 11~), + libglib2.0-dev, + perl 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-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 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} @@ -54,21 +54,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/copyright b/debian/copyright index 1858a45..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 <algernon@madhouse-project.org> Source: https://github.com/algernon/libmongo-client.git @@ -13,7 +13,7 @@ License: GPL-2+ Files: debian/* Copyright: 2011-2014 Gergely Nagy <algernon@madhouse-project.org> - 2014-2015 Jörg Frings-Fürst <debian@jff-webhosting.net> + 2014-2018 Jörg Frings-Fürst <debian@jff.email> License: Apache-2.0 License: Apache-2.0 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.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/ 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/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 <debian@jff.email> +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 272002f..3402cb8 100755 --- a/debian/rules +++ b/debian/rules @@ -6,24 +6,10 @@ 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 $@ --with autoreconf + dh $@ ## # Arch dependent overrides @@ -38,7 +24,7 @@ override_dh_auto_build-arch: dh_auto_build -- V=1 override_dh_auto_test-arch: - dh_auto_test -- V=1 + cd build-tree/tests && make check ## # Arch independent overrides @@ -47,10 +33,11 @@ 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 + find . -name "*.md5" -exec rm {} \; ## # Overrides common to both @@ -59,9 +46,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 + dpkg-gensymbols -v$(DEB_VERSION_UPSTREAM) -plibmongo-client0 |