Merge tag 'debian/0.1.8-4' into developdevelop

new build release

2 files changed, 17 insertions, 17 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 e1da291..752306a 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:
@@ -10,6 +10,7 @@ libmongo-client (0.1.8-4) UNRELEASED; 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) UNRELEASED; urgency=medium
     - Remove now useless code.
     - Fix tests.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sun, 30 Sep 2018 19:54:58 +0200
+ -- 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