[Pkg-voip-commits] [dahdi-linux] 12/12: Merge branch 'master' of salsa.debian.org:debian/dahdi-linux

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-linux.

commit 00ed034846feaecf3a56f929f46840ac1a6f705a
Merge: bed7a9d ebb929b
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Thu Jan 11 00:41:33 2018 +0200

    Merge branch 'master' of salsa.debian.org:debian/dahdi-linux

 debian/changelog | 8 ++++++--
 debian/rules     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 20bf300,d83351d..8b21f75
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,14 +1,31 @@@
 +dahdi-linux (1:2.11.1.0.20170917~dfsg-3) unstable; urgency=medium
 +
 +  * Add dev_attr.patch: fix building with 4.13 (Closes: #879043)
 +  * Refresh dahdi_linux_extra:
 +    - Rebased on recent master
 +    - also fix opvxa1200 with 4.11
 +    - Tweaks of ZapHFC
 +  * tar --sort=name for reproducible build for the dahdi-source tarball
 +  * modulestest: fix usage with debuild
 +  * Add gbp.conf: use pristine-tar
 +  * copyright: https standard URL
 +  * Switch to Salsa.
 +  * Standards version 4.1.3
 +  * An example dynamic DAHDI systemd service
 +
 + -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 10 Jan 2018 23:40:10 +0200
 +
  dahdi-linux (1:2.11.1.0.20170917~dfsg-1) unstable; urgency=medium
  
+   [ Tzafrir Cohen ]
    * New upstream git snapshot (Closes: #872838)
-     - debian/patches/wcfxo-wctdm-set-spantype.patch dropped: merged upsteram
+     - debian/patches/wcfxo-wctdm-set-spantype.patch dropped: merged upstream
    * compat level 10
  
-  -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 17 Sep 2017 12:05:42 +0300
+   [ Bernhard Schmidt ]
+   * Reproducible build: set permissions and sort source tarball
+ 
+  -- Bernhard Schmidt <berni at debian.org>  Fri, 06 Oct 2017 18:37:23 +0200
  
  dahdi-linux (1:2.11.1~dfsg-1) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-linux.git