r1259 - in /unstable/ffmpeg/debian: changelog ffmpeg-doc.install rules

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

Author: fabian-guest
Date: Wed Jun 18 12:23:14 2008
New Revision: 1259

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1259
Log:
* debian/ffmpeg-doc.install:
+ Added.
* debian/rules:
+ Avoid dependency of build-stamp rule on phony targets.


Added:
    unstable/ffmpeg/debian/ffmpeg-doc.install
Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/rules

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1259&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Wed Jun 18 12:23:14 2008
@@ -14,10 +14,13 @@
     + Added doxygen to Build-Depends.
     + Introduced new package 'ffmpeg-doc' that contains html doxygen
       documentation of the ffmpeg API (Closes: 438369).
+  * debian/ffmpeg-doc.install:
+    + Added.
   * debian/rules:
     + Build and install html doxygen documentation.
-
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 16 Jun 2008 15:34:46 +0200
+    + Avoid dependency of build-stamp rule on phony targets.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 18 Jun 2008 14:11:01 +0200
 
 ffmpeg-free (0.svn20080206-8) unstable; urgency=low
 

Added: unstable/ffmpeg/debian/ffmpeg-doc.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/ffmpeg-doc.install?rev=1259&op=file
==============================================================================
--- unstable/ffmpeg/debian/ffmpeg-doc.install (added)
+++ unstable/ffmpeg/debian/ffmpeg-doc.install Wed Jun 18 12:23:14 2008
@@ -1,0 +1,1 @@
+usr/share/doc/ffmpeg-doc

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1259&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Wed Jun 18 12:23:14 2008
@@ -85,8 +85,8 @@
 config-extra-includes.h:
 	sh debian/fixup-config.sh > config-extra-includes.h
 
-build: config-extra-includes.h build-stamp
-build-stamp: patch
+build: config-extra-includes.h patch build-stamp
+build-stamp:
 	dh_testdir
 
 	# Build static libraries
@@ -121,7 +121,6 @@
 	$(MAKE) tools/qt-faststart
 
 	# Build doxygen documentation
-	mkdir doxy
 	doxygen
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -138,7 +137,7 @@
 	for d in $(LIBS); do \
 	  rm -f $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
 	done
-	rf -rf doxy/
+	rm -rf doxy/
 	dh_clean config.log config-extra-includes.h config.h
 
 get-orig-source: