[Pkg-xen-changes] [xen] 05/09: Merge branch 'feature/multiarch' into develop

[Bastian Blank]

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

waldi pushed a commit to branch develop
in repository xen.

commit 4d7bbcee2c2b12beb934901d6a964542b4a842d4
Merge: 5f0fcbd 367585c
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Aug 29 23:35:27 2014 +0200

    Merge branch 'feature/multiarch' into develop

 config/StdGNU.mk                                   |  6 ++--
 debian/.git-dpm                                    |  4 +--
 debian/changelog                                   |  2 ++
 debian/compat                                      |  2 +-
 debian/libxen-dev.install                          | 20 ++++++------
 debian/libxenstore3.0.install                      |  2 +-
 ...0-Set-library-path-to-multi-arch-location.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules.real                                  |  2 +-
 debian/templates/control.main.in                   |  2 ++
 debian/templates/control.source.in                 |  2 +-
 11 files changed, 61 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index 40f7fee,772b515..6dbe316
--- a/debian/changelog
+++ b/debian/changelog
@@@ -11,8 -5,10 +11,10 @@@ xen (4.4.0-3) unstable; urgency=mediu
  
    [ Bastian Blank ]
    * Really update config.{sub,guess}.
+   * Make library packages multi-arch: same. (closes: #730417)
+   * Use debhelper compat level 9. (closes: #692352)
  
 - -- Ian Campbell <ijc at hellion.org.uk>  Mon, 18 Aug 2014 15:59:57 +0100
 + -- Bastian Blank <waldi at debian.org>  Fri, 29 Aug 2014 16:33:19 +0200
  
  xen (4.4.0-2) unstable; urgency=medium
  

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