Merge branch 'debian-unstable' into debian-experimental

Make available all changes from latest upload to Debian unstable (1.0.2-3)
within the preparation of the FreeRDP 1.1.x-y package series (available
via debian-experimental).

Conflicts:
	debian/changelog
	debian/rules

debian/changelog

@@ -6,6 +6,22 @@ freerdp (1.1.0~beta1+git20130629-1) experimental; urgency=low
 
  -- Mike Gabriel <sunweaver@debian.org>  Sat, 29 Jun 2013 11:50:57 +0200
 
+freerdp (1.0.2-3) unstable; urgency=low
+
+  * Add patch: 1001_fix-compliling.patch. Fix compilation errors
+    against libfreerdp-dev. Thanks to Jean-Baptiste Rouault for
+    reporting this. (Closes: #729044).
+  * debian/control:
+    + Alioth-canonicalize Vcs-*: fields.
+    + Make freerdp-dbg bin:package Multi-Arch: same.
+    + Split up freerdp-dbg in several -dbg packages (freerdp-x11-dbg
+      -> multi-arch: no, libfreerdp*-dbg -> Multi-Arch: same).
+  * debian/rules:
+    + Patch generated man page file. Fixes hyphen-used-as-minus-sign
+      lintian issue.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sat, 09 Nov 2013 13:34:40 +0100
+
 freerdp (1.0.2-2) unstable; urgency=low
 
   * debian/watch: Upstream has moved to Github a while ago.

debian/control

@@ -12,22 +12,8 @@ Build-Depends:
  pkg-config, xmlto, libavcodec-dev, libxi-dev
 Standards-Version: 3.9.4
 Homepage: http://www.freerdp.com/
-Vcs-Browser: http://git.debian.org/?p=collab-maint/freerdp.git
-Vcs-Git: git://git.debian.org/git/collab-maint/freerdp.git
-
-Package: freerdp-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- ${misc:Depends}, freerdp-x11 (= ${binary:Version}),
- libfreerdp1 (= ${binary:Version}),
- libfreerdp-plugins-standard (= ${binary:Version}),
-Description: RDP client for Windows Terminal Services (debug)
- FreeRDP is a client for Windows Terminal Services implementing the Remote
- Desktop Protocol (RDP).
- .
- This package contains the debug symbols.
+Vcs-Browser: http://anonscm.debian.org/gitweb?p=collab-maint/freerdp.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/freerdp.git
 
 Package: freerdp-x11
 Architecture: any
@@ -88,3 +74,41 @@ Description: RDP client for Windows Terminal Services (development)
  Desktop Protocol (RDP).
  .
  This package contains the development files.
+
+Package: freerdp-x11-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ ${misc:Depends}, freerdp-x11 (= ${binary:Version}),
+Description: RDP client for Windows Terminal Services (debug)
+ FreeRDP is a client for Windows Terminal Services implementing the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the debug symbols of the xfreerdp executable.
+
+Package: libfreerdp1-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Multi-Arch: same
+Depends:
+  ${misc:Depends}, libfreerdp1 (= ${binary:Version}),
+Description: RDP client for Windows Terminal Services (library debug)
+ FreeRDP is a client for Windows Terminal Services implementing the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the debug symbols of libfreerdp1.
+
+Package: libfreerdp-plugins-standard-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Multi-Arch: same
+Depends:
+  ${misc:Depends}, libfreerdp-plugins-standard (= ${binary:Version}),
+Description: RDP client for Windows Terminal Services (plugins debug)
+ FreeRDP is a client for Windows Terminal Services implementing the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the debug symbols of libfreerdp-plugin-standard.

debian/libfreerdp1.lintian-overrides

+# libfreerdp1 ships several library files in one package
+libfreerdp1: package-name-doesnt-match-sonames libfreerdp-cache1.0 libfreerdp-channels1.0 libfreerdp-codec1.0 libfreerdp-core1.0 libfreerdp-gdi1.0 libfreerdp-kbd1.0 libfreerdp-rail1.0 libfreerdp-utils1.0
\ No newline at end of file

debian/patches/1001_fix-compliling.patch

+Description: Trying to build something against libfreerdp-dev leads to compilation errors.
+Author: "Jean-Baptiste Rouault" <jean-baptiste.rouault@diateam.net>
+Abstract:
+ Trying to build against libfreerdp-dev leads to compilation errors similar to the
+ followin one:
+ .
+ <quote>
+ In file included from /usr/include/freerdp/gdi/gdi.h:26:0,
+ [...]
+ /usr/include/freerdp/utils/debug.h:23:20: fatal error: config.h: No such file or directory
+ </quote>
+Index: include/freerdp/utils/debug.h
+===================================================================
+--- a/include/freerdp/utils/debug.h	2013-02-19 09:35:03.000000000 +0100
++++ b/include/freerdp/utils/debug.h	2013-02-19 09:35:25.000000000 +0100
+@@ -20,8 +20,6 @@
+ #ifndef __UTILS_DEBUG_H
+ #define __UTILS_DEBUG_H
+ 
+-#include "config.h"
+-
+ #include <stdio.h>
+ 
+ #define DEBUG_NULL(fmt, ...) do { } while (0)
+Index: libfreerdp-core/freerdp.c
+===================================================================
+--- a/libfreerdp-core/freerdp.c	2013-02-19 09:34:31.000000000 +0100
++++ b/libfreerdp-core/freerdp.c	2013-02-19 09:34:51.000000000 +0100
+@@ -17,6 +17,7 @@
+  * limitations under the License.
+  */
+ 
++#include "config.h"
+ #include "rdp.h"
+ #include "input.h"
+ #include "update.h"

debian/patches/README

+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.

debian/patches/series

+1001_fix-compliling.patch

debian/rules

@@ -15,7 +15,9 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_strip:
-	dh_strip --dbg-package=freerdp-dbg
+	dh_strip -pfreerdp-x11 --dbg-package=freerdp-x11-dbg
+	dh_strip -plibfreerdp1 --dbg-package=libfreerdp1-dbg
+	dh_strip -plibfreerdp-plugins-standard --dbg-package=libfreerdp-plugins-standard-dbg
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V -- -c4