[cod-tools] 128/142: branches/single-source-build/ Removing fetch-source. Relying on standard debian/rules target 'make get-orig-source' instead.

Andrius Merkys merkys-guest at moszumanska.debian.org
Mon Sep 25 13:44:25 UTC 2017


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

merkys-guest pushed a commit to branch master
in repository cod-tools.

commit 475912b1509d183a8c2c64518f10fd20894baddb
Author: Andrius Merkys <andrius.merkys at gmail.com>
Date:   Thu May 25 14:10:48 2017 +0000

    branches/single-source-build/
    Removing fetch-source. Relying on standard debian/rules target
    'make get-orig-source' instead.
    
    
    git-svn-id: svn+ssh://saulius-grazulis.lt/home/andrius/svn-repositories/cod-deb-packaging/branches/single-source-build@128 26752c47-bcd6-4c9c-b022-347364b77eb5
---
 MasterMakefile | 7 ++-----
 debian/rules   | 5 +++++
 fetch-source   | 3 ---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/MasterMakefile b/MasterMakefile
index dbe4eba..4163c9d 100644
--- a/MasterMakefile
+++ b/MasterMakefile
@@ -33,11 +33,8 @@ endif
 
 original orig: ${ORIG_TAR_GZ}
 
-${ORIG_TAR_GZ}: ${CHANGELOG}
-	./fetch-source
-	mv source ${PKGNAME}
-	tar -c ${PKGNAME} | gzip > ${ORIG_TAR_GZ}
-	rm -rf ${PKGNAME}
+${ORIG_TAR_GZ}:
+	${MAKE} -f debian/rules get-orig-source
 
 ${DEBIAN_TAR_GZ}: ${ORIG_TAR_GZ}
 	zcat $< | tar -xv
diff --git a/debian/rules b/debian/rules
index 829885f..840da7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,3 +47,8 @@ override_dh_auto_install:
 	${MAKE} install-cod-tools PREFIX=debian/cod-tools/usr
 	find debian/cod-tools/usr -name SPGLib.pm -exec rm {} \;
 	find debian/cod-tools/usr -name cif_find_symmetry -exec rm {} \;
+
+get-orig-source:
+	svn export -r5298 svn://www.crystallography.net/cod-tools/trunk cod-tools-1.0
+	tar -c cod-tools-1.0 | gzip > cod-tools_1.0.orig.tar.gz
+	rm -rf cod-tools-1.0
diff --git a/fetch-source b/fetch-source
deleted file mode 100755
index c0cd7ae..0000000
--- a/fetch-source
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-svn export -r5298 svn://www.crystallography.net/cod-tools/trunk source

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



More information about the debian-science-commits mailing list