apt-0.7.20.2: disabled only doxygen instead of docs

* don't disable the 'docs' directory, it causes packaging to fail
* disable building doxygen documentation, it fails

diff --git a/recipes/apt/apt-0.7.20.2/no-doxygen.patch b/recipes/apt/apt-0.7.20.2/no-doxygen.patch
new file mode 100644 (file)
index 0000000..74fde5f
--- /dev/null
+++ b/recipes/apt/apt-0.7.20.2/no-doxygen.patch
@@ -0,0 +1,12 @@
+diff -urN apt-0.7.20.2.orig/doc/makefile apt-0.7.20.2/doc/makefile
+--- apt-0.7.20.2.orig/doc/makefile     2009-02-07 16:09:35.000000000 +0100
++++ apt-0.7.20.2/doc/makefile  2009-09-30 09:25:59.000000000 +0200
+@@ -43,7 +43,7 @@
+ doc.pl: %.pl:
+       $(MAKE) -C pl $*
+ 
+-ifdef DOXYGEN
++ifdef DOXYGEN_IS_DISABLED
+ DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )
+ 
+ clean: doxygen-clean

diff --git a/recipes/apt/apt-0.7.20.2/nodoc.patch b/recipes/apt/apt-0.7.20.2/nodoc.patch
deleted file mode 100644 (file)
index db8cf93..0000000
--- a/recipes/apt/apt-0.7.20.2/nodoc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- apt-0.7.14.orig/Makefile
-+++ apt-0.7.14/Makefile
-@@ -15,11 +15,11 @@ all headers library clean veryclean bina
-       $(MAKE) -C apt-inst $@
-       $(MAKE) -C methods $@
-       $(MAKE) -C cmdline $@
-       $(MAKE) -C ftparchive $@
-       $(MAKE) -C dselect $@
--      $(MAKE) -C doc $@
-+#     $(MAKE) -C doc $@
-       $(MAKE) -C po $@
- 
- # Some very common aliases
- .PHONY: maintainer-clean dist-clean distclean pristine sanity 
- maintainer-clean dist-clean distclean pristine sanity: veryclean

diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb
index 318b94c..88047cc 100644 (file)
--- a/recipes/apt/apt_0.7.20.2.bb
+++ b/recipes/apt/apt_0.7.20.2.bb
@@ -4,11 +4,10 @@ RDEPENDS = "dpkg"
 require apt.inc
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
+           file://no-doxygen.patch;patch=1 \
            file://no-ko-translation.patch;patch=1 \
            file://use-host.patch;patch=1 "
 
-SRC_URI += "file://nodoc.patch;patch=1"
-
 require apt-package.inc
 
 FILES_${PN} += "${bindir}/apt-key"