[SCM] eq10q/master: Patches removed - not applied anymore.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Mon Feb 17 14:51:17 UTC 2014
The following commit has been merged in the master branch:
commit e772dbb40a9e8d7ef282df92ccfefba8be08886e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Mon Feb 17 15:48:39 2014 +0100
Patches removed - not applied anymore.
diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
deleted file mode 100644
index cdf8b42..0000000
--- a/debian/patches/01-makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Prepend DESTDIR to INSTALL_DIR and set it to /usr/lib/lv2.
- Pass LDFLAGS to the linker.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: no
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- eq10q.orig/Makefile
-+++ eq10q/Makefile
-@@ -1,5 +1,5 @@
- BUNDLE = paramEQ-Rafols.lv2
--INSTALL_DIR = /usr/local/lib/lv2
-+INSTALL_DIR = /usr/lib/lv2
-
-
- $(BUNDLE): manifest.ttl parameq.ttl paramEQ.so parameq_gui.so logo_top_top.png logo_top.png logo_center.png logo_bottom.png logo_bottom_bottom.png EQ-10Q_bakc.png combopix
-@@ -9,16 +9,16 @@ $(BUNDLE): manifest.ttl parameq.ttl para
- cp -R combopix $(BUNDLE)
-
- paramEQ.so: plugin.cpp
-- g++ -O3 -shared -fPIC -DPIC plugin.cpp `pkg-config --cflags --libs lv2-plugin` -o paramEQ.so
-+ g++ -O3 -shared -fPIC -DPIC $(LDFLAGS) plugin.cpp `pkg-config --cflags --libs lv2-plugin` -o paramEQ.so
-
- parameq_gui.so: main_window.cpp band_ctl.cpp ctlbutton.cpp bodeplot.cpp vuwidget.cpp templatewidget.cpp pixmapcombo.cpp
-- g++ -O3 -shared -fPIC -DPIC bodeplot.cpp templatewidget.cpp vuwidget.cpp pixmapcombo.cpp ctlbutton.cpp band_ctl.cpp main_window.cpp `pkg-config --cflags --libs lv2-gui plotmm` -o parameq_gui.so
-+ g++ -O3 -shared -fPIC -DPIC $(LDFLAGS) bodeplot.cpp templatewidget.cpp vuwidget.cpp pixmapcombo.cpp ctlbutton.cpp band_ctl.cpp main_window.cpp `pkg-config --cflags --libs lv2-gui plotmm` -o parameq_gui.so
-
-
- install: $(BUNDLE)
-- mkdir -p $(INSTALL_DIR)
-- rm -rf $(INSTALL_DIR)/$(BUNDLE)
-- cp -R $(BUNDLE) $(INSTALL_DIR)
-+ mkdir -p $(DESTDIR)$(INSTALL_DIR)
-+ rm -rf $(DESTDIR)$(INSTALL_DIR)/$(BUNDLE)
-+ cp -R $(BUNDLE) $(DESTDIR)$(INSTALL_DIR)
-
- clean:
- rm -rf $(BUNDLE) paramEQ.so parameq_gui.so
diff --git a/debian/patches/02-main_window.cpp.patch b/debian/patches/02-main_window.cpp.patch
deleted file mode 100644
index 9f8a531..0000000
--- a/debian/patches/02-main_window.cpp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Fixed paths to meet debian practice
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
----
---- eq10q.orig/main_window.cpp
-+++ eq10q/main_window.cpp
-@@ -40,11 +40,11 @@
- B_Button("B"),
- in_vu(1),
- out_vu(1),
-- image_logo_top_top("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_top_top.png"),
-- image_logo_top("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_top.png"),
-- image_logo_center("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_center.png"),
-- image_logo_bottom("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_bottom.png"),
-- image_logo_bottom_bottom("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_bottom_bottom.png")
-+ image_logo_top_top("/usr/lib/lv2/paramEQ-Rafols.lv2/logo_top_top.png"),
-+ image_logo_top("/usr/lib/lv2/paramEQ-Rafols.lv2/logo_top.png"),
-+ image_logo_center("/usr/lib/lv2/paramEQ-Rafols.lv2/logo_center.png"),
-+ image_logo_bottom("/usr/lib/lv2/paramEQ-Rafols.lv2/logo_bottom.png"),
-+ image_logo_bottom_bottom("/usr/lib/lv2/paramEQ-Rafols.lv2/logo_bottom_bottom.png")
-
- {
-
-@@ -412,7 +412,7 @@
- flag_pop_resize = false;
- Gtk::Window *this_win = &((Gtk::Window&)(*this->get_toplevel()));
- this_win->set_resizable(false);
-- this_win->modify_bg_pixmap(Gtk::STATE_NORMAL , "/usr/local/lib/lv2/paramEQ-Rafols.lv2/EQ-10Q_bakc.png");
-+ this_win->modify_bg_pixmap(Gtk::STATE_NORMAL , "/usr/lib/lv2/paramEQ-Rafols.lv2/EQ-10Q_bakc.png");
- }
-
- //Passu dels spins
diff --git a/debian/patches/03-pixmapcombo.h.patch b/debian/patches/03-pixmapcombo.h.patch
deleted file mode 100644
index 18f6cdc..0000000
--- a/debian/patches/03-pixmapcombo.h.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fixed paths to meet debian practice
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
----
---- eq10q.orig/pixmapcombo.h
-+++ eq10q/pixmapcombo.h
-@@ -28,23 +28,23 @@
- #include <gtkmm/image.h>
- #include <gtkmm/stock.h>
-
--#define RUTA_OFF "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/off.png"
-+#define RUTA_OFF "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/off.png"
-
--#define RUTA_LPF1 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf1.png"
--#define RUTA_LPF2 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf2.png"
--#define RUTA_LPF3 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf3.png"
--#define RUTA_LPF4 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf4.png"
--
--#define RUTA_HPF1 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf1.png"
--#define RUTA_HPF2 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf2.png"
--#define RUTA_HPF3 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf3.png"
--#define RUTA_HPF4 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf4.png"
-+#define RUTA_LPF1 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf1.png"
-+#define RUTA_LPF2 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf2.png"
-+#define RUTA_LPF3 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf3.png"
-+#define RUTA_LPF4 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf4.png"
-+
-+#define RUTA_HPF1 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf1.png"
-+#define RUTA_HPF2 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf2.png"
-+#define RUTA_HPF3 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf3.png"
-+#define RUTA_HPF4 "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf4.png"
-
--#define RUTA_LOSHELF "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/loshelf.png"
--#define RUTA_HISHELF "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hishelf.png"
-+#define RUTA_LOSHELF "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/loshelf.png"
-+#define RUTA_HISHELF "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/hishelf.png"
-
--#define RUTA_PEAK "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/peak.png"
--#define RUTA_NOTCH "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/notch.png"
-+#define RUTA_PEAK "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/peak.png"
-+#define RUTA_NOTCH "/usr/lib/lv2/paramEQ-Rafols.lv2/combopix/notch.png"
-
- class PixMapCombo : public Gtk::ComboBox{
- public:
-
-
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 00c83fd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-makefile.patch
-02-main_window.cpp.patch
-03-pixmapcombo.h.patch
--
eq10q packaging
More information about the pkg-multimedia-commits
mailing list