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

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-02 17:15:44 +0000 (Wed, 02 Apr 2008)
New Revision: 580

Added:
   trunk/debian/patches/06-fix-kokyu-mpc.dpatch
Removed:
   trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch
Modified:
   trunk/debian/patches/00list
Log:
use upstream SVN patch for this


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-04-02 11:25:01 UTC (rev 579)
+++ trunk/debian/patches/00list	2008-04-02 17:15:44 UTC (rev 580)
@@ -3,7 +3,7 @@
 02-qt4
 04-reduce-opt
 05-autoconf-fox
-06-revert-mpc-kokyu-change
+06-fix-kokyu-mpc
 07-autoconf-fix-gperf
 08-fix-perl-shebang
 10-fix-fox-resource-export

Copied: trunk/debian/patches/06-fix-kokyu-mpc.dpatch (from rev 578, trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch)
===================================================================
--- trunk/debian/patches/06-fix-kokyu-mpc.dpatch	                        (rev 0)
+++ trunk/debian/patches/06-fix-kokyu-mpc.dpatch	2008-04-02 17:15:44 UTC (rev 580)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-revert-mpc-kokyu-change.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use upstream patch to unbreak Kokyu library search path
+
+ at DPATCH@
+--- ACE_wrappers.orig/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
++++ ACE_wrappers/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
+@@ -135,7 +135,7 @@
+         $reldir = 'Kokyu';
+       }
+     }
+-    $str =~ s!$libname!\$(top_builddir)/$reldir/$libname!;
++    $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!;
+     return $str;
+   }
+   elsif ($libname =~ /^lib(tao|kokyu)/i) {

Deleted: trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch
===================================================================
--- trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch	2008-04-02 11:25:01 UTC (rev 579)
+++ trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch	2008-04-02 17:15:44 UTC (rev 580)
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06-revert-mpc-kokyu-change.dpatch by Thomas Girard <thomas.g.girard at free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: revert changeset 79309 that broke Kokyu library search path
-
- at DPATCH@
---- ACE_wrappers.orig/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
-+++ ACE_wrappers/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
-@@ -114,8 +114,8 @@
-   my($reldir)  = shift;
-   my($libname) = shift;
- 
--  if ($libname =~ /^lib(ace)/i) {
--    if (!defined $reldir || $reldir eq '') {
-+  if ($libname =~ /^lib(ace|kokyu\.)/i) {
-+    if (!defined $reldir) {
-       if (defined $libdirs{$libname}) {
-         $reldir = $libdirs{$libname};
-       }
-@@ -126,18 +126,6 @@
-     $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!;
-     return $str;
-   }
--  elsif ($libname =~ /^lib(kokyu\.)/i) {
--    if (!defined $reldir || $reldir eq '') {
--      if (defined $libdirs{$libname}) {
--        $reldir = $libdirs{$libname};
--      }
--      else {
--        $reldir = 'Kokyu';
--      }
--    }
--    $str =~ s!$libname!\$(top_builddir)/$reldir/$libname!;
--    return $str;
--  }
-   elsif ($libname =~ /^lib(tao|kokyu)/i) {
-     if (defined $reldir) {
-       $reldir =~ s!TAO/!!;