r828 - in /unstable/libquicktime/debian: changelog control patches/00list rules

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

Author: fabian-guest
Date: Wed Jul 18 18:36:13 2007
New Revision: 828

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=828
Log:
Welcome back, 02-install-in-libquicktime1.dpatch
Remove conflicts and replaces against libquicktime0
Hack some symlinking in the doc/html to close #433653.

Modified:
    unstable/libquicktime/debian/changelog
    unstable/libquicktime/debian/control
    unstable/libquicktime/debian/patches/00list
    unstable/libquicktime/debian/rules

Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=828&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Wed Jul 18 18:36:13 2007
@@ -1,15 +1,14 @@
 libquicktime (2:1.0.0+debian-4) unstable; urgency=low
 
   * Upload to unstable (Closes: #421496).
-
-  * debian/patches/02-install-in-libquicktime1.dpatch:
-    + Disabled.
-  * debian/control:
-    + Replace (and conflict with) libquicktime0.
 
   * debian/patches/06-lqt-config-cflags.dpatch:
     + New patch: Fix "lqt-config --cflags" to get the include path
       (Closes: #391847).
+
+  * debian/rules:
+    + Symlinked doc/html/qt4l_*.html to get rid of the prefix
+      (Closes: #433653).
 
   * Pulled in patches from the unstable branch...
 
@@ -27,7 +26,7 @@
       Loic Minier to replace some unsigned long long casts with uint64_t casts
       instead; should fix build failure on amd64 (Closes: #417055).
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 17 Jul 2007 15:12:00 +0200
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 18 Jul 2007 20:34:00 +0200
 
 libquicktime (2:1.0.0+debian-3) experimental; urgency=low
 

Modified: unstable/libquicktime/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/control?rev=828&op=diff
==============================================================================
--- unstable/libquicktime/debian/control (original)
+++ unstable/libquicktime/debian/control Wed Jul 18 18:36:13 2007
@@ -12,8 +12,6 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libquicktime0
-Replaces: libquicktime0
 Description: library for reading and writing Quicktime files
  libquicktime is a library for reading and writing QuickTime files on UNIX
  systems. Video CODECs supported by this library are OpenDivX, MJPA, JPEG Photo,

Modified: unstable/libquicktime/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/00list?rev=828&op=diff
==============================================================================
--- unstable/libquicktime/debian/patches/00list (original)
+++ unstable/libquicktime/debian/patches/00list Wed Jul 18 18:36:13 2007
@@ -1,4 +1,5 @@
 01-debian-directory
+02-install-in-libquicktime1
 03-spurious-files-in-potfiles-in
 04-use-soname
 05-dont-depend-on-gthread

Modified: unstable/libquicktime/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/rules?rev=828&op=diff
==============================================================================
--- unstable/libquicktime/debian/rules (original)
+++ unstable/libquicktime/debian/rules Wed Jul 18 18:36:13 2007
@@ -68,6 +68,11 @@
 	# Installing documentation
 	install -d -m 0755 debian/libquicktime-dev/usr/share/doc/libquicktime-dev/html
 	cp -r doc/*.html debian/libquicktime-dev/usr/share/doc/libquicktime-dev/html
+	
+	# Symlinking qt4l_*.html to get rid of the prefix
+	for HTML in debian/libquicktime-dev/usr/share/doc/libquicktime-dev/html/qt4l_*.html; \
+		do ln -sf `basename $$HTML` `echo $$HTML | sed 's:qt4l_::'`; \
+	done
 
 binary-indep: build install