[SCM] libmms packaging branch, master, updated. upstream/0.6-10-g3aded6e

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Wed Jun 2 09:12:39 UTC 2010


The following commit has been merged in the master branch:
commit 3aded6e72a5da1342d2a9a2c8d610a703ffedc45
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 11:13:57 2010 +0200

    Really commit the patch.

diff --git a/debian/changelog b/debian/changelog
index 98f0889..eb04e87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libmms (0.6-1) UNRELEASED; urgency=low
   * Update Arthur's e-mail address.
   * Refresh 10_this_keyword.diff.
   * Remove 11_nested_comments.diff, applied upstream.
+  * Add patch from upstream GIT to remove unneeded bswap.h from public
+    headers and avoid needless dependency on glib.h (Closes: #362657).
 
  -- Fabian Greffrath <fabian+debian at greffrath.com>  Wed, 02 Jun 2010 10:43:26 +0200
 
diff --git a/debian/patches/0001-Remove-unneeded-bswap.h-from-public-headers.patch b/debian/patches/0001-Remove-unneeded-bswap.h-from-public-headers.patch
new file mode 100644
index 0000000..364401c
--- /dev/null
+++ b/debian/patches/0001-Remove-unneeded-bswap.h-from-public-headers.patch
@@ -0,0 +1,39 @@
+From 144f65dbef2f273f4b235b618eb7aeb041949a8c Mon Sep 17 00:00:00 2001
+From: Hans de Goede <j.w.r.degoede at hhs.nl>
+Date: Wed, 2 Jun 2010 10:21:28 +0200
+Subject: [PATCH 1/2] Remove unneeded bswap.h from public headers
+
+This resolves:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=362657
+---
+ src/Makefile.am |    1 -
+ src/mms.h       |    1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9031b11..af01af6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -28,7 +28,6 @@ libmmsincdir = $(includedir)/libmms
+ libmmsinc_HEADERS = 	\
+ 	mms.h		\
+ 	mms_config.h	\
+-	bswap.h		\
+ 	mmsio.h		\
+ 	mmsx.h		\
+ 	mmsh.h
+diff --git a/src/mms.h b/src/mms.h
+index 0faa701..35e915e 100644
+--- a/src/mms.h
++++ b/src/mms.h
+@@ -38,7 +38,6 @@
+ 
+ /* #include "xine_internal.h" */
+ 
+-#include "bswap.h"
+ #include "mmsio.h"
+ 
+ #ifdef __cplusplus
+-- 
+1.7.1
+

-- 
libmms packaging



More information about the pkg-multimedia-commits mailing list