r12939 - in /desktop/unstable/gtk-doc/debian: changelog patches/60_underquoted-macros.patch patches/70_mandatory-automake.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Oct 2 08:24:42 UTC 2007
Author: slomo
Date: Tue Oct 2 08:24:42 2007
New Revision: 12939
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12939
Log:
* debian/patches/60_underquoted-macros.patch:
+ Dropped, merged upstream.
* debian/patches/70_mandatory-automake.patch:
+ Regenerated for the new version.
Removed:
desktop/unstable/gtk-doc/debian/patches/60_underquoted-macros.patch
Modified:
desktop/unstable/gtk-doc/debian/changelog
desktop/unstable/gtk-doc/debian/patches/70_mandatory-automake.patch
Modified: desktop/unstable/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/changelog?rev=12939&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/changelog (original)
+++ desktop/unstable/gtk-doc/debian/changelog Tue Oct 2 08:24:42 2007
@@ -1,6 +1,10 @@
gtk-doc (1.9-1) unstable; urgency=low
* New upstream release.
+ * debian/patches/60_underquoted-macros.patch:
+ + Dropped, merged upstream.
+ * debian/patches/70_mandatory-automake.patch:
+ + Regenerated for the new version.
-- Sebastian Dröge <slomo at debian.org> Tue, 02 Oct 2007 10:17:22 +0200
Modified: desktop/unstable/gtk-doc/debian/patches/70_mandatory-automake.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/70_mandatory-automake.patch?rev=12939&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/70_mandatory-automake.patch (original)
+++ desktop/unstable/gtk-doc/debian/patches/70_mandatory-automake.patch Tue Oct 2 08:24:42 2007
@@ -1,94 +1,19 @@
-diff -Nur gtk-doc-1.8/help/Makefile.in gtk-doc-1.8.new/help/Makefile.in
---- gtk-doc-1.8/help/Makefile.in 2007-02-16 15:49:53.000000000 +0100
-+++ gtk-doc-1.8.new/help/Makefile.in 2007-02-16 22:31:30.000000000 +0100
-@@ -110,8 +110,6 @@
- XML_CATALOG_FILE = @XML_CATALOG_FILE@
- XSLTPROC = @XSLTPROC@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
-@@ -122,19 +120,26 @@
- bindir = @bindir@
- build_alias = @build_alias@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
+diff -Naur gtk-doc-1.9.old/help/manual/C/Makefile.in gtk-doc-1.9/help/manual/C/Makefile.in
+--- gtk-doc-1.9.old/help/manual/C/Makefile.in 2007-09-24 21:18:34.000000000 +0200
++++ gtk-doc-1.9/help/manual/C/Makefile.in 2007-10-02 10:23:24.000000000 +0200
+@@ -212,8 +212,7 @@
+ # ********** Begin of section some packagers may need to modify **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+- at ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+-docdir = @docdir@
++docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+ dvidir = @dvidir@
exec_prefix = @exec_prefix@
- host_alias = @host_alias@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- scrollkeeper_config = @scrollkeeper_config@
- sharedstatedir = @sharedstatedir@
-diff -Nur gtk-doc-1.8/help/manual/C/Makefile.in gtk-doc-1.8.new/help/manual/C/Makefile.in
---- gtk-doc-1.8/help/manual/C/Makefile.in 2007-02-16 15:49:53.000000000 +0100
-+++ gtk-doc-1.8.new/help/manual/C/Makefile.in 2007-02-16 22:31:31.000000000 +0100
-@@ -165,8 +165,6 @@
- XML_CATALOG_FILE = @XML_CATALOG_FILE@
- XSLTPROC = @XSLTPROC@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
-@@ -177,19 +175,30 @@
- bindir = @bindir@
- build_alias = @build_alias@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+
-+# ********** Begin of section some packagers may need to modify **********
-+# This variable (docdir) specifies where the documents should be installed.
-+# This default value should work for most packages.
-+docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- scrollkeeper_config = @scrollkeeper_config@
- sharedstatedir = @sharedstatedir@
-@@ -201,17 +210,12 @@
- omffile = gtk-doc-manual-C.omf
+ glib_prefix = @glib_prefix@
+@@ -249,11 +248,11 @@
entities = fdl-appendix.xml
--# ********** Begin of section some packagers may need to modify **********
--# This variable (docdir) specifies where the documents should be installed.
--# This default value should work for most packages.
-- at ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
--
# ********** You should not have to edit below this line **********
- at ENABLE_SCROLLKEEPER_TRUE@xml_files = $(entities) $(docname).xml
- at ENABLE_SCROLLKEEPER_TRUE@EXTRA_DIST = $(xml_files) $(omffile)
@@ -103,7 +28,7 @@
all: all-am
.SUFFIXES:
-@@ -253,7 +257,6 @@
+@@ -304,7 +303,6 @@
ctags: CTAGS
CTAGS:
@@ -111,7 +36,7 @@
distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/../../..
-@@ -315,10 +318,6 @@
+@@ -366,10 +364,6 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@@ -121,26 +46,13 @@
- at ENABLE_SCROLLKEEPER_FALSE@install-data-hook:
clean: clean-am
- clean-am: clean-generic clean-local mostlyclean-am
-@@ -381,94 +380,98 @@
+ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+@@ -433,94 +427,98 @@
# At some point, it may be wise to change to something like this:
# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
- at ENABLE_SCROLLKEEPER_TRUE@omf: omf_timestamp
+omf: omf_timestamp
-+
-+omf_timestamp: $(omffile)
-+ -for file in $(omffile); do \
-+ scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-+ done; \
-+ touch omf_timestamp
-+
-+install-data-hook-omf:
-+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-+ for file in $(omffile); do \
-+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ done
-+ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- at ENABLE_SCROLLKEEPER_TRUE@omf_timestamp: $(omffile)
- at ENABLE_SCROLLKEEPER_TRUE@ -for file in $(omffile); do \
@@ -213,6 +125,25 @@
- at ENABLE_SCROLLKEEPER_TRUE@ rm -f $(DESTDIR)$(docdir)/$$file; \
- at ENABLE_SCROLLKEEPER_TRUE@ done
- at ENABLE_SCROLLKEEPER_TRUE@ -rmdir $(DESTDIR)$(docdir)
++omf_timestamp: $(omffile)
++ -for file in $(omffile); do \
++ scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
++ done; \
++ touch omf_timestamp
+
+- at ENABLE_SCROLLKEEPER_TRUE@clean-local: clean-local-doc clean-local-omf
++install-data-hook-omf:
++ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
++ for file in $(omffile); do \
++ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ done
++ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+
+-# for non-srcdir builds, remove the copied entities.
+- at ENABLE_SCROLLKEEPER_TRUE@clean-local-doc:
+- at ENABLE_SCROLLKEEPER_TRUE@ if test $(srcdir) != .; then \
+- at ENABLE_SCROLLKEEPER_TRUE@ rm -f $(entities); \
+- at ENABLE_SCROLLKEEPER_TRUE@ fi
+uninstall-local-omf:
+ -for file in $(srcdir)/*.omf; do \
+ basefile=`basename $$file`; \
@@ -220,21 +151,15 @@
+ done
+ -rmdir $(DESTDIR)$(omf_dest_dir)
+ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir)
-
-- at ENABLE_SCROLLKEEPER_TRUE@clean-local: clean-local-doc clean-local-omf
++
+clean-local-omf:
+ -for file in $(omffile); do \
+ rm -f $$file.out; \
+ done
--# for non-srcdir builds, remove the copied entities.
-- at ENABLE_SCROLLKEEPER_TRUE@clean-local-doc:
-- at ENABLE_SCROLLKEEPER_TRUE@ if test $(srcdir) != .; then \
-- at ENABLE_SCROLLKEEPER_TRUE@ rm -f $(entities); \
-- at ENABLE_SCROLLKEEPER_TRUE@ fi
+- at ENABLE_SCROLLKEEPER_TRUE@dist-hook: app-dist-hook
+all: omf
-
-- at ENABLE_SCROLLKEEPER_TRUE@dist-hook: app-dist-hook
++
+$(docname).xml: $(entities)
+ -ourdir=`pwd`; \
+ cd $(srcdir); \
@@ -300,81 +225,3 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -Nur gtk-doc-1.8/help/manual/Makefile.in gtk-doc-1.8.new/help/manual/Makefile.in
---- gtk-doc-1.8/help/manual/Makefile.in 2007-02-16 15:49:53.000000000 +0100
-+++ gtk-doc-1.8.new/help/manual/Makefile.in 2007-02-16 22:31:31.000000000 +0100
-@@ -110,8 +110,6 @@
- XML_CATALOG_FILE = @XML_CATALOG_FILE@
- XSLTPROC = @XSLTPROC@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
-@@ -122,19 +120,26 @@
- bindir = @bindir@
- build_alias = @build_alias@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- scrollkeeper_config = @scrollkeeper_config@
- sharedstatedir = @sharedstatedir@
-diff -Nur gtk-doc-1.8/Makefile.in gtk-doc-1.8.new/Makefile.in
---- gtk-doc-1.8/Makefile.in 2007-02-16 15:49:53.000000000 +0100
-+++ gtk-doc-1.8.new/Makefile.in 2007-02-16 22:31:31.000000000 +0100
-@@ -153,8 +153,6 @@
- XML_CATALOG_FILE = @XML_CATALOG_FILE@
- XSLTPROC = @XSLTPROC@
- ac_ct_CC = @ac_ct_CC@
--ac_ct_STRIP = @ac_ct_STRIP@
--ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__include = @am__include@
-@@ -165,19 +163,26 @@
- bindir = @bindir@
- build_alias = @build_alias@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host_alias = @host_alias@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- scrollkeeper_config = @scrollkeeper_config@
- sharedstatedir = @sharedstatedir@
More information about the pkg-gnome-commits
mailing list