Merge branch 'master' into testing

2015-01-12 10:17:35 +01:00 · 2015-01-12 10:17:35 +01:00 · e854485da3
parent 93d0fd68aa 5dc7240420
commit e854485da3
2 changed files with 7 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,3 +1,7 @@
 language: c
-install: sudo apt-get install libglib2.0-dev gobject-introspection gnome-common && ./autogen.sh
-script: make && make check
+before-install: sudo apt-get update
+install: sudo apt-get install libglib2.0-dev gobject-introspection gnome-common
+before-script: ./autogen.sh
+script:
+  - make
+  - make check
--- a/data/sweph-data/seleapsec.txt
+++ b/data/sweph-data/seleapsec.txt
@ -27,3 +27,4 @@
 20051231
 20081231
 20120630
+20150630