[med-svn] [Git][med-team/spaced][master] 2 commits: Fix get-orig-source-script

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / spaced


Commits:
8e8885d2 by Andreas Tille at 2018-07-07T14:53:59+02:00
Fix get-orig-source-script

- - - - -
9538252c by Andreas Tille at 2018-07-09T10:09:17+02:00
Get upstream source with proper version

- - - - -


3 changed files:

- debian/changelog
- debian/copyright
- debian/get-orig-source


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spaced (1.0.2+dfsg-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix get-orig-source script
+
+ -- Andreas Tille <tille at debian.org>  Sat, 07 Jul 2018 14:53:39 +0200
+
 spaced (1.0.2+dfsg-1) unstable; urgency=medium
 
   * Initial release (Closes: #815672)


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: spaced
-Source: http://spaced.gobics.de/content/spaced-protein_dna.tar.gz
+Source: http://spaced.gobics.de/content/spaced.tar.gz
 Files-Excluded: spaced
 
 Files: *


=====================================
debian/get-orig-source
=====================================
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -26,34 +26,37 @@ else
     fi
 fi
 
-SOURCE_URL=`awk '/^Source/ {print $2}' cat debian/copyright`
+SOURCE_URL=`awk '/^Source/ {print $2}' debian/copyright`
 EXCLUDE=`grep 'Files-Excluded' debian/copyright | cut -d' ' -f2-`
-UPSTREAMTARBALL="spaced-protein_dna.tar.gz"
+UPSTREAMTARBALL=`echo $SOURCE_URL | sed 's#^.*/\([^/]\+\)#\1#'`
 
 
-wget SOURCE_URL
-
 mkdir -p ../tarballs
 rm -rf ../tarballs/*
 
-OLDPWD=$PWD
-
 cd ../tarballs
-mkdir "spaced-legacy"
-tar -xaf $OLDPWD/${UPSTREAMTARBALL} -C spaced-legacy
+rm -rf ${NAME}
+wget -q -N $SOURCE_URL
+
+set -x
+tar -xaf ${UPSTREAMTARBALL}
+
+# Remove useless binaries
+UPSTREAMTARDIR=`find . -mindepth 1 -maxdepth 1 -type d -name "${NAME}*"`
+cd "${UPSTREAMTARDIR}"
+rm -f ${EXCLUDE}
+# obtain version from file variance.h
+VERSION=`grep '@version: [0-9][0-9.]\+ [0-9/]\+' $(find . -name variance.h) | sed 's#.*@version: \([0-9][0-9.]\+\) \([0-9]\+\)/\([0-9]\+\)#\1-\3\2#'`
+cd ..
 
 # Fix upstreams non-Gnu naming scheme
 TARDIR=${NAME}-${VERSION}
-UPSTREAMTARDIR=`find . -mindepth 1 -maxdepth 1 -type d`
 if [ "${UPSTREAMTARDIR}" != "${TARDIR}" ] ; then
     mv "${UPSTREAMTARDIR}" "${TARDIR}"
 fi
 
-# Remove useless binaries
-(cd "${TARDIR}" && rm -f ${EXCLUDE})
-
 # rebuild package
 GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
 rm -rf ${TARDIR}
 
-mv "$NAME"_"$VERSION".orig.tar.${COMPRESS} ..
+# mv "$NAME"_"$VERSION".orig.tar.${COMPRESS} ..



View it on GitLab: https://salsa.debian.org/med-team/spaced/compare/745938ee5c99fe95fb57dd3be183eaeca018f99d...9538252c4c10beb02948b546844f5eaa4ba17e31

-- 
View it on GitLab: https://salsa.debian.org/med-team/spaced/compare/745938ee5c99fe95fb57dd3be183eaeca018f99d...9538252c4c10beb02948b546844f5eaa4ba17e31
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180709/43468c2b/attachment-0001.html>