[Pkg-remote-commits] [freerdp] 06/11: Import Debian patch 1.0.1-1.1

[Mike Gabriel]

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

sunweaver pushed a commit to branch debian-wheezy
in repository freerdp.

commit 746a5de998d4f40415b82151bb2b28b4dfa552c1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 17 12:12:47 2014 +0200

    Import Debian patch 1.0.1-1.1
---
 debian/changelog                           | 14 ++++++++++++++
 debian/compat                              |  2 +-
 debian/control                             |  6 +++++-
 debian/libfreerdp-dev.install              |  8 ++++----
 debian/libfreerdp-plugins-standard.install |  2 +-
 debian/libfreerdp1.install                 |  2 +-
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f3ce34..7ad6206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+freerdp (1.0.1-1.1) unstable; urgency=low
+
+  [ gregor herrmann <gregoa at debian.org> ]
+  * Non-maintainer upload.
+  * Fix "FTBFS: dh_install: libfreerdp1 missing files (usr/lib/*.so.*),
+    aborting": apply patch from Ubuntu / Michael Terry:
+    - debian/*.install: Update for multiarch locations
+    (Closes: #671962)
+  
+  [ Ying-Chun Liu (PaulLiu) <paulliu at debian.org> ]
+  * Multi-Arch implementation.
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu at debian.org>  Sat, 14 Jul 2012 01:19:53 +0800
+
 freerdp (1.0.1-1) unstable; urgency=low
 
   [ Jeremy Bicha ]
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 3737762..df59b3a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Otavio Salvador <otavio at debian.org>
 Build-Depends:
- debhelper (>= 7.0.50~), autotools-dev, cmake, libasound2-dev, libcups2-dev,
+ debhelper (>= 9), autotools-dev, cmake, libasound2-dev, libcups2-dev,
  libpcsclite-dev, libpulse-dev, libssl-dev, libx11-dev, libxcursor-dev,
  libxdamage-dev, libxext-dev, libxkbfile-dev, libxinerama-dev, libxv-dev,
  pkg-config, xmlto, libavcodec-dev
@@ -51,8 +51,10 @@ Description: RDP client for Windows Terminal Services
 Package: libfreerdp1
 Architecture: any
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: xfreerdp
+Multi-Arch: same
 Description: RDP client for Windows Terminal Services (library)
  FreeRDP is a client for Windows Terminal Services implementing the Remote
  Desktop Protocol (RDP).
@@ -62,7 +64,9 @@ Description: RDP client for Windows Terminal Services (library)
 Package: libfreerdp-plugins-standard
 Architecture: any
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: RDP client for Windows Terminal Services (plugins)
  FreeRDP is a client for Windows Terminal Services implementing the Remote
  Desktop Protocol (RDP).
diff --git a/debian/libfreerdp-dev.install b/debian/libfreerdp-dev.install
index f72f502..6107292 100644
--- a/debian/libfreerdp-dev.install
+++ b/debian/libfreerdp-dev.install
@@ -1,5 +1,5 @@
 usr/include
-usr/lib/*.so
-#usr/lib/*.a
-#usr/lib/freerdp/*.a
-usr/lib/pkgconfig
+usr/lib/*/*.so
+#usr/lib/*/*.a
+#usr/lib/*/freerdp/*.a
+usr/lib/*/pkgconfig
diff --git a/debian/libfreerdp-plugins-standard.install b/debian/libfreerdp-plugins-standard.install
index 84afc47..cf19e9e 100644
--- a/debian/libfreerdp-plugins-standard.install
+++ b/debian/libfreerdp-plugins-standard.install
@@ -1 +1 @@
-usr/lib/freerdp/*.so
+usr/lib/*/freerdp/*.so
diff --git a/debian/libfreerdp1.install b/debian/libfreerdp1.install
index 093956b..3de3b10 100644
--- a/debian/libfreerdp1.install
+++ b/debian/libfreerdp1.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

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