[atomix] 02/03: Imported Upstream version 3.16.0

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository atomix.

commit a7626d76191711742e64e6d9b30516542c112729
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Apr 5 15:52:37 2015 +0200

    Imported Upstream version 3.16.0
---
 NEWS                       | 4 ++++
 configure.ac               | 4 ++--
 data/Makefile.am           | 2 ++
 data/atomix.appdata.xml.in | 2 +-
 data/ui/interface.ui       | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index db26126..7d4b799 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2015-03-23: Release version 3.16.0
+
+    * Fixed licensing mistake in appdata (bug #746473)
+
 2015-03-16: Release version 3.15.92
 
     * New and updated translations
diff --git a/configure.ac b/configure.ac
index d501861..e5b3927 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 
-AC_INIT([atomix],[3.15.92],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
+AC_INIT([atomix],[3.16.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/main.c])
@@ -20,7 +20,7 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES
 
 dnl ================= Requirements =======================
-LIBGTK_REQUIRED=3.14.0
+LIBGTK_REQUIRED=3.10.0
 LIBXML_REQUIRED=2.4.23
 GLIB_REQUIRED=2.36.0
 GDK_PIXBUF_REQUIRED=2.0.5
diff --git a/data/Makefile.am b/data/Makefile.am
index f6e36f8..7d67378 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,9 @@ icon_DATA = atomix-icon.png
 
 appstream_in_files = atomix.appdata.xml.in
 appstream_XML = $(appstream_in_files:.xml.in=.xml)
+
 @APPSTREAM_XML_RULES@
+
 @INTLTOOL_XML_RULE@
 
 appdir = $(datadir)/applications
diff --git a/data/atomix.appdata.xml.in b/data/atomix.appdata.xml.in
index 06f6579..06db176 100644
--- a/data/atomix.appdata.xml.in
+++ b/data/atomix.appdata.xml.in
@@ -3,7 +3,7 @@
 <application>
  <id type="desktop">atomix.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
+ <project_license>GPL-2.0+</project_license>
  <_name>Atomix</_name>
  <_summary>Build molecules out of single atoms</_summary>
  <description>
diff --git a/data/ui/interface.ui b/data/ui/interface.ui
index 7c8fc58..aa9e2ea 100644
--- a/data/ui/interface.ui
+++ b/data/ui/interface.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="mainwin">
     <property name="width_request">678</property>
     <property name="height_request">520</property>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/atomix.git