Merge lp:~elementary-apps/pantheon-terminal/fix-0.3.0-release into lp:~elementary-apps/pantheon-terminal/trunk

[Sergey "Shnatsel" Davidoff]

Fix a number of trivial issues in 0.3.0 release:
 - Set proper GTK and valac version requirements (they got bumped because of the HeaderBar)
 - Fix config.vala being generated in the source tree and making its way into release tarballs generated with "make dist" and messing up build procedures in other distros

This branch makes a new release 0.3.1 to distinguish it from the previous 0.3.0.

CMake magic and Valac bump are done according to Rico's advice.

[lp:~elementary-apps/pantheon-terminal/fix-0.3.0-release]

578. By Sergey "Shnatsel" Davidoff on 2014-05-29

Rename 0.3.1 to 0.3.0.1

[Sergey "Shnatsel" Davidoff (shnatsel)]

Uhm. Turns out this breaks build:

$ make
make[2]: *** No rule to make target `../src/config.vala', needed by `src/Settings.c'. Stop.
make[1]: *** [CMakeFiles/pantheon-terminal.dir/all] Error 2
make: *** [all] Error 2

[lp:~elementary-apps/pantheon-terminal/fix-0.3.0-release]

579. By Sergey "Shnatsel" Davidoff on 2014-05-29

Really fix CMake issues this time, hopefully

[Sergey "Shnatsel" Davidoff (shnatsel)]

Dammit, I suck at CMake. This doesn't work, whatever I do.

[Sergey "Shnatsel" Davidoff (shnatsel)]

This branch is superseded by https://code.launchpad.net/~ricotz/pantheon-terminal/config-fixes/+merge/221351

Unmerged revisions

579. By Sergey "Shnatsel" Davidoff on 2014-05-29

Really fix CMake issues this time, hopefully

578. By Sergey "Shnatsel" Davidoff on 2014-05-29

Rename 0.3.1 to 0.3.0.1

577. By Sergey "Shnatsel" Davidoff on 2014-05-29

Release 0.3.1

576. By Sergey "Shnatsel" Davidoff on 2014-05-29

Bump GTK requirement to 3.9.10 and valac to 0.22.0 because of HeaderBar

575. By Sergey "Shnatsel" Davidoff on 2014-05-29

Fix config.vala.cmake being generated in source tree and messing up Debian build procedures

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-25 06:03:15 +0000
+++ CMakeLists.txt	2014-05-29 08:11:18 +0000
@@ -16,13 +16,14 @@
 set (PKGDATADIR "${DATADIR}/pantheon-terminal")
 set (GETTEXT_PACKAGE "pantheon-terminal")
 set (RELEASE_NAME "Fast and connected.")
-set (VERSION "0.3.0")
+set (VERSION "0.3.0.1")
 set (VERSION_INFO "Release")
 set (CMAKE_C_FLAGS "-ggdb")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$")
+set (CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.vala)
 
-configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CMAKE_SOURCE_DIR}/src/config.vala)
+configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.cmake ${CONFIG_FILE})
 add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 
 # Comment this out to enable C compiler warnings
@@ -40,7 +41,7 @@
 find_package (PkgConfig)
 pkg_check_modules (DEPS REQUIRED
   gthread-2.0
-  gtk+-3.0
+  gtk+-3.0>=3.9.10
   granite>=0.3.0
   vte-2.90
   libnotify
@@ -53,7 +54,7 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.16.0" MINIMUM)
+ensure_vala_version ("0.22.0" MINIMUM)
 
 include (ValaPrecompile)
 vala_precompile (VALA_C
@@ -62,7 +63,7 @@
     src/PantheonTerminalWindow.vala
     src/TerminalWidget.vala
     src/ForegroundProcessDialog.vala
-    src/config.vala
+    ${CONFIG_FILE}
 PACKAGES
     vte-2.90
     granite

=== modified file 'INSTALL'
--- INSTALL	2013-09-30 20:08:22 +0000
+++ INSTALL	2014-05-29 08:11:18 +0000
@@ -8,4 +8,4 @@
   cd build/
   make install #Might need sudo
 
-To launch the Terminal locally (for development purposes), use "./pantheon-terminal" from the build/ directory.
\ No newline at end of file
+To launch the Terminal locally (for development purposes), use "./pantheon-terminal" from the build/ directory.