[SCM] calf/master: Refresh patch 0001 with quilt shortening options -pab --no-timestamps --no-index.

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Apr 5 08:30:33 UTC 2012


The following commit has been merged in the master branch:
commit b8f49ee7f2f3d11e693ca13ea7748122df17e214
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Apr 5 10:29:31 2012 +0200

    Refresh patch 0001 with quilt shortening options -pab --no-timestamps --no-index.

diff --git a/debian/patches/0001-libglade_to_gtkbuilder.patch b/debian/patches/0001-libglade_to_gtkbuilder.patch
index 1700e1d..452e742 100644
--- a/debian/patches/0001-libglade_to_gtkbuilder.patch
+++ b/debian/patches/0001-libglade_to_gtkbuilder.patch
@@ -15,9 +15,9 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  src/preset_gui.cpp |   15 ++++--
  10 files changed, 143 insertions(+), 150 deletions(-)
 
---- calf.orig/Makefile.am
-+++ calf/Makefile.am
-@@ -7,7 +7,7 @@ distdir = $(PACKAGE)-$(VERSION)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@
  desktopfilesdir = $(datadir)/applications
  dist_desktopfiles_DATA = calf.desktop
  
@@ -26,9 +26,9 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  
  dist_man_MANS = calf.7 calfjackhost.1
  
---- calf.orig/Makefile.in
-+++ calf/Makefile.in
-@@ -269,7 +269,7 @@ SUBDIRS = $(SRCDIRS)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -269,7 +269,7 @@
  distdir = $(PACKAGE)-$(VERSION)
  desktopfilesdir = $(datadir)/applications
  dist_desktopfiles_DATA = calf.desktop
@@ -37,9 +37,9 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  dist_man_MANS = calf.7 calfjackhost.1
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
---- calf.orig/src/Makefile.am
-+++ calf/src/Makefile.am
-@@ -84,7 +84,7 @@ install-data-hook:
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -84,7 +84,7 @@
  	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
  	install -c -m 644 $(top_srcdir)/gui/gui-*.xml $(DESTDIR)$(pkgdatadir)
  if USE_JACK
@@ -48,7 +48,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  endif
  if USE_LADSPA
  	install -d -m 755 $(DESTDIR)$(with_ladspa_dir)
-@@ -121,7 +121,7 @@ endif
+@@ -121,7 +121,7 @@
  	rmdir -p $(DESTDIR)$(with_lv2_dir)/calf.lv2 || true
  endif
  if USE_JACK
@@ -57,9 +57,9 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  endif
  	rm -f $(DESTDIR)$(pkgdatadir)/gui-*.xml
  	rm -f $(DESTDIR)$(pkgdatadir)/presets.xml
---- calf.orig/src/Makefile.in
-+++ calf/src/Makefile.in
-@@ -877,7 +877,7 @@ install-data-hook:
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -877,7 +877,7 @@
  	install -c -m 644 $(top_srcdir)/knob.png $(DESTDIR)$(pkgdatadir)
  	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
  	install -c -m 644 $(top_srcdir)/gui/gui-*.xml $(DESTDIR)$(pkgdatadir)
@@ -68,7 +68,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  @USE_LADSPA_TRUE@	install -d -m 755 $(DESTDIR)$(with_ladspa_dir)
  @USE_LADSPA_TRUE@	install -d -m 755 $(DESTDIR)$(with_ladspa_rdf_dir)
  @USE_LADSPA_TRUE@	install -c -m 755 $(top_builddir)/src/.libs/calf.so $(DESTDIR)$(with_ladspa_dir)/calf.so
