r19692 - /desktop/unstable/vte/debian/patches/90_autoreconf.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Apr 22 23:18:51 UTC 2009 

Author: joss
Date: Wed Apr 22 23:18:51 2009
New Revision: 19692

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19692
Log:
Add gtk-doc.make to the patch, grrrr

Modified:
    desktop/unstable/vte/debian/patches/90_autoreconf.patch

Modified: desktop/unstable/vte/debian/patches/90_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/90_autoreconf.patch?rev=19692&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/90_autoreconf.patch (original)
+++ desktop/unstable/vte/debian/patches/90_autoreconf.patch Wed Apr 22 23:18:51 2009
@@ -4,10 +4,12 @@
 autoheader 
 autoconf 
 rm -rf autom4te.cache/
+cp /usr/share/gtk-doc/data/gtk-doc.make .
 
-diff -pruN vte-0.20.1.orig/aclocal.m4 vte-0.20.1/aclocal.m4
+Index: vte-0.20.1/aclocal.m4
+===================================================================
 --- vte-0.20.1.orig/aclocal.m4	2009-04-12 20:04:36.000000000 +0200
-+++ vte-0.20.1/aclocal.m4	2009-04-23 00:51:56.535968508 +0200
++++ vte-0.20.1/aclocal.m4	2009-04-23 01:17:52.271968688 +0200
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
@@ -18748,9 +18750,10 @@
 +]) # _AM_PROG_TAR
  
  m4_include([acinclude.m4])
-diff -pruN vte-0.20.1.orig/configure vte-0.20.1/configure
+Index: vte-0.20.1/configure
+===================================================================
 --- vte-0.20.1.orig/configure	2009-04-12 20:04:47.000000000 +0200
-+++ vte-0.20.1/configure	2009-04-23 00:52:14.315963530 +0200
++++ vte-0.20.1/configure	2009-04-23 01:17:52.319965361 +0200
 @@ -1,11 +1,11 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -33699,9 +33702,10 @@
  
  
  
-diff -pruN vte-0.20.1.orig/doc/Makefile.in vte-0.20.1/doc/Makefile.in
+Index: vte-0.20.1/doc/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/doc/Makefile.in	2009-04-12 20:04:43.000000000 +0200
-+++ vte-0.20.1/doc/Makefile.in	2009-04-23 00:52:07.475965628 +0200
++++ vte-0.20.1/doc/Makefile.in	2009-04-23 01:17:52.319965361 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -33783,9 +33787,10 @@
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	mkid -fID $$unique
  tags: TAGS
-diff -pruN vte-0.20.1.orig/doc/openi18n/Makefile.in vte-0.20.1/doc/openi18n/Makefile.in
+Index: vte-0.20.1/doc/openi18n/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/doc/openi18n/Makefile.in	2009-04-12 20:04:43.000000000 +0200
-+++ vte-0.20.1/doc/openi18n/Makefile.in	2009-04-23 00:52:07.603964092 +0200
++++ vte-0.20.1/doc/openi18n/Makefile.in	2009-04-23 01:17:52.323968384 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -33867,9 +33872,10 @@
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	mkid -fID $$unique
  tags: TAGS
-diff -pruN vte-0.20.1.orig/doc/reference/Makefile.in vte-0.20.1/doc/reference/Makefile.in
+Index: vte-0.20.1/doc/reference/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/doc/reference/Makefile.in	2009-04-12 20:04:43.000000000 +0200
-+++ vte-0.20.1/doc/reference/Makefile.in	2009-04-23 00:52:07.703968778 +0200
++++ vte-0.20.1/doc/reference/Makefile.in	2009-04-23 01:17:52.323968384 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -34011,9 +34017,10 @@
  	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
  	      dashes="$$skipped"; \
  	  fi; \
-diff -pruN vte-0.20.1.orig/glade/Makefile.in vte-0.20.1/glade/Makefile.in
+Index: vte-0.20.1/glade/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/glade/Makefile.in	2009-04-12 20:04:43.000000000 +0200
-+++ vte-0.20.1/glade/Makefile.in	2009-04-23 00:52:07.787965281 +0200
++++ vte-0.20.1/glade/Makefile.in	2009-04-23 01:17:52.323968384 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -34086,9 +34093,10 @@
  	      exit 1;; \
  	  esac; \
  	done; \
-diff -pruN vte-0.20.1.orig/ltmain.sh vte-0.20.1/ltmain.sh
+Index: vte-0.20.1/ltmain.sh
+===================================================================
 --- vte-0.20.1.orig/ltmain.sh	2009-03-15 13:35:34.000000000 +0100
