r22650 - in /desktop/unstable/gtk-doc/debian: changelog patches/01_syntax_error.patch patches/50_shell-errors.patch patches/51_quoting.patch

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sat Dec 19 13:06:10 UTC 2009


Author: pochu
Date: Sat Dec 19 13:06:04 2009
New Revision: 22650

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22650
Log:
* New upstream release.
  - debian/patches/50_shell-errors.patch:
    + Updated for the new version.
  - debian/patches/51_quoting.patch:
    + Removed, fixed upstream.
  - debian/patches/01_syntax_error.patch:
    + New patch, fix a syntax error in a shell script.

Added:
    desktop/unstable/gtk-doc/debian/patches/01_syntax_error.patch
Removed:
    desktop/unstable/gtk-doc/debian/patches/51_quoting.patch
Modified:
    desktop/unstable/gtk-doc/debian/changelog
    desktop/unstable/gtk-doc/debian/patches/50_shell-errors.patch

Modified: desktop/unstable/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/changelog?rev=22650&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/changelog [utf-8] Sat Dec 19 13:06:04 2009
@@ -1,4 +1,4 @@
-gtk-doc (1.11-5) UNRELEASED; urgency=low
+gtk-doc (1.13-1) UNRELEASED; urgency=low
 
   * debian/watch: Don't uupdate.
   * debian/compat,
@@ -24,6 +24,13 @@
     debian/rules:
     - Switch to python-support.
     - Only build depend on python, python-dev is not needed.
+  * New upstream release.
+    - debian/patches/50_shell-errors.patch:
+      + Updated for the new version.
+    - debian/patches/51_quoting.patch:
+      + Removed, fixed upstream.
+    - debian/patches/01_syntax_error.patch:
+      + New patch, fix a syntax error in a shell script.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Fri, 20 Nov 2009 18:56:12 +0100
 

Added: desktop/unstable/gtk-doc/debian/patches/01_syntax_error.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/01_syntax_error.patch?rev=22650&op=file
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/01_syntax_error.patch (added)
+++ desktop/unstable/gtk-doc/debian/patches/01_syntax_error.patch [utf-8] Sat Dec 19 13:06:04 2009
@@ -1,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gtk-doc-1.13/gtkdoc-mkman.in gtk-doc-1.13.new/gtkdoc-mkman.in
+--- gtk-doc-1.13/gtkdoc-mkman.in	2009-04-22 21:36:57.000000000 +0200
++++ gtk-doc-1.13.new/gtkdoc-mkman.in	2009-12-19 13:49:50.000000000 +0100
+@@ -66,7 +66,7 @@
+       --stringparam gtkdoc.version"@VERSION@" \
+       manpages/docbook.xsl $document || exit $?
+ else
+-  for i in `cd sgml;ls *.sgml` do
++  for i in `cd sgml;ls *.sgml`; do
+     j=`echo $i | sed 's/.sgml/.man/'`
+     echo ": converting " $i $j
+     docbook-to-man sgml/$i > man/$j 2> man/$j.log

Modified: desktop/unstable/gtk-doc/debian/patches/50_shell-errors.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk-doc/debian/patches/50_shell-errors.patch?rev=22650&op=diff
==============================================================================
--- desktop/unstable/gtk-doc/debian/patches/50_shell-errors.patch [utf-8] (original)
+++ desktop/unstable/gtk-doc/debian/patches/50_shell-errors.patch [utf-8] Sat Dec 19 13:06:04 2009
@@ -1,6 +1,6 @@
 --- gtkdoc-scanobj.in.old	2008-11-17 06:03:43.000000000 +0100
 +++ gtkdoc-scanobj.in	2008-11-17 06:11:59.000000000 +0100
-@@ -813,14 +813,14 @@
+@@ -838,15 +838,14 @@
  
  print "gtk-doc: Compiling scanner\n";
  $command = "$CC $CFLAGS -c -o $o_file $MODULE-scan.c";
@@ -13,14 +13,15 @@
 +system("($command)") == 0 or die "Linking of scanner failed: $!\n";
  
  print "gtk-doc: Running scanner $MODULE-scan\n";
--system("sh -c ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
+-# use sh -c to avoid terminating the whole run without seeing the error
+-system("sh -c \"$RUN ./$MODULE-scan\"") == 0 or die "Scan failed: $!\n";
 +system("(./$MODULE-scan)") == 0 or die "Scan failed: $!\n";
  
  unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan";
  
 --- gtkdoc-scangobj.in.old	2008-11-17 06:03:40.000000000 +0100
 +++ gtkdoc-scangobj.in	2008-11-17 06:11:46.000000000 +0100
-@@ -1538,14 +1538,14 @@
+@@ -1598,15 +1598,14 @@
  
  print "gtk-doc: Compiling scanner\n";
  $command = "$CC $CFLAGS -c -o $o_file $MODULE-scan.c";
@@ -33,7 +34,8 @@
 +system("($command)") == 0 or die "Linking of scanner failed: $!\n";
  
  print "gtk-doc: Running scanner $MODULE-scan\n";
--system("$ENV{RUN} ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
+-# use sh -c to avoid terminating the whole run without seeing the error
+-system("sh -c \"$RUN ./$MODULE-scan\"") == 0 or die "Scan failed: $!\n";
 +system("(./$MODULE-scan)") == 0 or die "Scan failed: $!\n";
  
  unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan";




More information about the pkg-gnome-commits mailing list