diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-08-05 14:10:30 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-08-05 14:10:30 +0200 |
| commit | 18547ece59a9977139678f683db4c990b1907eab (patch) | |
| tree | b13da2036031c7811f41dd7874b80d871b93f570 | |
| parent | 53c9fe663d64f6681fc63e0ea820778c6a87aea6 (diff) | |
| parent | 80e6d50ae13dbfe1e4333888431eb21d3d9e926f (diff) | |
Merge tag 'debian/2.0.1-1' into develop
New upstream release
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a13ce9b..aced019 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -bitz-server (2.0.1-1) UNRELEASED; urgency=medium +bitz-server (2.0.1-1) unstable; urgency=medium * New upstream release: - Remove upstream applied patches 0600-man_page_spelling.patch and 0100-spelling.patch + * debian/rules: + - Add "export DEB_CXXFLAGS_MAINT_APPEND = -fPIE" and + "export DEB_LDFLAGS_MAINT_APPEND = -fPIE -pie" to fix missing CXXFLAGS + and LDFLAGS. - -- Jörg Frings-Fürst <debian@jff.email> Sun, 15 Jul 2018 09:59:32 +0200 + -- Jörg Frings-Fürst <debian@jff.email> Sun, 05 Aug 2018 00:14:26 +0200 bitz-server (2.0.0-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 8e8a98a..14b3671 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,8 @@ #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CXXFLAGS_MAINT_APPEND = -fPIE +export DEB_LDFLAGS_MAINT_APPEND = -fPIE -pie VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/') |