[coinor-osi] 01/05: Updated orig-tar.sh and tidy get-orig-source. Thanks Etienne Millon.

[Miles Lubin]

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

mlubin-guest pushed a commit to branch master
in repository coinor-osi.

commit f61f55d46fbb5d5554079464148e3c24f38e10f8
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Tue Sep 17 00:37:11 2013 -0400

    Updated orig-tar.sh and tidy get-orig-source.
    Thanks Etienne Millon.
---
 debian/copyright   |    4 ++--
 debian/orig-tar.sh |   24 +++++++++---------------
 debian/rules       |    3 ---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 35c93b5..f059630 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Osi
 Source: https://projects.coin-or.org/Osi
  The source tarball was extracted and the Osi directory contained
- was repackaged as a standalone tarball. This distrubition mechanism
- is supported by upstream.
+ was repackaged as a standalone tarball. This distribution mechanism
+ is supported by upstream. See orig-tar.sh.
 
 Files: *
 Copyright: 2000-2013, IBM Corporation and others
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index e1e004a..5825bff 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,17 +1,11 @@
 #!/bin/sh
+# called as orig-tar.sh --upstream-version version path/to/tarball
 
-# called by uscan with '--upstream-version' <version> <file>
-tar xzf $3
-rm -rf Osi-*/CoinUtils/* Osi-*/Clp/* Osi-*/DyLP/* Osi-*/Vol/*
-rm -f $3
-tar czf $3 Osi-*
-rm -rf Osi-*
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $3 $origDir
-  echo "moved $3 to $origDir"
-fi
-
-exit 0
+tarname=`basename $3`
+cd `dirname $3`
+tar xzf $tarname
+mv Osi-$2/Osi .
+rm $tarname
+tar czf $tarname Osi
+rm -r Osi-$2
+rm -r Osi
diff --git a/debian/rules b/debian/rules
index 3504ee4..08d63ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,6 @@ override_dh_auto_install:
 	dh_auto_install -v --
 	$(RM) debian/tmp/usr/share/coin/doc/Osi/LICENSE
 
-#get-orig-source:
-# see comments in copyright file
-
 %:
 	dh $@ 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coinor-osi.git