[SCM] gigedit/master: Patches refreshed.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 19988126559ee914348e9b241f4f241ce60c2936
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Dec 8 11:47:22 2017 +0100

    Patches refreshed.

diff --git a/debian/patches/01-makefiles.patch b/debian/patches/01-makefiles.patch
index 82a46b0..9487388 100644
--- a/debian/patches/01-makefiles.patch
+++ b/debian/patches/01-makefiles.patch
@@ -6,7 +6,10 @@ Index: gigedit/Makefile.am
 ===================================================================
 --- gigedit.orig/Makefile.am
 +++ gigedit/Makefile.am
-@@ -1,4 +1,4 @@
+@@ -1,7 +1,7 @@
+ # let GCC auto detect whether it (sh/c)ould output its messages in color
+ export GCC_COLORS=auto
+ 
 -SUBDIRS = src gfx po debian doc win32
 +SUBDIRS = src gfx po doc win32
  
@@ -16,7 +19,7 @@ Index: gigedit/configure.ac
 ===================================================================
 --- gigedit.orig/configure.ac
 +++ gigedit/configure.ac
-@@ -196,7 +196,6 @@ AC_CONFIG_FILES([
+@@ -206,7 +206,6 @@ AC_CONFIG_FILES([
  	src/plugin/Makefile
  	gfx/Makefile
  	po/Makefile.in
diff --git a/debian/patches/03-spelling.patch b/debian/patches/03-spelling.patch
index c303fc7..4677f80 100644
--- a/debian/patches/03-spelling.patch
+++ b/debian/patches/03-spelling.patch
@@ -6,7 +6,7 @@ Index: gigedit/src/gigedit/dimensionmanager.cpp
 ===================================================================
 --- gigedit.orig/src/gigedit/dimensionmanager.cpp
 +++ gigedit/src/gigedit/dimensionmanager.cpp
-@@ -319,7 +319,7 @@ struct _DimDef {
+@@ -353,7 +353,7 @@ struct _DimDef {
  };
  typedef std::map<gig::dimension_t, _DimDef> _Dimensions;
  
@@ -19,7 +19,7 @@ Index: gigedit/src/gigedit/mainwindow.cpp
 ===================================================================
 --- gigedit.orig/src/gigedit/mainwindow.cpp
 +++ gigedit/src/gigedit/mainwindow.cpp
-@@ -425,7 +425,7 @@ MainWindow::MainWindow() :
+@@ -1237,7 +1237,7 @@ MainWindow::MainWindow() :
      {
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
              uiManager->get_widget("/MenuBar/MenuEdit/CopySampleLoop"));
@@ -28,7 +28,7 @@ Index: gigedit/src/gigedit/mainwindow.cpp
      }
      {
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
-@@ -440,7 +440,7 @@ MainWindow::MainWindow() :
+@@ -1252,7 +1252,7 @@ MainWindow::MainWindow() :
      {
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
              uiManager->get_widget("/MenuBar/MenuSettings/MoveRootNoteWithRegionMoved"));
@@ -37,7 +37,7 @@ Index: gigedit/src/gigedit/mainwindow.cpp
      }
      {
          Gtk::MenuItem* item = dynamic_cast<Gtk::MenuItem*>(
-@@ -2476,7 +2476,7 @@ void MainWindow::add_or_replace_sample(b
+@@ -3988,7 +3988,7 @@ void MainWindow::add_or_replace_sample(b
          for (std::vector<std::string>::iterator iter = filenames.begin();
               iter != filenames.end(); ++iter) {
              printf("Adding sample %s\n",(*iter).c_str());
@@ -50,7 +50,7 @@ Index: gigedit/src/gigedit/dimregionedit.cpp
 ===================================================================
 --- gigedit.orig/src/gigedit/dimregionedit.cpp
 +++ gigedit/src/gigedit/dimregionedit.cpp
-@@ -236,7 +236,7 @@ DimRegionEdit::DimRegionEdit() :
+@@ -279,7 +279,7 @@ DimRegionEdit::DimRegionEdit() :
      eGain(_("Gain"), -96, 0, 2, -655360),
      eGainPlus6(_("Gain +6dB"), eGain, 6 * -655360),
      eSampleLoopEnabled(_("Enabled")),
@@ -63,7 +63,7 @@ Index: gigedit/src/gigedit/ReferencesView.cpp
 ===================================================================
 --- gigedit.orig/src/gigedit/ReferencesView.cpp
 +++ gigedit/src/gigedit/ReferencesView.cpp
-@@ -38,7 +38,7 @@ ReferencesView::ReferencesView(Gtk::Wind
+@@ -54,7 +54,7 @@ ReferencesView::ReferencesView(Gtk::Wind
      m_refTreeModel = RefsTreeStore::create(m_columns);
      m_treeView.set_model(m_refTreeModel);
      m_treeView.set_tooltip_text(_(

-- 
gigedit packaging