rev 6108 - kde-extras/exiv2/trunk/debian

[Mark Purcell]

Author: msp
Date: 2007-05-09 21:26:10 +0000 (Wed, 09 May 2007)
New Revision: 6108

Added:
   kde-extras/exiv2/trunk/debian/libexiv2-doc.docs
Modified:
   kde-extras/exiv2/trunk/debian/changelog
   kde-extras/exiv2/trunk/debian/control
   kde-extras/exiv2/trunk/debian/libexiv2-0.install
   kde-extras/exiv2/trunk/debian/libexiv2-dev.install
   kde-extras/exiv2/trunk/debian/rules
Log:
* Build-Depends: doxygen, graphviz, python, xsltproc
* Reinstate libexiv2-doc, better to build with doxygen than other tarball
* Rework debian/libexiv2-dev.install
* Rework debian/libexiv2-doc.docs
* Add build/libexiv2-dev:: to debian/rules

Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog	2007-05-09 20:45:09 UTC (rev 6107)
+++ kde-extras/exiv2/trunk/debian/changelog	2007-05-09 21:26:10 UTC (rev 6108)
@@ -7,17 +7,19 @@
   * libexiv2-dev: exiv2 has no exiv2-config script anymore.
   * debian/control:
     + Etch does not have a libexiv2 package.  So remove Replaces/Conflict.
-    + Remove -doc package. With 0.14 docs are in a separate tarball.
     + libexiv2-dev: No need to depend on ${shlibs:Depends}, ${misc:Depends}
   * debian/exiv2.1 removed: included upstream.
   * debian/libexiv2-0: install message catalogs
 
   [ Mark Purcell ]
   * FTBFS with GCC 4.3: missing #includes (Closes: #417176)
-  * Build-Depends: gettext
-  * Build-Depends: doxygen
+  * Build-Depends: doxygen, graphviz, python, xsltproc
+  * Reinstate libexiv2-doc, better to build with doxygen than other tarball
+  * Rework debian/libexiv2-dev.install
+  * Rework debian/libexiv2-doc.docs
+  * Add build/libexiv2-dev:: to debian/rules
 
- -- Mark Purcell <msp at debian.org>  Wed, 09 May 2007 21:40:25 +0100
+ -- Mark Purcell <msp at debian.org>  Wed, 09 May 2007 22:25:38 +0100
 
 exiv2 (0.12-1) unstable; urgency=low
 

Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control	2007-05-09 20:45:09 UTC (rev 6107)
+++ kde-extras/exiv2/trunk/debian/control	2007-05-09 21:26:10 UTC (rev 6108)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: KELEMEN Peter <fuji at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 4.0.0), g++ (>= 4.0.0), autotools-dev, chrpath, dpkg-dev (>= 1.13.19), zlib1g-dev, cdbs, gettext, doxygen
+Build-Depends: debhelper (>= 4.0.0), g++ (>= 4.0.0), autotools-dev, chrpath, dpkg-dev (>= 1.13.19), zlib1g-dev, cdbs, doxygen, graphviz, python, xsltproc
 Standards-Version: 3.7.2
 
 Package: exiv2
@@ -55,3 +55,9 @@
 Suggests: libexiv2-doc
 Description: EXIF/IPTC metadata manipulation library - development files
  Exiv2 C++ header files.
+
+Package: libexiv2-doc
+Section: doc
+Architecture: all
+Description: EXIF/IPTC metadata manipulation library - HTML documentation
+ Exiv2 HTML documentation.

Modified: kde-extras/exiv2/trunk/debian/libexiv2-0.install
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-0.install	2007-05-09 20:45:09 UTC (rev 6107)
+++ kde-extras/exiv2/trunk/debian/libexiv2-0.install	2007-05-09 21:26:10 UTC (rev 6108)
@@ -1 +1 @@
-debian/tmp/usr/lib/libexiv2*.so
+debian/tmp/usr/lib/lib*.so.*

Modified: kde-extras/exiv2/trunk/debian/libexiv2-dev.install
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-dev.install	2007-05-09 20:45:09 UTC (rev 6107)
+++ kde-extras/exiv2/trunk/debian/libexiv2-dev.install	2007-05-09 21:26:10 UTC (rev 6108)
@@ -1,5 +1,6 @@
 debian/tmp/usr/include/*
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/libexiv2.so
 debian/tmp/usr/share/locale/*
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/lib*.so

Added: kde-extras/exiv2/trunk/debian/libexiv2-doc.docs
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-doc.docs	2007-05-09 20:45:09 UTC (rev 6107)
+++ kde-extras/exiv2/trunk/debian/libexiv2-doc.docs	2007-05-09 21:26:10 UTC (rev 6108)
@@ -0,0 +1,3 @@
+doc/html
+doc/include
+doc/index.html

Modified: kde-extras/exiv2/trunk/debian/rules
===================================================================
--- kde-extras/exiv2/trunk/debian/rules	2007-05-09 20:45:09 UTC (rev 6107)
+++ kde-extras/exiv2/trunk/debian/rules	2007-05-09 21:26:10 UTC (rev 6108)
@@ -8,6 +8,9 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+build/libexiv2-dev::
+	$(MAKE) docs
+
 install/exiv2::
 	/usr/bin/chrpath -d $(CURDIR)/debian/tmp/usr/bin/exiv2