-+++ vte-0.20.1/ltmain.sh	2009-04-23 00:51:46.371465130 +0200
++++ vte-0.20.1/ltmain.sh	2009-04-23 01:17:52.331968074 +0200
 @@ -1,6 +1,6 @@
  # Generated from ltmain.m4sh.
  
@@ -35248,9 +35256,10 @@
  	  esac
  	  $ECHO > $output "\
  # $outputname - a libtool library file
-diff -pruN vte-0.20.1.orig/Makefile.in vte-0.20.1/Makefile.in
+Index: vte-0.20.1/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/Makefile.in	2009-04-12 20:04:45.000000000 +0200
-+++ vte-0.20.1/Makefile.in	2009-04-23 00:52:08.751967758 +0200
++++ vte-0.20.1/Makefile.in	2009-04-23 01:17:52.331968074 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -35330,9 +35339,10 @@
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	mkid -fID $$unique
  tags: TAGS
-diff -pruN vte-0.20.1.orig/perf/Makefile.in vte-0.20.1/perf/Makefile.in
+Index: vte-0.20.1/perf/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/perf/Makefile.in	2009-04-12 20:04:43.000000000 +0200
-+++ vte-0.20.1/perf/Makefile.in	2009-04-23 00:52:07.863964531 +0200
++++ vte-0.20.1/perf/Makefile.in	2009-04-23 01:17:52.331968074 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -35405,9 +35415,10 @@
  	      exit 1;; \
  	  esac; \
  	done; \
-diff -pruN vte-0.20.1.orig/python/Makefile.in vte-0.20.1/python/Makefile.in
+Index: vte-0.20.1/python/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/python/Makefile.in	2009-04-12 20:04:44.000000000 +0200
-+++ vte-0.20.1/python/Makefile.in	2009-04-23 00:52:07.991964450 +0200
++++ vte-0.20.1/python/Makefile.in	2009-04-23 01:17:52.331968074 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -35489,9 +35500,10 @@
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	mkid -fID $$unique
  tags: TAGS
-diff -pruN vte-0.20.1.orig/src/Makefile.in vte-0.20.1/src/Makefile.in
+Index: vte-0.20.1/src/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/src/Makefile.in	2009-04-12 20:04:44.000000000 +0200
-+++ vte-0.20.1/src/Makefile.in	2009-04-23 00:52:08.563966479 +0200
++++ vte-0.20.1/src/Makefile.in	2009-04-23 01:17:52.335967674 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -35642,9 +35654,10 @@
  	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
  	      dashes="$$skipped"; \
  	  fi; \
-diff -pruN vte-0.20.1.orig/termcaps/Makefile.in vte-0.20.1/termcaps/Makefile.in
+Index: vte-0.20.1/termcaps/Makefile.in
+===================================================================
 --- vte-0.20.1.orig/termcaps/Makefile.in	2009-04-12 20:04:45.000000000 +0200
-+++ vte-0.20.1/termcaps/Makefile.in	2009-04-23 00:52:08.651965026 +0200
++++ vte-0.20.1/termcaps/Makefile.in	2009-04-23 01:17:52.335967674 +0200
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -35717,3 +35730,56 @@
  	      exit 1;; \
  	  esac; \
  	done; \
+Index: vte-0.20.1/gtk-doc.make
+===================================================================
+--- vte-0.20.1.orig/gtk-doc.make	2009-04-23 01:17:55.883970199 +0200
++++ vte-0.20.1/gtk-doc.make	2009-04-23 01:18:00.323467123 +0200
+@@ -11,7 +11,7 @@ GTKDOC_RUN = $(LIBTOOL) --mode=execute
+ else
+ GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+-GTKDOC_RUN =
++GTKDOC_RUN = sh -c
+ endif
+ 
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -88,9 +88,10 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt
+ tmpl.stamp: tmpl-build.stamp
+ 	@true
+ 
+-$(srcdir)/tmpl/*.sgml:
++tmpl/*.sgml:
+ 	@true
+ 
++
+ #### xml ####
+ 
+ sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+@@ -118,7 +119,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
+ 	cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+ 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ 	@echo 'gtk-doc: Fixing cross-references'
+-	cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	touch html-build.stamp
+ 
+ ##############
+@@ -156,7 +157,8 @@ install-data-local:
+ 	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ 	  fi; \
+-	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
++	  ! which gtkdoc-rebase >/dev/null 2>&1 || \
++	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ 	fi
+ 
+ uninstall-local:
+@@ -188,6 +190,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
++	! which gtkdoc-rebase >/dev/null 2>&1 || \
++	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs

More information about the pkg-gnome-commits mailing list