Hi developers,

I add more modification to fix
E: libfreerdp1: missing-pre-dependency-on-multiarch-support
It is based on Gregor's work.

Please see the debdiff I attached.

However, this patch is still not *perfect*.

# strings libfreerdp-core.so.1.0.1  | grep /usr/lib/
/usr/lib/freerdp/extensions/%s.so

It shows that the default extension path is not Multi-Arch-ified.
But it is a minor issue because freerdp-1.0.1 doesn't support loading
extensions due to a bug in the upstream.

Plugins are still working so don't worry about that:
# strings libfreerdp-utils.so.1.0.1 | grep /usr/lib/
/usr/lib/i386-linux-gnu/freerdp

Yours Sincerely,
Paul

-- 
                                PaulLiu (劉穎駿)
E-mail: Ying-Chun Liu (PaulLiu) <paul...@debian.org>
diff -Nru freerdp-1.0.1/debian/changelog freerdp-1.0.1/debian/changelog
--- freerdp-1.0.1/debian/changelog	2012-02-11 20:34:05.000000000 +0800
+++ freerdp-1.0.1/debian/changelog	2012-07-03 14:33:28.000000000 +0800
@@ -1,3 +1,14 @@
+freerdp (1.0.1-1.1) UNRELEASED; urgency=low
+
+  * 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)
+  * Multi-Arch implementation by Ying-Chun Liu (PaulLiu) <paul...@debian.org>
+
+ -- gregor herrmann <gre...@debian.org>  Mon, 11 Jun 2012 17:53:09 +0200
+
 freerdp (1.0.1-1) unstable; urgency=low
 
   [ Jeremy Bicha ]
diff -Nru freerdp-1.0.1/debian/compat freerdp-1.0.1/debian/compat
--- freerdp-1.0.1/debian/compat	2012-01-31 21:45:55.000000000 +0800
+++ freerdp-1.0.1/debian/compat	2012-07-03 14:31:03.000000000 +0800
@@ -1 +1 @@
-7
+9
diff -Nru freerdp-1.0.1/debian/control freerdp-1.0.1/debian/control
--- freerdp-1.0.1/debian/control	2012-01-31 21:45:55.000000000 +0800
+++ freerdp-1.0.1/debian/control	2012-07-03 14:38:23.000000000 +0800
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Otavio Salvador <ota...@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 @@
 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 @@
 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 -Nru freerdp-1.0.1/debian/libfreerdp-dev.install freerdp-1.0.1/debian/libfreerdp-dev.install
--- freerdp-1.0.1/debian/libfreerdp-dev.install	2012-01-31 21:45:55.000000000 +0800
+++ freerdp-1.0.1/debian/libfreerdp-dev.install	2012-07-03 14:29:53.000000000 +0800
@@ -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 -Nru freerdp-1.0.1/debian/libfreerdp-plugins-standard.install freerdp-1.0.1/debian/libfreerdp-plugins-standard.install
--- freerdp-1.0.1/debian/libfreerdp-plugins-standard.install	2012-01-31 21:45:55.000000000 +0800
+++ freerdp-1.0.1/debian/libfreerdp-plugins-standard.install	2012-07-03 14:29:53.000000000 +0800
@@ -1 +1 @@
-usr/lib/freerdp/*.so
+usr/lib/*/freerdp/*.so
diff -Nru freerdp-1.0.1/debian/libfreerdp1.install freerdp-1.0.1/debian/libfreerdp1.install
--- freerdp-1.0.1/debian/libfreerdp1.install	2012-02-01 09:50:00.000000000 +0800
+++ freerdp-1.0.1/debian/libfreerdp1.install	2012-07-03 14:29:53.000000000 +0800
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to