[SCM] petri-foo/master: Remove patches applied upstream
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Thu Jun 28 12:54:37 UTC 2012
The following commit has been merged in the master branch:
commit 7f30bd3c0582395172133c9461fe08f0ec3bd8d1
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Wed Jun 27 14:52:58 2012 +0200
Remove patches applied upstream
diff --git a/debian/patches/0001-include_dirs.patch b/debian/patches/0001-include_dirs.patch
deleted file mode 100644
index b0a63e4..0000000
--- a/debian/patches/0001-include_dirs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix headers lookup to prevent FTBFS.
- Look for headers in the parent directory.
- Put the generate config.h into the sources root.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: yes
----
- CMakeLists.txt | 2 +-
- libpetrifoo/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- petri-foo.orig/libpetrifoo/CMakeLists.txt
-+++ petri-foo/libpetrifoo/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories ( . )
-+include_directories ( . .. )
-
- ADD_SUBDIRECTORY( patch_private )
-
---- petri-foo.orig/CMakeLists.txt
-+++ petri-foo/CMakeLists.txt
-@@ -129,7 +129,7 @@ INCLUDE (CheckIncludeFiles)
- CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
- CHECK_INCLUDE_FILES (jack/session.h HAVE_JACK_SESSION_H)
- CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
-- ${CMAKE_CURRENT_BINARY_DIR}/config.h )
-+ ${CMAKE_CURRENT_SOURCE_DIR}/config.h )
-
- link_libraries(m)
-
diff --git a/debian/patches/0002-spelling_fix.patch b/debian/patches/0002-spelling_fix.patch
deleted file mode 100644
index 2052840..0000000
--- a/debian/patches/0002-spelling_fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fix spelling
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: yes
-
-Index: petri-foo/gui/bank-ops.c
-===================================================================
---- petri-foo.orig/gui/bank-ops.c 2012-06-20 18:12:58.348981848 +0200
-+++ petri-foo/gui/bank-ops.c 2012-06-20 19:05:47.116899093 +0200
-@@ -141,7 +141,7 @@
-
- gtk_recent_manager_add_item (recent_manager,
- g_filename_to_uri(name, NULL, NULL));
-- msg_log(MSG_MESSAGE, "Succesfully wrote file %s\n", name);
-+ msg_log(MSG_MESSAGE, "Successfully wrote file %s\n", name);
- free(last_bank);
- last_bank = strdup(name);
- set_bankname(name);
-@@ -227,7 +227,7 @@
- msg_log(MSG_WARNING, "Bank %s read with errors\n", name);
- }
- else
-- msg_log(MSG_MESSAGE, "Succesfully read bank %s\n", name);
-+ msg_log(MSG_MESSAGE, "Successfully read bank %s\n", name);
-
- gtk_recent_manager_add_item(recent_manager,
- g_filename_to_uri(name, NULL, NULL));
-@@ -291,7 +291,7 @@
- msg_log(MSG_WARNING, "Bank %s read with errors\n", filename);
- }
- else
-- msg_log(MSG_MESSAGE, "Succesfully read bank %s\n", filename);
-+ msg_log(MSG_MESSAGE, "Successfully read bank %s\n", filename);
-
- gtk_recent_manager_add_item (recent_manager,
- g_filename_to_uri(filename, NULL, NULL));
diff --git a/debian/patches/series b/debian/patches/series
index 3254552..2958d1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-include_dirs.patch
-0002-spelling_fix.patch
0003-desktop_file_fix.patch
--
petri-foo packaging
More information about the pkg-multimedia-commits
mailing list