r1253 - in /unstable/ffmpeg/debian: changelog control rules

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

Author: fabian-guest
Date: Mon Jun 16 13:01:42 2008
New Revision: 1253

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1253
Log:
* debian/control:
+ Added doxygen to Build-Depends.
+ Introduced new package 'ffmpeg-doc' that contains html doxygen
documentation of the ffmpeg API (Closes: 438369).
* debian/rules:
+ Build and install html doxygen documentation.


Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/control
    unstable/ffmpeg/debian/rules

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1253&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Mon Jun 16 13:01:42 2008
@@ -1,11 +1,20 @@
 ffmpeg-free (0.svn20080206-9) unstable; urgency=low
 
+  [ Reinhard Tartler ]
   * cleanup 010_proper_rpath.diff: remove spurious linker search paths.
   * debian/strip.sh: no need to remove the glue code for x264 and xvid.
     However, since that code is not built in debian anyway, the orig.tar.gz
     was not rebuilt with this change.
 
- -- Reinhard Tartler <siretart at tauware.de>  Fri, 06 Jun 2008 17:52:53 +0200
+  [ Fabian Greffrath ]
+  * debian/control:
+    + Added doxygen to Build-Depends.
+    + Introduced new package 'ffmpeg-doc' that contains html doxygen
+      documentation of the ffmpeg API (Closes: 438369).
+  * debian/rules:
+    + Build and install html doxygen documentation.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 16 Jun 2008 14:54:47 +0200
 
 ffmpeg-free (0.svn20080206-8) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/control?rev=1253&op=diff
==============================================================================
--- unstable/ffmpeg/debian/control (original)
+++ unstable/ffmpeg/debian/control Mon Jun 16 13:01:42 2008
@@ -7,6 +7,7 @@
            Reinhard Tartler <siretart at tauware.de>,
            Fabian Greffrath <fabian at debian-unofficial.org>
 Build-Depends: debhelper (>= 5.0.0),
+               doxygen,
                liba52-0.7.4-dev | liba52-dev,
                libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libfaad-dev | libfaad2-dev,
@@ -55,6 +56,13 @@
  Most people will not need this package. Please install it to produce useful
  stacktraces to help debugging the ffmpeg library.
 
+Package: ffmpeg-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: documentation symbols for ffmpeg related packages
+ This package contains html doxygen documentation of the ffmpeg API.
+
 Package: libavutil49
 Section: libs
 Architecture: any

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1253&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Mon Jun 16 13:01:42 2008
@@ -120,6 +120,10 @@
 	# Build qt-faststart
 	$(MAKE) tools/qt-faststart
 
+	# Build doxygen documentation
+	mkdir doxy
+	doxygen
+
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	-$(MAKE) test
 endif
@@ -134,6 +138,7 @@
 	for d in $(LIBS); do \
 	  rm -f $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
 	done
+	rf -rf doxy/
 	dh_clean config.log config-extra-includes.h config.h
 
 get-orig-source:
@@ -153,7 +158,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc usr/include/ffmpeg usr/lib usr/bin usr/share/man/man1 usr/include/postproc
+	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc usr/include/ffmpeg usr/lib usr/bin usr/share/man/man1 usr/include/postproc usr/share/doc/ffmpeg-doc/html
 
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
 	cp libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
@@ -162,6 +167,7 @@
 	cp libpostproc.pc debian/tmp/usr/lib/pkgconfig/
 	for d in $(LIBS); do cp $$d/$$d.so* debian/tmp/usr/lib; done
 	cp doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
+	cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/
 	cp doc/ffserver.conf debian/tmp/etc/
 
 	sed -e s/@FIREWIRELIBS@/$(FIREWIRELIBS)/ -e s/@VERSION@/$(DEB_VERSION)/ ffmpeg-config.in > debian/tmp/usr/bin/ffmpeg-config