r22826 - in /desktop/unstable/gtk-doc/debian: changelog control patches/02_fixxref_fix_backwards_compatibility.patch patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Jan 19 21:42:21 UTC 2010
Author: pochu
Date: Tue Jan 19 21:42:21 2010
New Revision: 22826
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22826
Log:
* debian/patches/02_fixxref_fix_backwards_compatibility.patch:
- Backport change from upstream git, restore old compatibility,
since a change in the last version caused some packages to
FTBFS. Closes: #565902.
* debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch:
- Backport change from upstream git, touch $(DOC_MODULE)-overrides.txt
if it doesn't exist, since it's listed in EXTRA_DIST and is thus
needed to create a dist tarball. Closes: #565377.
* Thanks to Michael Biebl for debugging both issues and to Stefan Kost
for pointing to the upstream commits.
Added:
desktop/unstable/gtk-doc/debian/patches/02_fixxref_fix_backwards_compatibility.patch
desktop/unstable/gtk-doc/debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch
Modified:
desktop/unstable/gtk-doc/debian/changelog
desktop/unstable/gtk-doc/debian/control
Modified: desktop/unstable/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/changelog?rev=22826&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/changelog [utf-8] Tue Jan 19 21:42:21 2010
@@ -1,3 +1,18 @@
+gtk-doc (1.13-2) UNRELEASED; urgency=low
+
+ * debian/patches/02_fixxref_fix_backwards_compatibility.patch:
+ - Backport change from upstream git, restore old compatibility,
+ since a change in the last version caused some packages to
+ FTBFS. Closes: #565902.
+ * debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch:
+ - Backport change from upstream git, touch $(DOC_MODULE)-overrides.txt
+ if it doesn't exist, since it's listed in EXTRA_DIST and is thus
+ needed to create a dist tarball. Closes: #565377.
+ * Thanks to Michael Biebl for debugging both issues and to Stefan Kost
+ for pointing to the upstream commits.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 19 Jan 2010 22:35:22 +0100
+
gtk-doc (1.13-1) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
Modified: desktop/unstable/gtk-doc/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/control?rev=22826&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/control [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/control [utf-8] Tue Jan 19 21:42:21 2010
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Mario Lang <mlang at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Mario Lang <mlang at debian.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.8.3
XS-Python-Version: >= 2.3
Build-Depends: cdbs,
Added: desktop/unstable/gtk-doc/debian/patches/02_fixxref_fix_backwards_compatibility.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/02_fixxref_fix_backwards_compatibility.patch?rev=22826&op=file
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/02_fixxref_fix_backwards_compatibility.patch (added)
+++ desktop/unstable/gtk-doc/debian/patches/02_fixxref_fix_backwards_compatibility.patch [utf-8] Tue Jan 19 21:42:21 2010
@@ -1,0 +1,80 @@
+From b39bb84dfb5f16c8b2977105bd5876b7b8d58a11 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Tue, 22 Dec 2009 11:54:31 +0000
+Subject: fixxref: make it work again without --module argument, Fixes #605211
+
+This restores a compatible behavior with previous versions of gtk-doc,
+which is required by many tarballs.
+---
+diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
+index 8f166ef..5a703ad 100755
+--- a/gtkdoc-fixxref.in
++++ b/gtkdoc-fixxref.in
+@@ -168,36 +168,38 @@ foreach my $dir (@EXTRA_DIRS) {
+ }
+ }
+
+-open (INPUT, "$MODULE-sections.txt")
+- || die "Can't open $MODULE-sections.txt: $!";
+-my $subsection = "";
+-while (<INPUT>) {
+- if (m/^#/) {
+- next;
+-
+- } elsif (m/^<SECTION>/) {
+- $subsection = "";
+- } elsif (m/^<SUBSECTION\s*(.*)>/i) {
+- $subsection = $1;
+- } elsif (m/^<SUBSECTION>/) {
+- next;
+- } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
+- next;
+- } elsif (m/^<FILE>(.*)<\/FILE>/) {
+- next;
+- } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
+- next;
+- } elsif (m/^<\/SECTION>/) {
+- next;
+- } elsif (m/^(\S+)/) {
+- my $symbol=CreateValidSGMLID($1);
+-
+- if ($subsection eq "Standard" || $subsection eq "Private") {
+- $NoLinks{$symbol} = 1;
++if (defined($MODULE)) {
++ open (INPUT, "$MODULE-sections.txt")
++ || die "Can't open $MODULE-sections.txt: $!";
++ my $subsection = "";
++ while (<INPUT>) {
++ if (m/^#/) {
++ next;
++
++ } elsif (m/^<SECTION>/) {
++ $subsection = "";
++ } elsif (m/^<SUBSECTION\s*(.*)>/i) {
++ $subsection = $1;
++ } elsif (m/^<SUBSECTION>/) {
++ next;
++ } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
++ next;
++ } elsif (m/^<FILE>(.*)<\/FILE>/) {
++ next;
++ } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
++ next;
++ } elsif (m/^<\/SECTION>/) {
++ next;
++ } elsif (m/^(\S+)/) {
++ my $symbol=CreateValidSGMLID($1);
++
++ if ($subsection eq "Standard" || $subsection eq "Private") {
++ $NoLinks{$symbol} = 1;
++ }
+ }
+ }
++ close (INPUT);
+ }
+-close (INPUT);
+
+ &FixCrossReferences ($MODULE_DIR);
+
+--
+cgit v0.8.3.1
Added: desktop/unstable/gtk-doc/debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch?rev=22826&op=file
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch (added)
+++ desktop/unstable/gtk-doc/debian/patches/03_gtkdoc-scan_touch_MODULE-overrides.txt.patch [utf-8] Tue Jan 19 21:42:21 2010
@@ -1,0 +1,33 @@
+From d1a042fbd75b7f8d44293fbee01e783be79d884c Mon Sep 17 00:00:00 2001
+From: Nicola Fontana <ntd at entidi.it>
+Date: Mon, 03 Aug 2009 13:32:36 +0000
+Subject: gtkdoc-scan: touch MODULE-overrides.txt when missing. Fixes #590625
+
+gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST, so this
+file must exist to be able to "make dist".
+---
+diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
+index ece8d99..c986f36 100755
+--- a/gtkdoc-scan.in
++++ b/gtkdoc-scan.in
+@@ -185,12 +185,12 @@ if ($REBUILD_SECTIONS || ! -e $sections_file) {
+ `cp $old_decl_list $sections_file`;
+ }
+
+-# If there is no MODULE-overrides.txt file we create an empty one.
+-# FIXME: why?
+-#my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
+-#if (! -e $overrides_file) {
+-# `touch $overrides_file`;
+-#}
++# If there is no MODULE-overrides.txt file we create an empty one
++# because EXTRA_DIST in gtk-doc.make requires it.
++my $overrides_file = "${OUTPUT_DIR}/$MODULE-overrides.txt";
++if (! -e $overrides_file) {
++ `touch $overrides_file`;
++}
+
+
+
+--
+cgit v0.8.3.1
More information about the pkg-gnome-commits
mailing list