From 8f85fe5ecaf11e3a2d6d916f0c9c1c9061fd2fca Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Thu, 7 Mar 2019 18:31:27 -0600
Subject: [PATCH] Clone into subdirectory.

---
 templates/packagebuild.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/packagebuild.xml b/templates/packagebuild.xml
index 5be9985..762109d 100644
--- a/templates/packagebuild.xml
+++ b/templates/packagebuild.xml
@@ -18,7 +18,11 @@
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
     <submoduleCfg class="list"/>
-    <extensions/>
+    <extensions>
+      <hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
+        <relativeTargetDir>{{ NAME }}</relativeTargetDir>
+      </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
+    </extensions>
   </scm>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -40,8 +44,6 @@
   <builders>
     <hudson.tasks.Shell>
       <command>
-mkdir {{ NAME }};
-mv -v debian {{ NAME }};
 git clone {{ UPSTREAM_URL }} upstream;
 export VERSION="$(head -1 {{ NAME }}/debian/changelog | sed -n '/(/,/)/{:a; $!N; /)/!{$!ba}; s/.*(\([^)]*\)).*/\1/p}' | cut -d '-' -f1)+git$(date +'%Y%m%d%H%M')~{{ RELEASE }}";
 export DEBFULLNAME="Lugito"