[Pkg-xen-changes] [xen] 02/03: Merge branch 'release/4.4.0-4'

[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 299ff7f75682cbef33887729c296cb5a38a1b3f6
Merge: 757e1fe f7872d6
Author: Bastian Blank <waldi at debian.org>
Date:   Sat Aug 30 13:34:47 2014 +0200

    Merge branch 'release/4.4.0-4'

 config/StdGNU.mk                                   |  6 ++--
 debian/.git-dpm                                    |  4 +--
 debian/changelog                                   | 14 +++++++++
 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                                  |  8 +++--
 debian/scripts/Makefile                            |  2 --
 debian/templates/control.main.in                   | 18 ++---------
 debian/templates/control.source.in                 |  2 +-
 12 files changed, 78 insertions(+), 37 deletions(-)

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