From e5bf0cbe7eb556d4aa217bf25dc12229d5a4719e Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 11 Aug 2015 13:48:48 -0400
Subject: Fix empty GIT_DESCRIBE_TAG default (0.0.0)

---
 webbpsf/webbpsf.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webbpsf')

diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini
index 64969ac..c6992c4 100644
--- a/webbpsf/webbpsf.ini
+++ b/webbpsf/webbpsf.ini
@@ -1,6 +1,6 @@
 [package]
 name: webbpsf
-version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git
+version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
 
 [about]
 home: http://github.com/mperrin/${package:name}
-- 
cgit 


From c1b93888225afc06b73209846d0bdc05a6352433 Mon Sep 17 00:00:00 2001
From: Joe Hunkeler <jhunkeler@gmail.com>
Date: Thu, 3 Sep 2015 14:58:18 -0400
Subject: Fix pkg_resources misinterpretation. Credit: Joseph Long

---
 webbpsf/webbpsf.ini | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'webbpsf')

diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini
index c6992c4..2d3a839 100644
--- a/webbpsf/webbpsf.ini
+++ b/webbpsf/webbpsf.ini
@@ -8,13 +8,11 @@ license: BSD
 summary: ${package:name}
 
 [source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
 git_url: ${about:home}
-#git_tag:
 
 [build]
 number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
+preserve_egg_dir: True
 
 [requirements]
 build:
@@ -37,6 +35,7 @@ run:
     matplotlib
     poppy
     six [py27]
+    webbpsf-data
     setuptools
     python
 
-- 
cgit