-@@ -898,7 +898,7 @@ uninstall-hook:
+@@ -898,7 +898,7 @@
  @USE_LV2_TRUE@	rm -f $(DESTDIR)$(with_lv2_dir)/calf.lv2/calf.so
  @USE_LV2_TRUE@	rm -f $(DESTDIR)$(with_lv2_dir)/calf.lv2/*.ttl
  @USE_LV2_TRUE@	rmdir -p $(DESTDIR)$(with_lv2_dir)/calf.lv2 || true
@@ -77,8 +77,8 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  	rm -f $(DESTDIR)$(pkgdatadir)/gui-*.xml
  	rm -f $(DESTDIR)$(pkgdatadir)/presets.xml
  	rm -f $(DESTDIR)$(pkgdatadir)/knob.png
---- calf.orig/src/jackhost.cpp
-+++ calf/src/jackhost.cpp
+--- a/src/jackhost.cpp
++++ b/src/jackhost.cpp
 @@ -23,7 +23,6 @@
  #include <stdint.h>
  #include <stdlib.h>
@@ -87,7 +87,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  #include <jack/jack.h>
  #if USE_LASH
  #include <lash/lash.h>
-@@ -633,7 +632,6 @@ int main(int argc, char *argv[])
+@@ -633,7 +632,6 @@
          g_warning("Warning: failed to create a LASH connection");
      }
  #endif
@@ -95,8 +95,8 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
      while(1) {
          int option_index;
          int c = getopt_long(argc, argv, "c:i:o:m:M:ehv", long_options, &option_index);
---- calf.orig/src/preset_gui.cpp
-+++ calf/src/preset_gui.cpp
+--- a/src/preset_gui.cpp
++++ b/src/preset_gui.cpp
 @@ -19,7 +19,6 @@
   
  #include <config.h>
@@ -105,7 +105,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  #include <calf/giface.h>
  #include <calf/gui.h>
  #include <calf/preset.h>
-@@ -31,7 +30,7 @@ using namespace std;
+@@ -31,7 +30,7 @@
  
  // this way of filling presets menu is not that great
  
@@ -114,7 +114,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  GtkWidget *store_preset_dlg = NULL;
  
  void store_preset_dlg_destroy(GtkWindow *window, gpointer data)
-@@ -46,10 +45,16 @@ void calf_plugins::store_preset(GtkWindo
+@@ -46,10 +45,16 @@
          gtk_window_present(GTK_WINDOW(store_preset_dlg));
          return;
      }
@@ -135,7 +135,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
      gtk_combo_box_set_model(GTK_COMBO_BOX(preset_name_combo), model);
      gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(preset_name_combo), 0);
 --- /dev/null
-+++ calf/calf.ui
++++ b/calf.ui
 @@ -0,0 +1,115 @@
 +<?xml version="1.0"?>
 +<!--*- mode: xml -*-->
@@ -252,9 +252,9 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
 +    </action-widgets>
 +  </object>
 +</interface>
---- calf.orig/configure
-+++ calf/configure
-@@ -15381,12 +15381,12 @@ if test -n "$PKG_CONFIG"; then
+--- a/configure
++++ b/configure
+@@ -15381,12 +15381,12 @@
          pkg_cv_GUI_DEPS_CFLAGS="$GUI_DEPS_CFLAGS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -270,7 +270,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  else
    pkg_failed=yes
  fi
-@@ -15399,12 +15399,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -15399,12 +15399,12 @@
          pkg_cv_GUI_DEPS_LIBS="$GUI_DEPS_LIBS"
      else
          if test -n "$PKG_CONFIG" && \
@@ -286,7 +286,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  else
    pkg_failed=yes
  fi
-@@ -15423,19 +15423,19 @@ else
+@@ -15423,19 +15423,19 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -310,9 +310,9 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
  
  else
  	GUI_DEPS_CFLAGS=$pkg_cv_GUI_DEPS_CFLAGS
---- calf.orig/configure.ac
-+++ calf/configure.ac
-@@ -84,9 +84,9 @@ if test "$LV2_ENABLED" = "yes"; then
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,9 +84,9 @@
  fi
  
  if test "$JACK_FOUND" = "yes" -o "$DSSI_FOUND" = "yes" -o "$LV2_ENABLED" = "yes"; then
@@ -324,7 +324,7 @@ Applied-Upstream: http://repo.or.cz/w/calf.git/commit/97aa259d392789
    )
  else
    GUI_ENABLED="no"
---- calf.orig/calf.glade
+--- a/calf.glade
 +++ /dev/null
 @@ -1,125 +0,0 @@
 -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list