- install html doxygen in libapt-pkg-doc

* debian/control:
  - build-depend on doxygen

diff --git a/configure.in b/configure.in
index 82785a9dddcc235d37685067b2bfbc0246276f29..5e7122f33fcc972508d8f1638584a1c74cfa8a0d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.25.4")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.26~exp4")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 65c0356f936ec926346ba341b0424731fd07ffe5..cffdeb486dcf99c99ce5f9192a44d3e0f66c46ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,7 +69,9 @@ apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low
   * apt-pkg/deb/debrecords.cc:
     - fix max tag buffer size (LP: #545336, closes: #578959)
   * debian/rules:
-    - install html doxygen in libapt-pkg-doc as well
+    - install html doxygen in libapt-pkg-doc 
+  * debian/control:
+    - build-depend on doxygen
 
   [ Julian Andres Klode ]
   * apt-pkg/contrib/weakptr.h:
@@ -84,7 +86,7 @@ apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low
   * cmdline/apt-get.cc:
     - Add apt-get markauto and unmarkauto commands.
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 03 Apr 2010 14:58:39 +0200
+ -- Michael Vogt <mvo@debian.org>  Thu, 06 May 2010 09:32:54 +0200
 
 apt (0.7.26~exp3) experimental; urgency=low
 

diff --git a/debian/control b/debian/control
index ad4ed24eca4e7837fbd5ac92e07ccc86f847c881..4f41c130b43975a6317522cde1ac3f080a5e75a9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
  Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen
 Build-Conflicts: autoconf2.13, automake1.4
 
 Package: apt

diff --git a/debian/rules b/debian/rules
index 7677708b25b9988aad7d545c9282a01bc02dea41..f901ea749844e315cb9a75f4d41060cec7ff9b32 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -142,10 +142,10 @@ libapt-pkg-doc: build-doc debian/shlibs.local
 #
 # libapt-pkg-doc install
 #      
-       dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
+       dh_installdocs -p$@ $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
                             $(BLD)/docs/files* $(BLD)/docs/method* \
                            doc/libapt-pkg2_to_3.txt doc/style.txt \
-                           $(BLD)/doc/doxygen/html/*
+                           $(BLD)/doc/doxygen/html
        dh_installexamples -p$@
 #      dh_installmenu -p$@
 #      dh_installinit -p$@