[gprolog/f17] New upstream release

[Jochen Schmitt]

commit 03ad7d1e49b74dc9ff6ed72a4b801a6f8220e353
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sat Dec 15 11:25:07 2012 +0100

    New upstream release

 .gitignore   |    5 +++++
 gprolog.spec |    8 +++++++-
 sources      |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 949c8d5..a525fd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
 gprolog-1.3.1.tar.gz
 /gprolog-1.4.0.tar.gz
+<<<<<<< HEAD
+=======
+/gprolog-1.4.1.tar.gz
+/gprolog-1.4.2.tar.gz
+>>>>>>> d791100... New upstream release
diff --git a/gprolog.spec b/gprolog.spec
index cbccab7..ed7b4a1 100644
--- a/gprolog.spec
+++ b/gprolog.spec
@@ -1,5 +1,5 @@
 Name:           gprolog
-Version:	1.4.1
+Version:	1.4.2
 Release:	1%{?dist}
 Summary: 	GNU Prolog is a free Prolog compiler
 
@@ -89,6 +89,12 @@ done
 %doc src/dist-doc/*
 
 %changelog
+* Sat Dec 15 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1.4.2-1
+- New upstream release
+
+* Thu Oct  4 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1.4.1-2
+- Remove reference to test pach
+
 * Thu Oct  4 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1.4.1-1
 - New upstream release
 - Clean up SPEC file
diff --git a/sources b/sources
index 699fc3a..a2d080e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-433c733da92596ee40e6d4a934591a5b  gprolog-1.4.1.tar.gz
+e9266515435dffbcabf5af8fcd2f2204  gprolog-1.4.2.tar.gz