[SCM] drumkv1/master: Merge.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Jun 27 12:54:54 UTC 2017


The following commit has been merged in the master branch:
commit f1a8d7e276691fdeb04fcdf8996953b3391d4837
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 27 14:54:09 2017 +0200

    Merge.

diff --git a/ChangeLog b/ChangeLog
index a172ed0..8908f1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,6 @@ drumkv1 - an old-school drum-kit sampler
 ChangeLog
 
 
-<<<<<<< HEAD
-=======
 0.8.3  2017-06-21  A Summer'17 release.
 
 - Added StartupWMClass entry to desktop file.
@@ -16,7 +14,6 @@ ChangeLog
   sample display right-click context-menu.
 
 
->>>>>>> upstream/0.8.3
 0.8.2  2017-05-02  Pre-LAC2017 release frenzy.
 
 - A custom knob/spin-box behavioral option have been added:
diff --git a/configure b/configure
index 108223d..d786e53 100755
--- a/configure
+++ b/configure
@@ -1,10 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-<<<<<<< HEAD
-# Generated by GNU Autoconf 2.69 for drumkv1 0.8.2.
-=======
 # Generated by GNU Autoconf 2.69 for drumkv1 0.8.3.
->>>>>>> upstream/0.8.3
 #
 # Report bugs to <rncbc at rncbc.org>.
 #
@@ -584,13 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='drumkv1'
 PACKAGE_TARNAME='drumkv1'
-<<<<<<< HEAD
-PACKAGE_VERSION='0.8.2'
-PACKAGE_STRING='drumkv1 0.8.2'
-=======
 PACKAGE_VERSION='0.8.3'
 PACKAGE_STRING='drumkv1 0.8.3'
->>>>>>> upstream/0.8.3
 PACKAGE_BUGREPORT='rncbc at rncbc.org'
 PACKAGE_URL=''
 
