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

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Apr 22 23:27:38 UTC 2009 

Author: joss
Date: Wed Apr 22 23:27:38 2009
New Revision: 19693

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19693
Log:
gtk-doc plague

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=19693&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/90_autoreconf.patch (original)
+++ desktop/unstable/vte/debian/patches/90_autoreconf.patch Wed Apr 22 23:27:38 2009
@@ -1,15 +1,15 @@
+cp /usr/share/gtk-doc/data/gtk-doc.make .
 libtoolize --force --copy
 aclocal
 automake -acf -Wno-portability
 autoheader 
 autoconf 
 rm -rf autom4te.cache/
-cp /usr/share/gtk-doc/data/gtk-doc.make .
 
 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 01:17:52.271968688 +0200
+--- vte-0.20.1.orig/aclocal.m4	2009-04-23 01:26:36.103473249 +0200
++++ vte-0.20.1/aclocal.m4	2009-04-23 01:26:38.623470893 +0200
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
@@ -18752,8 +18752,8 @@
  m4_include([acinclude.m4])
 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 01:17:52.319965361 +0200
+--- vte-0.20.1.orig/configure	2009-04-23 01:26:36.051485285 +0200
++++ vte-0.20.1/configure	2009-04-23 01:26:38.671465615 +0200
 @@ -1,11 +1,11 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -33704,8 +33704,8 @@
  
 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 01:17:52.319965361 +0200
+--- vte-0.20.1.orig/doc/Makefile.in	2009-04-23 01:26:36.023478303 +0200
++++ vte-0.20.1/doc/Makefile.in	2009-04-23 01:27:01.031465701 +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.
@@ -33789,8 +33789,8 @@
  tags: TAGS
 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 01:17:52.323968384 +0200
+--- vte-0.20.1.orig/doc/openi18n/Makefile.in	2009-04-23 01:26:35.983473984 +0200
++++ vte-0.20.1/doc/openi18n/Makefile.in	2009-04-23 01:27:01.155464076 +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.
@@ -33874,8 +33874,8 @@
  tags: TAGS
 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 01:17:52.323968384 +0200
+--- vte-0.20.1.orig/doc/reference/Makefile.in	2009-04-23 01:26:35.923473622 +0200
++++ vte-0.20.1/doc/reference/Makefile.in	2009-04-23 01:27:01.271464232 +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.
@@ -33937,6 +33937,15 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  
+@@ -316,7 +297,7 @@ MAINTAINERCLEANFILES = vte-undocumented.
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = 
++ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
+ 
+ # We set GPATH here; this gives us semantics for GNU make
 @@ -354,8 +335,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -34017,10 +34026,48 @@
  	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
  	      dashes="$$skipped"; \
  	  fi; \
+@@ -635,7 +629,7 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt
+ tmpl.stamp: tmpl-build.stamp
+ 	@true
+ 
+-$(srcdir)/tmpl/*.sgml:
++tmpl/*.sgml:
+ 	@true
+ 
+ #### xml ####
+@@ -665,7 +659,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
+ 
+ ##############
+@@ -703,7 +697,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:
+@@ -732,7 +727,8 @@ 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
+ 
 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 01:17:52.323968384 +0200
+--- vte-0.20.1.orig/glade/Makefile.in	2009-04-23 01:26:35.855472109 +0200
++++ vte-0.20.1/glade/Makefile.in	2009-04-23 01:27:01.359467173 +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.
@@ -34095,8 +34142,8 @@
  	done; \
 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 01:17:52.331968074 +0200
+--- vte-0.20.1.orig/ltmain.sh	2009-04-23 01:26:35.771476589 +0200
++++ vte-0.20.1/ltmain.sh	2009-04-23 01:26:38.679468728 +0200
 @@ -1,6 +1,6 @@
  # Generated from ltmain.m4sh.
  
@@ -35258,8 +35305,8 @@
  # $outputname - a libtool library file
 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 01:17:52.331968074 +0200
+--- vte-0.20.1.orig/Makefile.in	2009-04-23 01:26:35.743470585 +0200
++++ vte-0.20.1/Makefile.in	2009-04-23 01:27:02.323465253 +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.
@@ -35341,8 +35388,8 @@
  tags: TAGS
 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 01:17:52.331968074 +0200
+--- vte-0.20.1.orig/perf/Makefile.in	2009-04-23 01:26:35.659971766 +0200
++++ vte-0.20.1/perf/Makefile.in	2009-04-23 01:27:01.439464552 +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.
@@ -35417,8 +35464,8 @@
  	done; \
 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 01:17:52.331968074 +0200
+--- vte-0.20.1.orig/python/Makefile.in	2009-04-23 01:26:35.631472961 +0200
++++ vte-0.20.1/python/Makefile.in	2009-04-23 01:27:01.567466435 +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.
@@ -35502,8 +35549,8 @@
  tags: TAGS
 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 01:17:52.335967674 +0200
+--- vte-0.20.1.orig/src/Makefile.in	2009-04-23 01:26:35.575474152 +0200
++++ vte-0.20.1/src/Makefile.in	2009-04-23 01:27:02.135466911 +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.
@@ -35656,8 +35703,8 @@
  	  fi; \
 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 01:17:52.335967674 +0200
+--- vte-0.20.1.orig/termcaps/Makefile.in	2009-04-23 01:26:35.503468628 +0200
++++ vte-0.20.1/termcaps/Makefile.in	2009-04-23 01:27:02.223464484 +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.
@@ -35732,8 +35779,8 @@
  	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
+--- vte-0.20.1.orig/gtk-doc.make	2009-04-23 01:26:35.467479555 +0200
++++ vte-0.20.1/gtk-doc.make	2009-04-23 01:26:38.687467930 +0200
 @@ -11,7 +11,7 @@ GTKDOC_RUN = $(LIBTOOL) --mode=execute
  else
  GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

More information about the pkg-gnome-commits mailing list