[devscripts] 02/02: debi/debc: always try ../build-area

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository devscripts.

commit f372679e04117de4943a2ecc7d277dd36ac64f9a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Apr 9 16:25:07 2014 -0300

    debi/debc: always try ../build-area
    
    when the changes file is not found under ../ (even when not using svn)
---
 debian/changelog | 2 ++
 scripts/debi.pl  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e8f9703..f98c923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ devscripts (2.14.2) UNRELEASED; urgency=medium
 
   [ Antonio Terceiro ]
   * debi/debc: reformat for consistent indentation
+  * debi/debc: always try ../build-area/ when the changes file is not found
+    under ../ (even when not using svn)
 
  -- Jakub Wilk <jwilk at debian.org>  Sun, 26 Jan 2014 21:50:35 +0100
 
diff --git a/scripts/debi.pl b/scripts/debi.pl
index a9213ad..2dc40d9 100755
--- a/scripts/debi.pl
+++ b/scripts/debi.pl
@@ -308,7 +308,7 @@ EOF
   my $pva="${package}_${sversion}_${arch}";
   $changes="$debsdir/$pva.changes";
 
-  if (! -e $changes and -d ".svn" and -d "../build-area") {
+  if (! -e $changes and -d "../build-area") {
     # Try out default svn-buildpackage structure in case
     # we were going to fail anyway...
     $changes = "../build-area/$pva.changes";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git