prep for 2.4.0 release candidate

KDAB · Dec 20, 2015 · 963fc95 · 963fc95
1 parent 212f202
commit 963fc95
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,7 +86,7 @@ enable_testing()
 # Version setup
 set(GAMMARAY_VERSION_MAJOR "2")
 set(GAMMARAY_VERSION_MINOR "3")
-set(GAMMARAY_VERSION_PATCH "98")
+set(GAMMARAY_VERSION_PATCH "99")
 set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMMARAY_VERSION_PATCH}")
 set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
 set(GAMMARAY_SOVERSION "2.4.0")

diff --git a/debian.changelog b/debian.changelog
@@ -1,3 +1,9 @@
+gammaray (2.3.99) final; urgency=low
+
+  * 2.4.0 rc1 release
+
+ -- Allen Winter <[email protected]>  Sun, 20 Dec 2015 12:30:00 -0500
+
 gammaray (2.3.0) final; urgency=low
 
   * 2.3.0 final release

diff --git a/gammaray-qt4.dsc b/gammaray-qt4.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
 Source: gammaray
-Version: 2.3.0
+Version: 2.3.99
 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.3.0.tar.gz
+ 00000000000000000000000000000000 00000 gammaray-2.3.99.tar.gz
diff --git a/gammaray-qt4.spec b/gammaray-qt4.spec
@@ -1,5 +1,5 @@
 Name:           gammaray-qt4
-Version:        2.3.0
+Version:        2.3.99
 Release:        1
 Summary:        An introspection tool for Qt applications
 Source:         gammaray-%{version}.tar.gz
@@ -111,6 +111,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DGAMMARAY_PROBE_
 %{_libdir}/gammaray/*/*/gammaray_kjobtracker_ui.desktop
 
 %changelog
+* Sun Dec 20 2015 Allen Winter <[email protected]> 2.3.99
+  2.4.0 release candidate 1
 * Fri Jul 10 2015 Allen Winter <[email protected]> 2.3.0
   2.3.0 final
 * Tue Jan 27 2015 Allen Winter <[email protected]> 2.2.1

diff --git a/gammaray+sme+kde-qt5.spec → gammaray-qt5.spec b/gammaray+sme+kde-qt5.spec → gammaray-qt5.spec
@@ -1,8 +1,8 @@
 Name:           gammaray
-Version:        2.2.50+git20150705
+Version:        2.3.99
 Release:        1
 Summary:        An introspection tool for Qt applications
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.gz
 Url:            http://github.com/KDAB/GammaRay
 Group:          Development/Tools
 License:        GPL-2.0+
@@ -11,11 +11,21 @@ Vendor:         Klaralvdalens Datakonsult AB (KDAB)
 Packager:       Klaralvdalens Datakonsult AB (KDAB) <[email protected]>
 
 BuildRequires: cmake
-BuildRequires: libqt5-qtdeclarative-private-headers-devel libQt5Concurrent-devel libqt5-qttools-devel libqt5-qtsvg-devel libQt5PrintSupport-devel libqt5-qtscript-devel libQt5WebKitWidgets-devel
+%if %{defined suse_version}
+BuildRequires: libqt5-qtdeclarative-private-headers-devel libQt5Concurrent-devel libqt5-qttools-devel libqt5-qtsvg-devel libQt5PrintSupport-devel libqt5-qtscript-devel libQt5WebKitWidgets-devel graphviz-devel
+%if 0%{?suse_version} > 1320
+BuildRequires: libqt5-qtconnectivity-devel
+%endif
 # TODO: this seems only to be in the update repo?
-# libqt5-qtconnectivity-devel
-BuildRequires: kdstatemachineeditor-devel
 BuildRequires: kcoreaddons-devel
+%endif
+
+%if %{defined fedora}
+BuildRequires: qt5-qtdeclarative-devel qt5-qtconnectivity-devel qt5-qttools-devel qt5-qtsvg-devel qt5-qtscript-devel qt5-qtwebkit-devel graphviz-devel
+%if 0%{?fedora} >= 21
+BuildRequires:  kf5-kcoreaddons-devel
+%endif
+%endif
 
 %if %{defined suse_version}
 BuildRequires: update-desktop-files
@@ -123,6 +133,9 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE
 %{_libdir}/gammaray/*/*/gammaray_quickinspector*
 %{_libdir}/gammaray/*/*/gammaray_translatorinspector*
 %{_libdir}/gammaray/*/*/styles/
+%if 0%{?suse_version} > 1320|| 0%{?fedora}
+%{_libdir}/gammaray/*/*/gammaray_bluetooth*
+%endif
 
 %files kf5-plugins
 %defattr(-,root,root)
