r17619 - in /desktop/experimental/gtk-doc/debian: changelog patches/11_disable-scrollkeeper-conditional.patch patches/50_shell-errors.patch patches/70_mandatory-automake.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Mon Nov 17 05:13:25 2008
New Revision: 17619

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17619
Log:
  + debian/patches/50_shell-errors.patch:
    - Updated to apply cleanly again.
  + debian/patches/11_disable-scrollkeeper-conditional.patch,
    debian/patches/70_mandatory-automake.patch:
    - Dropped, not necessary anymore.

Removed:
    desktop/experimental/gtk-doc/debian/patches/11_disable-scrollkeeper-conditional.patch
    desktop/experimental/gtk-doc/debian/patches/70_mandatory-automake.patch
Modified:
    desktop/experimental/gtk-doc/debian/changelog
    desktop/experimental/gtk-doc/debian/patches/50_shell-errors.patch

Modified: desktop/experimental/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk-doc/debian/changelog?rev=17619&op=diff
==============================================================================
--- desktop/experimental/gtk-doc/debian/changelog (original)
+++ desktop/experimental/gtk-doc/debian/changelog Mon Nov 17 05:13:25 2008
@@ -3,6 +3,11 @@
   * New upstream release:
     + debian/control.in:
       - Update build depends.
+    + debian/patches/50_shell-errors.patch:
+      - Updated to apply cleanly again.
+    + debian/patches/11_disable-scrollkeeper-conditional.patch,
+      debian/patches/70_mandatory-automake.patch:
+      - Dropped, not necessary anymore.
   * debian/control.in:
     + Update Standards-Version to 3.8.0, no additional changes needed.
 

Modified: desktop/experimental/gtk-doc/debian/patches/50_shell-errors.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk-doc/debian/patches/50_shell-errors.patch?rev=17619&op=diff
==============================================================================
--- desktop/experimental/gtk-doc/debian/patches/50_shell-errors.patch (original)
+++ desktop/experimental/gtk-doc/debian/patches/50_shell-errors.patch Mon Nov 17 05:13:25 2008
@@ -1,10 +1,6 @@
-Causes all system() calls to spawn a subshell which should help diagnose
-crashes of commands such as ICE or scanner segfaults.
-
-diff -Nur gtk-doc-1.8/gtkdoc-scangobj.in gtk-doc-1.8.new/gtkdoc-scangobj.in
---- gtk-doc-1.8/gtkdoc-scangobj.in	2007-02-16 16:16:28.000000000 +0100
-+++ gtk-doc-1.8.new/gtkdoc-scangobj.in	2007-04-06 14:06:05.000000000 +0200
-@@ -1536,14 +1536,14 @@
+--- 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 @@
  
  print "gtk-doc: Compiling scanner\n";
  $command = "$CC $CFLAGS -c -o $o_file $MODULE-scan.c";
@@ -18,14 +14,13 @@
  
  print "gtk-doc: Running scanner $MODULE-scan\n";
 -system("sh -c ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
-+system("(./$MODULE-scan)") == 0 or die "Scan failed: $!\n";
++system("(\"sh -c ./$MODULE-scan\")") == 0 or die "Scan failed: $!\n";
  
  unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan";
  
-diff -Nur gtk-doc-1.8/gtkdoc-scanobj.in gtk-doc-1.8.new/gtkdoc-scanobj.in
---- gtk-doc-1.8/gtkdoc-scanobj.in	2007-01-03 16:04:15.000000000 +0100
-+++ gtk-doc-1.8.new/gtkdoc-scanobj.in	2007-04-06 14:05:10.000000000 +0200
-@@ -814,14 +814,14 @@
+--- 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 @@
  
  print "gtk-doc: Compiling scanner\n";
  $command = "$CC $CFLAGS -c -o $o_file $MODULE-scan.c";
@@ -35,11 +30,11 @@
  print "gtk-doc: Linking scanner\n";
  $command = "$LD -o $MODULE-scan $o_file $LDFLAGS";
 -system($command) == 0 or die "Linking of scanner failed: $!\n";
-+system("($command)") == 0 or die "Linking of scanner failed: $!\n";
++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";
-+system("(./$MODULE-scan)") == 0 or die "Scan failed: $!\n";
+-system("$ENV{RUN} ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
++system("(\"$ENV{RUN} ./$MODULE-scan\")") == 0 or die "Scan failed: $!\n";
  
  unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan";