Hello community,
here is the log from the commit of package hydrogen for openSUSE:Factory
checked in at 2017-01-25 23:29:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hydrogen (Old)
and /work/SRC/openSUSE:Factory/.hydrogen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hydrogen"
Changes:
--------
--- /work/SRC/openSUSE:Factory/hydrogen/hydrogen.changes 2014-11-10
17:29:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.hydrogen.new/hydrogen.changes 2017-01-25
23:29:46.720494980 +0100
@@ -1,0 +2,23 @@
+Thu Jan 12 21:22:08 UTC 2017 - wba...@tmo.at
+
+- Update to version 0.9.7, adapt patches
+- Drop hydrogen.1 source file, move the included man page to the
+ right place instead of installing our own version
+- Updated h2cli.1 man page
+- Use desktop-file-utils macros instead of update-desktop-database
+- Upstream changes:
+ * The color of the SongEditors squares is now configurable
+ * Added support for midi cymbal choking
+ * Added support for midi hihat pressure control
+ * Added hihat pressure groups
+ * Added basic non session manager support
+ * Added instrument components
+ * Basic lilypond export
+ * New windows cross compilation script
+ * Support for soundlibrary images
+ * Configurable sample selection algorithm
+ * Support for soundlibraries with images
+ * New midi action:
+ * SELECT_PREV_PATTERN_RELATIVE
+
+-------------------------------------------------------------------
Old:
----
hydrogen-0.9.6.tar.bz2
hydrogen.1
New:
----
hydrogen-0.9.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hydrogen.spec ++++++
--- /var/tmp/diff_new_pack.KmLTCx/_old 2017-01-25 23:29:47.480380445 +0100
+++ /var/tmp/diff_new_pack.KmLTCx/_new 2017-01-25 23:29:47.484379843 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hydrogen
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -82,14 +82,13 @@
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Midi
# NOTE: Don't forget to update the libsuffix macro.
-Version: 0.9.6
+Version: 0.9.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.hydrogen-music.org/
-Source0: %{name}-%{version}.tar.bz2
-Source1: hydrogen.1
-Source2: h2cli.1
-Source3: COPYING
+Source0: %{name}-%{version}.tar.gz
+Source1: h2cli.1
+Source2: COPYING
# Fixup the desktop file.
Patch0: hydrogen-0.9.6-desktop.patch
# Remove current date and time from sources.
@@ -147,7 +146,7 @@
%patch3
# copy licence with correct fsf address
-install -m 0644 %{S:3} ./
+install -m 0644 %{S:2} ./
%build
@@ -195,9 +194,11 @@
cd %{buildroot}%{_libdir} && ln -s libhydrogen-core.so.0.0.0
libhydrogen-core.so.0
popd
-# Install the man pages created by help2man
+# Install the h2cli man page created by help2man
mkdir -p %{buildroot}%{_mandir}/man1
-install -pm 0644 %{S:1} %{S:2} %{buildroot}%{_mandir}/man1/
+install -pm 0644 %{S:1} %{buildroot}%{_mandir}/man1/
+# Move hydrogen man page to the correct directory
+mv %{buildroot}%{_prefix}/man/man1/hydrogen.1 %{buildroot}%{_mandir}/man1/
# temporary link i18n files from usr/share/hydrogen/data/i18n to
_datadir/locale for find_lang to find.
ln -s %{_datadir}/hydrogen/data/i18n %{buildroot}%{_datadir}/locale
@@ -219,10 +220,10 @@
popd && %suse_update_desktop_file -i %{name} AudioVideo Sequencer
%post
-update-desktop-database > /dev/null 2>&1 || :
+%desktop_database_post
%postun
-update-desktop-database > /dev/null 2>&1 || :
+%desktop_database_postun
%files -f %{name}.lang
%defattr(-, root, root)
@@ -230,9 +231,11 @@
%doc AUTHORS COPYING ChangeLog README.txt
%dir %{_datadir}/%{name}/*
%dir %{_datadir}/%{name}
+%dir %{_datadir}/appdata
%{_mandir}/man1/hydrogen.1.gz
%{_mandir}/man1/h2cli.1.gz
%{_datadir}/%{name}/data/*
+%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/h2-icon.svg
++++++ h2cli.1 ++++++
--- /var/tmp/diff_new_pack.KmLTCx/_old 2017-01-25 23:29:47.540371403 +0100
+++ /var/tmp/diff_new_pack.KmLTCx/_new 2017-01-25 23:29:47.540371403 +0100
@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3.
-.TH H2CLI "1" "September 2014" "h2cli 0.9.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
+.TH H2CLI "1" "January 2017" "h2cli 0.9.7" "User Commands"
.SH NAME
-h2cli \- manual page for h2cli 0.9.6
+h2cli \- manual page for h2cli 0.9.7
.SH SYNOPSIS
.B hydrogen
-[\fI-v\fR] [\fI-h\fR] \fI-s file\fR
+[\fI\,-v\/\fR] [\fI\,-h\/\fR] \fI\,-s file\/\fR
.SH DESCRIPTION
-Hydrogen 0.9.6 [Fri Sep 5 21:42:13 2014] [http://www.hydrogen\-music.org]
+Hydrogen 0.9.7 [Thu Jan 12 20:42:01 2017] [http://www.hydrogen\-music.org]
Copyright 2002\-2008 Alessandro Cominu
.PP
Hydrogen comes with ABSOLUTELY NO WARRANTY
@@ -41,7 +41,7 @@
\fB\-\-lash\-no\-autoresume\fR \- Tell LASH server not to assume I'm returning
from a crash.
.HP
-\fB\-V[Level]\fR, \fB\-\-verbose\fR[=\fILevel\fR] \- Print a lot of debugging
info
+\fB\-V[Level]\fR, \fB\-\-verbose\fR[=\fI\,Level\/\fR] \- Print a lot of
debugging info
.IP
Level, if present, may be None, Error, Warning, Info, Debug or 0xHHHH
.HP
++++++ hydrogen-0.9.6-desktop.patch ++++++
--- /var/tmp/diff_new_pack.KmLTCx/_old 2017-01-25 23:29:47.552369595 +0100
+++ /var/tmp/diff_new_pack.KmLTCx/_new 2017-01-25 23:29:47.552369595 +0100
@@ -2,9 +2,9 @@
===================================================================
--- linux/hydrogen.desktop.orig 2011-01-06 11:30:46.000000000 +0200
+++ linux/hydrogen.desktop 2011-10-05 16:59:45.684862755 +0200
-@@ -16,15 +16,13 @@ Comment[hu]=Dobszekvenciákat lehet vele
- GenericName[ru]=Драм-машина
+@@ -19,16 +19,14 @@ Comment[hu]=Dobszekvenciákat lehet vele
GenericName[tr]=Davul Makinası
+ GenericName[fr]=Boîte à rythme
-Encoding=UTF-8
Version=1.0
@@ -12,6 +12,7 @@
Type=Application
-Categories=Application;AudioVideo;Sound;Audio;Qt;
+Categories=AudioVideo;Sound;Audio;Qt;
+ Keywords=audio;sound;jackd;sampler;drum;
-MimeType=text/xml
+MimeType=text/xml;
++++++ hydrogen-0.9.6-lib64.patch ++++++
--- /var/tmp/diff_new_pack.KmLTCx/_old 2017-01-25 23:29:47.564367786 +0100
+++ /var/tmp/diff_new_pack.KmLTCx/_new 2017-01-25 23:29:47.564367786 +0100
@@ -11,7 +11,7 @@
INCLUDE_DIRECTORIES( include
${CMAKE_SOURCE_DIR}/include # regular headers
${CMAKE_CURRENT_BINARY_DIR}/include # generated config.h
-@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES( include
+@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( include
${RUBBERBAND_INCLUDE_DIR}
)
@@ -20,8 +20,8 @@
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTXMLPATTERNS_LIBRARY}
-@@ -49,14 +49,20 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
- ${CMAKE_THREAD_LIBS_INIT}
+@@ -52,14 +52,20 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
+ ${NSMSESSION_LIBRARIES}
)
-#SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER
"${hydrogen_INCLUDES}" )
@@ -52,7 +52,7 @@
+++ src/gui/CMakeLists.txt 2011-10-08 01:15:00.448239957 +0200
@@ -49,11 +49,11 @@ INCLUDE_DIRECTORIES(
- ADD_EXECUTABLE(hydrogen WIN32 MACOSX_BUNDLE ${hydrogen_SRCS} ${hydrogen_MOC}
${hydrogen_UIS_H})
+ ADD_EXECUTABLE(hydrogen WIN32 MACOSX_BUNDLE ${hydrogen_SRCS} ${hydrogen_MOC}
${hydrogen_UIS_H} ${CMAKE_SOURCE_DIR}/windows/icon.rc)
TARGET_LINK_LIBRARIES(hydrogen
- hydrogen-core-${VERSION}
+ hydrogen-core
@@ -135,7 +135,7 @@
===================================================================
--- CMakeLists.txt.orig 2011-09-13 03:35:18.000000000 +0200
+++ CMakeLists.txt 2011-10-09 19:33:45.071516565 +0200
-@@ -91,6 +91,7 @@ ELSE()
+@@ -101,6 +101,7 @@ ELSE()
IF(WANT_SHARED)
SET(H2CORE_LIBRARY_TYPE SHARED)
++++++ hydrogen-gcc47.patch ++++++
--- /var/tmp/diff_new_pack.KmLTCx/_old 2017-01-25 23:29:47.576365978 +0100
+++ /var/tmp/diff_new_pack.KmLTCx/_new 2017-01-25 23:29:47.580365375 +0100
@@ -19,6 +19,6 @@
*/
+#include <unistd.h>
+ #include <hydrogen/event_queue.h>
#include <hydrogen/version.h>
#include <hydrogen/hydrogen.h>
- #include <hydrogen/playlist.h>
++++++ hydrogen-no-current-time.patch ++++++
--- /var/tmp/diff_new_pack.KmLTCx/_old 2017-01-25 23:29:47.600362361 +0100
+++ /var/tmp/diff_new_pack.KmLTCx/_new 2017-01-25 23:29:47.600362361 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/cli/main.cpp.orig 2011-07-06 09:25:22.000000000 +0200
+++ src/cli/main.cpp 2011-10-05 17:17:58.479216067 +0200
-@@ -427,7 +427,7 @@ int main(int argc, char *argv[])
+@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
/* Show some information */
void showInfo()
{
@@ -28,20 +28,20 @@
===================================================================
--- src/gui/src/main.cpp.orig 2011-07-06 09:25:45.000000000 +0200
+++ src/gui/src/main.cpp 2011-10-05 17:19:58.049676061 +0200
-@@ -470,7 +470,7 @@ int main(int argc, char *argv[])
+@@ -485,7 +485,7 @@ int main(int argc, char *argv[])
*/
void showInfo()
{
- cout << "\nHydrogen " + H2Core::get_version() + " [" + __DATE__ + "]
[http://www.hydrogen-music.org]"; << endl;
+ cout << "\nHydrogen " + H2Core::get_version() + " [" + __TIMESTAMP__ +
"] [http://www.hydrogen-music.org]"; << endl;
cout << "Copyright 2002-2008 Alessandro Cominu" << endl;
- // ___INFOLOG( "Compiled modules: " + QString(COMPILED_FEATURES)
<< endl;
+ cout << "Copyright 2008-2016 The hydrogen development team" << endl;
Index: src/gui/src/SplashScreen.cpp
===================================================================
--- src/gui/src/SplashScreen.cpp.orig 2011-01-23 10:35:18.000000000 +0200
+++ src/gui/src/SplashScreen.cpp 2011-10-05 17:22:19.741481852 +0200
-@@ -53,7 +53,7 @@ SplashScreen::SplashScreen()
+@@ -51,7 +51,7 @@ SplashScreen::SplashScreen()
p.setFont( font );
p.setPen( QColor( 20, 20, 20 ) );
@@ -49,4 +49,4 @@
+ QString version = QString( "v%1 (%2)" ).arg(
H2Core::get_version().c_str() ).arg( __TIMESTAMP__ );
p.drawText( 5, 5, width - 10, 40, Qt::AlignRight | Qt::AlignTop,
version );
- // p.drawText( 5, height - 45, width - 10, 40, Qt::AlignHCenter |
Qt::AlignBottom, QString( trUtf8( "Modules: %1" ) ).arg( COMPILED_FEATURES ) );
+ p.end();