@@ -140,6 +153,10 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE
 %{_libdir}/qt5/mkspecs/modules/*
 
 %changelog
+* Sun Dec 20 2015 Allen Winter <[email protected]> 2.3.99
+  2.4.0 release candidate 1
+* Fri Jul 10 2015 Allen Winter <[email protected]> 2.3.0
+  2.3.0 final
 * Tue Jan 27 2015 Allen Winter <[email protected]> 2.2.1
   2.2.1 final
 * Fri Oct 31 2014 Allen Winter <[email protected]> 2.2.0

diff --git a/gammaray.dsc b/gammaray.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
 Source: gammaray
-Version: 2.3.0
+Version: 2.3.99
 Binary: gammaray
 Maintainer: Allen Winter <[email protected]>
 Architecture: any
-Build-Depends: debhelper (>= 4.1.16), cdbs, cmake, qt5-default, qtbase5-private-dev, qtdeclarative5-dev, qtscript5-dev, qttools5-dev, libqt5svg5-dev, libqt5webkit5-dev, graphviz-dev
+Build-Depends: debhelper (>= 4.1.16), cdbs, cmake, qt5-default, qtbase5-private-dev, qtdeclarative5-dev, qtscript5-dev, qttools5-dev, libqt5svg5-dev, libqt5webkit5-dev, graphviz-dev, kdstatemachineeditor-dev
 
 Files:
- 00000000000000000000000000000000 00000 gammaray-2.3.0.tar.gz
+ 00000000000000000000000000000000 00000 gammaray-2.3.99.tar.gz
diff --git a/gammaray.spec b/gammaray.spec
@@ -1,8 +1,8 @@
 Name:           gammaray
-Version:        2.3.0
+Version:        2.3.99
 Release:        1
 Summary:        An introspection tool for Qt applications
-Source:         %{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.bz2
 Url:            http://github.com/KDAB/GammaRay
 Group:          Development/Tools
 License:        GPL-2.0+
@@ -11,21 +11,11 @@ Vendor:         Klaralvdalens Datakonsult AB (KDAB)
 Packager:       Klaralvdalens Datakonsult AB (KDAB) <[email protected]>
 
 BuildRequires: cmake
-%if %{defined suse_version}
-BuildRequires: libqt5-qtdeclarative-private-headers-devel libQt5Concurrent-devel libqt5-qttools-devel libqt5-qtsvg-devel libQt5PrintSupport-devel libqt5-qtscript-devel libQt5WebKitWidgets-devel graphviz-devel
-%if 0%{?suse_version} > 1320
-BuildRequires: libqt5-qtconnectivity-devel
-%endif
+BuildRequires: libqt5-qtdeclarative-private-headers-devel libQt5Concurrent-devel libqt5-qttools-devel libqt5-qtsvg-devel libQt5PrintSupport-devel libqt5-qtscript-devel libQt5WebKitWidgets-devel
 # TODO: this seems only to be in the update repo?
+# libqt5-qtconnectivity-devel
+BuildRequires: kdstatemachineeditor-devel
 BuildRequires: kcoreaddons-devel
-%endif
-
-%if %{defined fedora}
-BuildRequires: qt5-qtdeclarative-devel qt5-qtconnectivity-devel qt5-qttools-devel qt5-qtsvg-devel qt5-qtscript-devel qt5-qtwebkit-devel graphviz-devel
-%if 0%{?fedora} >= 21
-BuildRequires:  kf5-kcoreaddons-devel
-%endif
-%endif
 
 %if %{defined suse_version}
 BuildRequires: update-desktop-files
@@ -133,9 +123,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE
 %{_libdir}/gammaray/*/*/gammaray_quickinspector*
 %{_libdir}/gammaray/*/*/gammaray_translatorinspector*
 %{_libdir}/gammaray/*/*/styles/
-%if 0%{?suse_version} > 1320|| 0%{?fedora}
-%{_libdir}/gammaray/*/*/gammaray_bluetooth*
-%endif
 
 %files kf5-plugins
 %defattr(-,root,root)
@@ -153,8 +140,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE
 %{_libdir}/qt5/mkspecs/modules/*
 
 %changelog
-* Fri Jul 10 2015 Allen Winter <[email protected]> 2.3.0
-  2.3.0 final
+* Sun Dec 20 2015 Allen Winter <[email protected]> 2.3.99
+  2.4.0 release candidate 1
 * Tue Jan 27 2015 Allen Winter <[email protected]> 2.2.1
   2.2.1 final
 * Fri Oct 31 2014 Allen Winter <[email protected]> 2.2.0