[Pkg-ace-devel] r471 - in /trunk/debian: patches/91-patch-dg-basedir.dpatch patches/92-default-ACE_ROOT.dpatch rules

[tgg-guest at users.alioth.debian.org]

Author: tgg-guest
Date: Sat Feb 10 23:31:02 2007
New Revision: 471

URL: http://svn.debian.org/wsvn/pkg-ace/?sc=1&rev=471
Log:
Adapt patches.

Modified:
    trunk/debian/patches/91-patch-dg-basedir.dpatch
    trunk/debian/patches/92-default-ACE_ROOT.dpatch
    trunk/debian/rules

Modified: trunk/debian/patches/91-patch-dg-basedir.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/91-patch-dg-basedir.dpatch?rev=471&op=diff
==============================================================================
--- trunk/debian/patches/91-patch-dg-basedir.dpatch (original)
+++ trunk/debian/patches/91-patch-dg-basedir.dpatch Sat Feb 10 23:31:02 2007
@@ -5,17 +5,20 @@
 ## DP: Fix path to DependencyGenerator.
 
 @DPATCH@
-
-Index: ACE_wrappers/bin/depgen.pl
-===================================================================
---- ACE_wrappers.old/bin/depgen.pl	2005-02-14 23:46:23.000000000 +0100
-+++ ACE_wrappers/bin/depgen.pl	2005-02-14 23:47:06.000000000 +0100
-@@ -25,7 +25,7 @@
-   import VMS::Filespec qw(unixpath);
- }
+--- ACE_wrappers.orig/bin/depgen.pl
++++ ACE_wrappers/bin/depgen.pl
+@@ -19,12 +19,8 @@
+ use File::Spec;
+ use File::Basename;
  
--unshift(@INC, getExecutePath($0) . '/DependencyGenerator');
-+unshift(@INC, '/usr/share/ace/bin/DependencyGenerator');
+-my($basePath) = $FindBin::Bin;
+-if ($^O eq 'VMS') {
+-  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
+-  $basePath = VMS::Filespec::unixify($basePath);
+-}
+-unshift(@INC, $basePath . '/DependencyGenerator');
++my($basePath) = '/usr/share/ace/bin/DependencyGenerator';
++unshift(@INC, $basePath);
  
  require DependencyEditor;
  

Modified: trunk/debian/patches/92-default-ACE_ROOT.dpatch
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/patches/92-default-ACE_ROOT.dpatch?rev=471&op=diff
==============================================================================
--- trunk/debian/patches/92-default-ACE_ROOT.dpatch (original)
+++ trunk/debian/patches/92-default-ACE_ROOT.dpatch Sat Feb 10 23:31:02 2007
@@ -6,18 +6,15 @@
 ## DP: GNUmakefile if no ACE_ROOT is set.
 
 @DPATCH@
-
-Index: ACE_wrappers/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
-===================================================================
---- ACE_wrappers.orig/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm	2004-10-28 18:13:32.000000000 +0200
-+++ ACE_wrappers/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm	2005-01-14 23:31:02.000000000 +0100
-@@ -77,6 +77,9 @@
+--- ACE_wrappers.orig/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
++++ ACE_wrappers/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+@@ -89,6 +89,9 @@
              "ifeq (\$(findstring k,\$(MAKEFLAGS)),k)$crlf",
              "  KEEP_GOING = -$crlf",
              "endif$crlf$crlf",
-+	    "ifndef ACE_ROOT$crlf",
-+	    "  export ACE_ROOT = /usr/share/ace$crlf",
-+	    "endif$crlf",
-             "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf",
-             $crlf;
++            "ifndef ACE_ROOT$crlf",
++            "  export ACE_ROOT = /usr/share/ace$crlf",
++            "endif$crlf",
+             "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf";
  
+   if ($named) {

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ace/trunk/debian/rules?rev=471&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Sat Feb 10 23:31:02 2007
@@ -64,6 +64,14 @@
 
 patch-pl: extract
 	for fn in `find "$(ACE_ROOT)" -name "*.pl"`; do (echo '#!/usr/bin/perl'; cat "$$fn") > "$${fn}T"; mv "$${fn}T" "$$fn"; chmod a+x "$$fn"; done
+	touch $@
+
+ifneq (mpc-archive-missing,$(MPC_ARCHIVE))
+patch: extract $(MPC_ROOT)
+else
+patch: extract
+endif
+	dpatch apply-all
 	touch $@
 
 unpatch: clean extract