[Forensics-changes] [guymager] 03/06: Drop debian/patches which got applied upstream
Michael Prokop
mika at moszumanska.debian.org
Thu Jun 18 15:08:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
mika pushed a commit to branch debian
in repository guymager.
commit 12afd69609f5740f38f00681d986acd24ca6aadb
Author: Michael Prokop <mika at debian.org>
Date: Thu Jun 18 15:55:12 2015 +0200
Drop debian/patches which got applied upstream
---
.../01_do-not-statically-compile-against-libs.diff | 17 -----------
.../patches/reenable_libguytools_and_libewf.diff | 13 ---------
debian/patches/series | 3 --
debian/patches/support_new_libewf.patch | 33 ----------------------
4 files changed, 66 deletions(-)
diff --git a/debian/patches/01_do-not-statically-compile-against-libs.diff b/debian/patches/01_do-not-statically-compile-against-libs.diff
deleted file mode 100644
index 2903e72..0000000
--- a/debian/patches/01_do-not-statically-compile-against-libs.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: disable statically linking
-Author: Michael Prokop <mika at debian.org>
-Last-Updated: 2012-03-01
-
---- a/guymager.pro
-+++ b/guymager.pro
-@@ -147,8 +147,8 @@
- #LIBS += -lewf
- #LIBS += -lguytools
- #LIBS += /usr/local/lib/libewf.a
--LIBS += /usr/lib/libewf.a
--LIBS += /usr/lib/libguytools.a
-+#LIBS += /usr/lib/libewf.a
-+#LIBS += /usr/lib/libguytools.a
- LIBS += -lz
- LIBS += -ldl
-
diff --git a/debian/patches/reenable_libguytools_and_libewf.diff b/debian/patches/reenable_libguytools_and_libewf.diff
deleted file mode 100644
index c108cc0..0000000
--- a/debian/patches/reenable_libguytools_and_libewf.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/guymager.pro
-+++ b/guymager.pro
-@@ -144,8 +144,8 @@
- QMAKE_LFLAGS_DEBUG += -ggdb -rdynamic # -rdynamic is necessary in order to have the backtrace handler in toolsignal show all information
- QMAKE_LFLAGS_RELEASE += -ggdb -rdynamic # -rdynamic is necessary in order to have the backtrace handler in toolsignal show all information
-
--#LIBS += -lewf
--#LIBS += -lguytools
-+LIBS += -lewf
-+LIBS += -lguytools
- #LIBS += /usr/local/lib/libewf.a
- #LIBS += /usr/lib/libewf.a
- #LIBS += /usr/lib/libguytools.a
diff --git a/debian/patches/series b/debian/patches/series
index 0943423..3823ed6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-01_do-not-statically-compile-against-libs.diff
-reenable_libguytools_and_libewf.diff
adjust_compileinfo
-support_new_libewf.patch
diff --git a/debian/patches/support_new_libewf.patch b/debian/patches/support_new_libewf.patch
deleted file mode 100644
index 4c012ae..0000000
--- a/debian/patches/support_new_libewf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/fifo.h
-+++ b/fifo.h
-@@ -38,7 +38,7 @@
- #ifndef _LIBEWF_H
- #include <libewf.h>
-
-- #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
-+ #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
- #error "Please check EWF documentation for newer Encase formats and adjust following code"
- #endif
-
---- a/dlgacquire.cpp
-+++ b/dlgacquire.cpp
-@@ -1245,7 +1245,7 @@
- return;
- }
- SplitSize = NumValue * UnitIndexToMultiplier (DlgAcquireGetField(CFG_DLGACQUIRE_SPLITFILEUNIT)->pComboBox->currentIndex());
-- #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
-+ #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
- #error "Please check EWF documentation for newer Encase formats and adjust following code"
- #endif
- if (pOwn->pRadioButtonFormatEWF->isChecked())
---- a/main.cpp
-+++ b/main.cpp
-@@ -508,7 +508,7 @@
-
- // Initialise libewf
- // -----------------
-- #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416))
-+ #if ((LIBEWF_VERSION != 20100226) && (LIBEWF_VERSION != 20080501) && (LIBEWF_VERSION != 20111015) && (LIBEWF_VERSION != 20130416) && (LIBEWF_VERSION != 20140608))
- #error "Please check EWF documentation for newer Encase formats and adjust following code"
- #endif
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/guymager.git
More information about the forensics-changes
mailing list