Skip to content

Commit

Permalink
Set to version 2.1.1 and prepare for tag and release
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Aug 30, 2014
1 parent a10e210 commit 6c23131
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 17 deletions.
11 changes: 11 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
Release Highlights
==================

Version 2.1.1:
-------------
* Fix invoking non-slot methods with arguments.
* Fix QtQuick2 preview not showing any content with Qt 5.2 or older.
* Fix crash when encountering tooltips in Qt5 targets.
* Fix deadlock in object list model.
* Fix QGraphicsView scene selection in in-process mode.
* Fix debug message handler for Qt5.
* A missing relocatable startup hook is no longer fatal with Qt 5.4.
* Fix Qt 5.4 compatibility of the QtQuick2 preview.

Version 2.1.0:
-------------
* Aggregated property view combining static, dynamic and non-QObject property views.
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ enable_testing()
# Version setup
set(GAMMARAY_VERSION_MAJOR "2")
set(GAMMARAY_VERSION_MINOR "1")
set(GAMMARAY_VERSION_PATCH "0")
set(GAMMARAY_VERSION_PATCH "1")
set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMMARAY_VERSION_PATCH}")
set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
set(GAMMARAY_SOVERSION "2.1.0")
Expand Down
32 changes: 19 additions & 13 deletions debian.changelog
Original file line number Diff line number Diff line change
@@ -1,80 +1,86 @@
gammaray (2.1.1) final; urgency=low

* 2.1.1 first 2.1 bugfix release

-- Allen Winter <[email protected]> Sat, 30 Aug 2014 12:00:00 -0500

gammaray (2.1.0) final; urgency=low

* 2.1.0 final release

-- Allen Winter <[email protected]> Fri, 27 Jun 2014 09:30:00 -0500
-- Allen Winter <[email protected]> Fri, 27 Jun 2014 09:30:00 -0500

gammaray (2.0.98) final; urgency=low

* 2.1.0 rc1 release

-- Allen Winter <[email protected]> Thu, 26 Jun 2014 15:30:00 -0500
-- Allen Winter <[email protected]> Thu, 26 Jun 2014 15:30:00 -0500

gammaray (2.0.2) final; urgency=low

* 2.0.2 final release

-- Allen Winter <[email protected]> Fri, 18 Apr 2014 11:30:00 -0500
-- Allen Winter <[email protected]> Fri, 18 Apr 2014 11:30:00 -0500

gammaray (2.0.1) final; urgency=low

* 2.0.1 final release

-- Allen Winter <[email protected]> Fri, 28 Feb 2014 11:30:00 -0500
-- Allen Winter <[email protected]> Fri, 28 Feb 2014 11:30:00 -0500

gammaray (2.0.0) final; urgency=low

* 2.0.0 final release

-- Allen Winter <[email protected]> Fri, 17 Jan 2014 11:00:00 -0500
-- Allen Winter <[email protected]> Fri, 17 Jan 2014 11:00:00 -0500

gammaray (1.9.96) final; urgency=low

* 2.0.0 beta2 release

-- Allen Winter <[email protected]> Sat, 11 Jan 2014 11:00:00 -0500
-- Allen Winter <[email protected]> Sat, 11 Jan 2014 11:00:00 -0500

gammaray (1.9.95) final; urgency=low

* 2.0.0 beta1 release

-- Allen Winter <[email protected]> Fri, 20 Dec 2013 11:00:00 -0500
-- Allen Winter <[email protected]> Fri, 20 Dec 2013 11:00:00 -0500

gammaray (1.3.2) final; urgency=low

* 1.3.2 patch release

-- Allen Winter <[email protected]> Thu, 03 Oct 2013 11:00:00 -0500
-- Allen Winter <[email protected]> Thu, 03 Oct 2013 11:00:00 -0500

gammaray (1.3.1) final; urgency=low

* 1.3.1 patch release

-- Allen Winter <[email protected]> Tues, 30 Apr 2013 16:30:00 -0500
-- Allen Winter <[email protected]> Tues, 30 Apr 2013 16:30:00 -0500

gammaray (1.3.0) final; urgency=low

* 1.3.0 final release

-- Allen Winter <[email protected]> Sun, 27 Jan 2013 18:00:00 -0500
-- Allen Winter <[email protected]> Sun, 27 Jan 2013 18:00:00 -0500

gammaray (1.2.2) patch; urgency=low

* 1.2.2 patch release

-- Allen Winter <[email protected]> Fri, 21 Dec 2012 14:33:00 -0500
-- Allen Winter <[email protected]> Fri, 21 Dec 2012 14:33:00 -0500

gammaray (1.2.1) patch; urgency=low

* 1.2.1 patch release

-- Allen Winter <[email protected]> Thu, 16 Aug 2012 10:17:14 -0500
-- Allen Winter <[email protected]> Thu, 16 Aug 2012 10:17:14 -0500

gammaray (1.2.0) final; urgency=low

* 1.2.0 final release

-- Allen Winter <[email protected]> Thu, 05 Jul 2012 10:19:14 -0500
-- Allen Winter <[email protected]> Thu, 05 Jul 2012 10:19:14 -0500

gammaray (1.1.99) beta2; urgency=low

Expand Down
4 changes: 2 additions & 2 deletions gammaray.dsc
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Format: 1.0
Source: gammaray
Version: 2.1.0
Version: 2.1.1
Binary: gammaray
Maintainer: Allen Winter <[email protected]>
Architecture: any
Build-Depends: debhelper (>= 4.1.16), cdbs, cmake, libqt4-dev, libqtwebkit-dev, graphviz-dev

Files:
00000000000000000000000000000000 00000 gammaray-2.1.0.tar.gz
00000000000000000000000000000000 00000 gammaray-2.1.1.tar.gz
4 changes: 3 additions & 1 deletion gammaray.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: gammaray
Version: 2.1.0
Version: 2.1.1
Release: 2
Summary: An introspection tool for Qt applications
Source: %{name}-%{version}.tar.gz
Expand Down Expand Up @@ -199,6 +199,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
%{_libdir}/cmake/GammaRay/

%changelog
* Sat Aug 30 2014 Allen Winter <[email protected]> 2.1.1
2.1.1 final
* Fri Jun 27 2014 Allen Winter <[email protected]> 2.1.0
2.1.0 final
* Thu Jun 26 2014 Allen Winter <[email protected]> 2.0.98
Expand Down

0 comments on commit 6c23131

Please sign in to comment.