[SCM] libquicktime packaging branch, master, updated. debian/1.1.4-1-2-ga0e8837

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a0e88374633a03b24253ec08a5fa3b1b1aa47847
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Feb 3 11:02:39 2010 +0100

    Removed 20-deprecated-headers.patch and dropped the symlink from quicktime to include/lqt, both are not necessary anymore.

diff --git a/debian/clean b/debian/clean
index 3083a12..a5e4186 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1 @@
-include/quicktime/quicktime
 po/libquicktime1.pot
-include/lqt
diff --git a/debian/patches/20-deprecated-headers.patch b/debian/patches/20-deprecated-headers.patch
deleted file mode 100644
index 3ac8baf..0000000
--- a/debian/patches/20-deprecated-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Avoid inclusion of deprecated headers (Closes: #407596).
-
---- libquicktime.orig/include/quicktime/lqt_codecapi.h
-+++ libquicktime/include/quicktime/lqt_codecapi.h
-@@ -28,8 +28,8 @@
- #pragma GCC visibility push(default)
- 
- #include <config.h>
--#include <quicktime/lqt_version.h>
--#include <quicktime/lqt.h>
-+#include <lqt/lqt_version.h>
-+#include <lqt/lqt.h>
- 
- #include <quicktime/qtprivate.h>
- 
---- libquicktime.orig/lqt.m4
-+++ libquicktime/lqt.m4
-@@ -84,7 +84,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <quicktime/quicktime.h>
-+#include <lqt/quicktime.h>
- 
- char*
- my_strdup (char *str)
-@@ -171,7 +171,7 @@
-           LIBS="$LIBS $LQT_LIBS"
-           AC_TRY_LINK([
- #include <stdio.h>
--#include <quicktime/quicktime.h>
-+#include <lqt/quicktime.h>
- 
- int main(int argc, char *argv[])
- { return 0; }
diff --git a/debian/patches/series b/debian/patches/series
index 3b26089..95d6211 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 02-install-in-libquicktime1.patch
 03-spurious-files-in-potfiles-in.patch
-20-deprecated-headers.patch
 21-export-quicktime_set_window.patch
 70-relibtoolize.patch
diff --git a/debian/rules b/debian/rules
index db37b1b..d108f23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,6 @@ DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl --with-libdv
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
-pre-build::
-	ln -sf quicktime include/lqt
-
 binary-install/libquicktime-doc::
 	# Symlinking qt4l_*.html to get rid of the prefix
 	for HTML in debian/libquicktime-doc/usr/share/doc/libquicktime-doc/qt4l_*.html; \

-- 
libquicktime packaging