[transmageddon] Various fixes and improvements preparing for next release

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit facef238bfd2be37da3be551a758cdb900797fb6
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Fri Nov 29 15:36:51 2013 +0100

    Various fixes and improvements preparing for next release

 Makefile.am           |    5 -----
 configure.ac          |    4 ++--
 src/Makefile.am       |    7 ++++++-
 src/transmageddon.py  |    6 +++---
 transmageddon.spec.in |   13 ++++++++++++-
 5 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 916e971..6ff1802 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,9 @@ desktopdir = $(datadir)/applications
 desktop_in_files = transmageddon.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-icondir = $(datadir)/pixmaps
-icon_DATA = transmageddon.svg
-
 man_MANS = transmageddon.1
 
 transmageddondir = $(datadir)/transmageddon
-transmageddon_DATA = transmageddon.svg
 
 EXTRA_DIST = \
        transmageddon.spec \
@@ -25,7 +21,6 @@ EXTRA_DIST = \
        AUTHORS \
        RELEASE \
        ABOUT-NLS \
-       transmageddon.svg \
         transmageddon.1 \
        $(desktop_in_files) \
        $(INTLTOOL)
diff --git a/configure.ac b/configure.ac
index 5a028c3..8b79090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,10 +4,10 @@ dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
 AC_INIT([transmageddon],
-        [0.25],
+        [1.0],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=transmageddon],
         [transmageddon],
-        [http://www.linuxrising.org/transmageddon])
+        [http://www.linuxrising.org/])
 
 AC_CONFIG_SRCDIR([src/transmageddon.py])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/Makefile.am b/src/Makefile.am
index 30ab4e9..9278f40 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,12 +6,17 @@ transmageddon_PYTHON = \
        transmageddon.py \
        transcoder_engine.py \
        transmageddon.ui \
+        transmageddon-dvdtrack-chooser.ui \
+        transmageddon-language-chooser.ui \
        codecfinder.py \
        presets.py \
        utils.py \
        about.py \
         which.py \
-        gstfraction.py
+        gstfraction.py \
+        udevdisco.py \
+        dvdtrackchooser.py \
+        langchooser.py
 
 BUILT_SOURCES=
 
diff --git a/src/transmageddon.py b/src/transmageddon.py
index 70fcd73..f86aaf1 100644
--- a/src/transmageddon.py
+++ b/src/transmageddon.py
@@ -340,13 +340,13 @@ class TransmageddonUI(Gtk.ApplicationWindow):
        # self.FileChooser.set_current_folder(self.videodirectory)
 
        # Setting AppIcon
-       FileExist = os.path.isfile("../../share/icons/hicolor/48x48/transmageddon.png")
+       FileExist = os.path.isfile("../icons/hicolor/48x48/transmageddon.png")
        if FileExist:
            self.set_icon_from_file( \
-                   "../../share/icons/hicolor/48x48/pixmaps/transmageddon.png")
+                   "../icons/hicolor/48x48/transmageddon.png")
        else:
            try:
-               self.set_icon_from_file("../icons/48x48/transmageddon.png")
+               self.set_default_icon_name("transmageddon")
            except:
                print("failed to find appicon")
 
diff --git a/transmageddon.spec.in b/transmageddon.spec.in
index f7223cf..1e709a5 100644
--- a/transmageddon.spec.in
+++ b/transmageddon.spec.in
@@ -43,6 +43,9 @@ make install DESTDIR=%{buildroot}
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
+%post
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %clean
 rm -rf %{buildroot}
 
@@ -51,13 +54,21 @@ rm -rf %{buildroot}
 %doc ChangeLog AUTHORS TODO COPYING NEWS
 %{_bindir}/transmageddon
 %{_datadir}/transmageddon/*.*
-%{_datadir}/pixmaps/transmageddon.svg
+%{_datadir}/icons/hicolor/16x16/apps/transmageddon.png
+%{_datadir}/icons/hicolor/22x22/apps/transmageddon.png
+%{_datadir}/icons/hicolor/24x24/apps/transmageddon.png
+%{_datadir}/icons/hicolor/256x256/apps/transmageddon.png
+%{_datadir}/icons/hicolor/32x32/apps/transmageddon.png
+%{_datadir}/icons/hicolor/48x48/apps/transmageddon.png
+%{_datadir}/transmageddon/appdata/transmageddon.xml
 %{_datadir}/applications/transmageddon.desktop
 %{_datadir}/transmageddon/presets/*
 %{_datadir}/transmageddon/profiles/*
 %{_mandir}/man1/transmageddon.1.gz
 
 %changelog
+* Fri Nov 28 2013 Christian Schaller <uraeus gnome org>
+* Include new icons and appdata files
 * Wed May 20 2009 Michal Schmidt <mschmidt redhat com>
 - Modified for Fedora packaging guidelines.
 * Mon Mar 30 2009 Christian Schaller <uraeus gnome org>