@@ -1315,11 +1306,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-<<<<<<< HEAD
-\`configure' configures drumkv1 0.8.2 to adapt to many kinds of systems.
-=======
 \`configure' configures drumkv1 0.8.3 to adapt to many kinds of systems.
->>>>>>> upstream/0.8.3
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,11 +1367,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-<<<<<<< HEAD
-     short | recursive ) echo "Configuration of drumkv1 0.8.2:";;
-=======
      short | recursive ) echo "Configuration of drumkv1 0.8.3:";;
->>>>>>> upstream/0.8.3
    esac
   cat <<\_ACEOF
 
@@ -1514,11 +1497,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-<<<<<<< HEAD
-drumkv1 configure 0.8.2
-=======
 drumkv1 configure 0.8.3
->>>>>>> upstream/0.8.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1895,11 +1874,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-<<<<<<< HEAD
-It was created by drumkv1 $as_me 0.8.2, which was
-=======
 It was created by drumkv1 $as_me 0.8.3, which was
->>>>>>> upstream/0.8.3
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -6353,11 +6328,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-<<<<<<< HEAD
-This file was extended by drumkv1 $as_me 0.8.2, which was
-=======
 This file was extended by drumkv1 $as_me 0.8.3, which was
->>>>>>> upstream/0.8.3
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6419,11 +6390,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-<<<<<<< HEAD
-drumkv1 config.status 0.8.2
-=======
 drumkv1 config.status 0.8.3
->>>>>>> upstream/0.8.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 5a4643d..c6097d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-<<<<<<< HEAD
-AC_INIT(drumkv1, 0.8.2, rncbc at rncbc.org)
-=======
 AC_INIT(drumkv1, 0.8.3, rncbc at rncbc.org)
->>>>>>> upstream/0.8.3
 
 AC_CONFIG_SRCDIR(src/drumkv1.cpp)
 AC_CONFIG_HEADERS(src/config.h)
diff --git a/drumkv1.spec.in b/drumkv1.spec.in
index 5274f48..7dab164 100644
--- a/drumkv1.spec.in
+++ b/drumkv1.spec.in
@@ -1,10 +1,6 @@
 %define name    @PACKAGE_TARNAME@
 %define version @PACKAGE_VERSION@
-<<<<<<< HEAD
-%define release 28
-=======
 %define release 29
->>>>>>> upstream/0.8.3
 
 %define _prefix	@ac_prefix@
 
@@ -91,11 +87,8 @@ BuildRequires:	lv2-devel
 %{_datadir}/man/man1/%{name}*.1.gz
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Jun 21 2017 Rui Nuno Capela <rncbc at rncbc.org> 0.8.3
 - A Summer'17 release.
->>>>>>> upstream/0.8.3
 * Tue May  2 2017 Rui Nuno Capela <rncbc at rncbc.org> 0.8.2
 - Pre-LAC2017 release frenzy.
 * Tue Mar 21 2017 Rui Nuno Capela <rncbc at rncbc.org> 0.8.1
diff --git a/src/drumkv1.cpp b/src/drumkv1.cpp
index 3ac70ec..3f6461e 100644
--- a/src/drumkv1.cpp
+++ b/src/drumkv1.cpp
@@ -850,11 +850,8 @@ public:
 	void midiInEnabled(bool on);
 	uint32_t midiInCount();
 
-<<<<<<< HEAD
-=======
 	void directNoteOn(int note, int vel);
 
->>>>>>> upstream/0.8.3
 protected:
 
 	void allSoundOff();
@@ -2424,8 +2421,6 @@ uint32_t drumkv1::midiInCount (void)
 }
 
 
-<<<<<<< HEAD
-=======
 // MIDI direct note on/off triggering
 
 void drumkv1::directNoteOn ( int note, int vel )
@@ -2434,6 +2429,5 @@ void drumkv1::directNoteOn ( int note, int vel )
 }
 
 
->>>>>>> upstream/0.8.3
 // end of drumkv1.cpp
 
diff --git a/src/drumkv1.h b/src/drumkv1.h
index 3b63e8c..ebcd244 100644
--- a/src/drumkv1.h
+++ b/src/drumkv1.h
@@ -180,11 +180,8 @@ public:
 	void midiInEnabled(bool on);
 	uint32_t midiInCount();
 
-<<<<<<< HEAD
-=======
 	void directNoteOn(int note, int vel);
 
->>>>>>> upstream/0.8.3
 protected:
 
 	virtual void selectSample(int key) = 0;
diff --git a/src/drumkv1.qrc b/src/drumkv1.qrc
index 17dadba..06b7b3f 100644
--- a/src/drumkv1.qrc
+++ b/src/drumkv1.qrc
@@ -2,10 +2,7 @@
 	<qresource>
 		<file>images/ledOn.png</file>
 		<file>images/ledOff.png</file>
-<<<<<<< HEAD
-=======
 		<file>images/playSample.png</file>
->>>>>>> upstream/0.8.3
 		<file>images/presetNew.png</file>
 		<file>images/presetOpen.png</file>
 		<file>images/presetSave.png</file>
diff --git a/src/drumkv1_ui.cpp b/src/drumkv1_ui.cpp
index a6ba7e5..a5f8de2 100644
--- a/src/drumkv1_ui.cpp
+++ b/src/drumkv1_ui.cpp
@@ -151,13 +151,10 @@ uint32_t drumkv1_ui::midiInCount (void)
 }
 
 
-<<<<<<< HEAD
-=======
 void drumkv1_ui::directNoteOn ( int note, int vel )
 {
 	m_pDrumk->directNoteOn(note, vel);
 }
 
 
->>>>>>> upstream/0.8.3
 // end of drumkv1_ui.cpp
diff --git a/src/drumkv1_ui.h b/src/drumkv1_ui.h
index 6a752e8..02f3106 100644
--- a/src/drumkv1_ui.h
+++ b/src/drumkv1_ui.h
@@ -68,11 +68,8 @@ public:
 	void midiInEnabled(bool bEnabled);
 	uint32_t midiInCount();
 
-<<<<<<< HEAD
-=======
 	void directNoteOn(int note, int vel);
 
->>>>>>> upstream/0.8.3
 private:
 
 	drumkv1 *m_pDrumk;
diff --git a/src/drumkv1widget_elements.cpp b/src/drumkv1widget_elements.cpp
index eb5ce0e..1c0fc3c 100644
--- a/src/drumkv1widget_elements.cpp
+++ b/src/drumkv1widget_elements.cpp
@@ -479,8 +479,6 @@ void drumkv1widget_elements::midiInLedNote ( int key, int vel )
 }
 
 
-<<<<<<< HEAD
-=======
 // Direct note-on/off methods.
 void drumkv1widget_elements::directNoteOn ( int key )
 {
@@ -520,6 +518,5 @@ void drumkv1widget_elements::directNoteOff (void)
 	m_iDirectNoteOn = -1;
 }
 
->>>>>>> upstream/0.8.3
 
 // end of drumkv1widget_elements.cpp
diff --git a/src/drumkv1widget_elements.h b/src/drumkv1widget_elements.h
index 9210b7b..d0efeaa 100644
--- a/src/drumkv1widget_elements.h
+++ b/src/drumkv1widget_elements.h
@@ -132,12 +132,9 @@ public:
 	// MIDI input status update
 	void midiInLedNote(int key, int vel);
 
-<<<<<<< HEAD
-=======
 	// Direct note-on methods.
 	void directNoteOn(int key);
 
->>>>>>> upstream/0.8.3
 signals:
 
 	// Emitted signals.

-- 
drumkv1 packaging



More information about the pkg-multimedia-commits mailing list