[Pkg-ace-commits] [pkg-ace] r573 - trunk/debian/patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-03-16 20:07:45 +0000 (Sun, 16 Mar 2008)
New Revision: 573

Added:
   trunk/debian/patches/16-skip-apps.dpatch
   trunk/debian/patches/17-protect-mpc-path.dpatch
Log:
new patches to skip apps and fix FTBFS on path with + in it


Added: trunk/debian/patches/16-skip-apps.dpatch
===================================================================
--- trunk/debian/patches/16-skip-apps.dpatch	                        (rev 0)
+++ trunk/debian/patches/16-skip-apps.dpatch	2008-03-16 20:07:45 UTC (rev 573)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16-skip-apps.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## DP: do not compile some apps
+
+ at DPATCH@
+--- ACE_wrappers.orig/apps/apps.mwc
++++ ACE_wrappers/apps/apps.mwc
+@@ -2,4 +2,13 @@
+ // $Id: apps.mwc 54744 2003-12-23 20:23:21Z dhinton $
+ 
+ workspace {
++  exclude {
++    drwho
++    Gateway
++    JAWS
++    JAWS2
++    JAWS3
++    mkcsregdb
++    soreduce
++  }
+ }

Added: trunk/debian/patches/17-protect-mpc-path.dpatch
===================================================================
--- trunk/debian/patches/17-protect-mpc-path.dpatch	                        (rev 0)
+++ trunk/debian/patches/17-protect-mpc-path.dpatch	2008-03-16 20:07:45 UTC (rev 573)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17-protect-mpc-path.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## DP: disable pattern metacharacters in path
+
+ at DPATCH@
+--- ACE_wrappers.orig/MPC/modules/AutomakeWorkspaceCreator.pm
++++ ACE_wrappers/MPC/modules/AutomakeWorkspaceCreator.pm
+@@ -618,7 +618,7 @@
+   my($start) = $self->getstartdir();
+ 
+   ## Take off the starting directory
+-  $value =~ s/$start//;
++  $value =~ s/\Q$start\E//;
+   return $value;
+ }
+