[Forensics-changes] [SCM] debian-forensics/libewf branch, debian, updated. debian/20091003-1

Cristian Greco cristian.debian at gmail.com
Sat Oct 3 16:09:19 UTC 2009


The following commit has been merged in the debian branch:
commit 95021c2500d39dc118020f8466efa707f33138f5
Author: Cristian Greco <cristian.debian at gmail.com>
Date:   Sat Oct 3 17:51:04 2009 +0200

    debian/patches: drop all patches, merged upstream. Thanks Joachim!
    debian/control: drop now useless build-dep on quilt, autotools-dev, autoconf,
    automake, libtool.
    debian/rules: there is no need to run autoreconf at build time now.
    debian/README.source: deleted.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 0e93be2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-* Notes about Quilt patch system *
-----------------------------------
-
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/debian/control b/debian/control
index 3e4e590..e3c0ed8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monniez at fccu.be>, Cristian Greco <cristian.debian at gmail.com>
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), autoconf, automake, libtool, autotools-dev, libssl-dev, uuid-dev, zlib1g-dev
+Build-Depends: debhelper (>= 7.0.50), libssl-dev, uuid-dev, zlib1g-dev
 Standards-Version: 3.8.3
 Homepage: http://libewf.sourceforge.net
 Vcs-Browser: http://git.debian.org/?p=forensics/libewf.git
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
deleted file mode 100644
index 0b1b4bb..0000000
--- a/debian/patches/01-debian-directory.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Daniel Baumann <daniel at debian.org>
-Description: Rebuild upstream-tarball without debian-directory.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -59,7 +59,6 @@
- 	libewf.spec.in
- 
- EXTRA_DIST = \
--	$(DEBIAN_FILES) \
- 	$(REDHAT_FILES) \
- 	libewf.pc \
- 	libewf.pc.in
-@@ -89,8 +88,6 @@
- 	/bin/rm -f config.log
- 	/bin/rm -f libewf.pc
- 	/bin/rm -f libewf.spec
--	/bin/rm -f debian/changelog
--	/bin/rm -f debian/shlibs.local.ex
- 	@for dir in ${subdirs}; do \
- 		(cd $$dir && $(MAKE) distclean) \
- 		|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
---- a/configure.ac
-+++ b/configure.ac
-@@ -1641,8 +1641,6 @@
- AC_CONFIG_FILES([libewf/libewf_definitions.h])
- dnl Have configure make distribution specific files
- AC_CONFIG_FILES([common/types.h])
--AC_CONFIG_FILES([debian/changelog])
--AC_CONFIG_FILES([debian/shlibs.local.ex])
- AC_CONFIG_FILES([macosx/Introduction.rtf])
- AC_CONFIG_FILES([libewf.pc])
- AC_CONFIG_FILES([libewf.spec])
diff --git a/debian/patches/02-fix-acinclude-m4.patch b/debian/patches/02-fix-acinclude-m4.patch
deleted file mode 100644
index 36e16f0..0000000
--- a/debian/patches/02-fix-acinclude-m4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Cristian Greco <cristian.debian at gmail.com>
-Description: Fix acinclude.m4 syntax to be able to run autoreconf.
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -176,14 +176,8 @@
- 				  [1]) ]) ])
- 			])
- 		])
--	AC_LANG_POP(C) ]) ],
--	[AC_CHECK_FUNCS(
--	 [ctime],
--	 [],
--	 [AC_MSG_FAILURE(
--	  [Missing function: ctime_r and ctime],
--	  [1]) ])
--])
-+	AC_LANG_POP(C) ]) ]
-+)
- 
- dnl Function to determine the operating system
- AC_DEFUN([LIBEWF_DETERMINE_OPERATING_SYSTEM],
diff --git a/debian/patches/03-fix-ldflags.patch b/debian/patches/03-fix-ldflags.patch
deleted file mode 100644
index 6496526..0000000
--- a/debian/patches/03-fix-ldflags.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Author: Cristian Greco <cristian.debian at gmail.com>
-Description: fix to avoid to link against unneded libraries for ewf-tools.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1165,7 +1165,8 @@
- 	AC_CHECK_LIB(
- 	 crypto,
- 	 EVP_md5,
--	 [],
-+	 [AC_SUBST([LIBSSL_LIBADD],["-lcrypto"])
-+    AC_DEFINE([HAVE_LIBCRYPTO],[1],[define...])],
- 	 [ac_libewf_have_libcrypto_evp=no])
- 	AC_CHECK_LIB(
- 	 crypto,
-@@ -1224,7 +1225,7 @@
- 	AC_CHECK_LIB(
- 	 crypto,
- 	 MD5_Init,
--	 [],
-+	 [ac_libewf_dummy=yes],
- 	 [ac_libewf_have_libcrypto_md5=no])
- 	AC_CHECK_LIB(
- 	 crypto,
-@@ -1294,7 +1295,8 @@
- 	  AC_CHECK_LIB(
- 	  [uuid],
- 	  [uuid_generate],
--	  [],
-+	  [AC_SUBST([LIBUUID_LIBADD],["-luuid"])
-+     AC_DEFINE([HAVE_LIBUUID],[1],[define...])],
- 	  [ac_libewf_have_guid_support=no])
- 	 ])
- 	])
---- a/ewftools/Makefile.am
-+++ b/ewftools/Makefile.am
-@@ -38,7 +38,9 @@
- 	../liberror/liberror.la \
- 	../libewf/libewf.la \
- 	../libsystem/libsystem.la \
--	@MEMWATCH_LIBADD@
-+	@MEMWATCH_LIBADD@ \
-+	@LIBSSL_LIBADD@ \
-+	@LIBUUID_LIBADD@
- 
- ewfacquirestream_SOURCES = \
- 	byte_size_string.c byte_size_string.h \
-@@ -60,7 +62,9 @@
- 	../liberror/liberror.la \
- 	../libewf/libewf.la \
- 	../libsystem/libsystem.la \
--	@MEMWATCH_LIBADD@
-+	@MEMWATCH_LIBADD@ \
-+	@LIBSSL_LIBADD@ \
-+	@LIBUUID_LIBADD@
- 
- ewfalter_SOURCES = \
- 	alteration_handle.c alteration_handle.h \
-@@ -75,7 +79,9 @@
- 	../liberror/liberror.la \
- 	../libewf/libewf.la \
- 	../libsystem/libsystem.la \
--	@MEMWATCH_LIBADD@
-+	@MEMWATCH_LIBADD@ \
-+	@LIBSSL_LIBADD@ \
-+	@LIBUUID_LIBADD@
- 
- ewfdebug_SOURCES = \
- 	byte_size_string.c byte_size_string.h \
-@@ -87,7 +93,9 @@
- 	../liberror/liberror.la \
- 	../libewf/libewf.la \
- 	../libsystem/libsystem.la \
--	@MEMWATCH_LIBADD@
-+	@MEMWATCH_LIBADD@ \
-+	@LIBSSL_LIBADD@ \
-+	@LIBUUID_LIBADD@
- 
- ewfexport_SOURCES = \
- 	byte_size_string.c byte_size_string.h \
-@@ -109,7 +117,9 @@
- 	../liberror/liberror.la \
- 	../libewf/libewf.la \
- 	../libsystem/libsystem.la \
--	@MEMWATCH_LIBADD@
-+	@MEMWATCH_LIBADD@ \
-+	@LIBSSL_LIBADD@ \
-+	@LIBUUID_LIBADD@
- 
- ewfinfo_SOURCES = \
- 	byte_size_string.c byte_size_string.h \
-@@ -124,7 +134,9 @@
- 	../liberror/liberror.la \
- 	../libewf/libewf.la \
- 	../libsystem/libsystem.la \
--	@MEMWATCH_LIBADD@
-+	@MEMWATCH_LIBADD@ \
-+	@LIBSSL_LIBADD@ \
-+	@LIBUUID_LIBADD@
- 
- ewfverify_SOURCES = \
- 	byte_size_string.c byte_size_string.h \
-@@ -144,7 +156,9 @@
- 	../liberror/liberror.la \
- 	../libewf/libewf.la \
- 	../libsystem/libsystem.la \
--	@MEMWATCH_LIBADD@
-+	@MEMWATCH_LIBADD@ \
-+	@LIBSSL_LIBADD@ \
-+	@LIBUUID_LIBADD@
- 
- distclean: clean
- 	/bin/rm -f Makefile
diff --git a/debian/patches/10-fix-manpages.patch b/debian/patches/10-fix-manpages.patch
deleted file mode 100644
index 12f603d..0000000
--- a/debian/patches/10-fix-manpages.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Author: Cristian Greco <cristian.debian at gmail.com>
-Description: fix some manpages warnings.
-
---- a/manuals/ewfacquirestream.1
-+++ b/manuals/ewfacquirestream.1
-@@ -112,7 +112,7 @@
- None
- .Sh EXAMPLES
- .Bd -literal
--# ewfacquirestream -C 1 -D Floppy -E 1.1 -e 'John D.' -N 'Just a floppy in my system' -m removable -M physical -t floppy </dev/fd0
-+# ewfacquirestream \-C 1 \-D Floppy \-E 1.1 \-e 'John D.' \-N 'Just a floppy in my system' \-m removable \-M physical \-t floppy </dev/fd0
- ewfacquirestream 20090229 (libewf 20090229, libuna 20090124, zlib 1.2.3, libcrypto 0.9.8g, libuuid)
- 
- Using the following acquiry parameters:
---- a/manuals/ewfinfo.1
-+++ b/manuals/ewfinfo.1
-@@ -55,7 +55,7 @@
- None
- .Sh EXAMPLES
- .Bd -literal
--# ewfinfo -d dm floppy.E01
-+# ewfinfo \-d dm floppy.E01
- ewfinfo 20090427 (libewf 20090427, libuna 20090427, libbfio 20090426, zlib 1.2.3, libcrypto 0.9.8g, libuuid)
- 
- Acquiry information
---- a/manuals/libewf.3
-+++ b/manuals/libewf.3
-@@ -664,7 +664,7 @@
- .Fn libewf_set_notify_values
- function can be used to direct the warning, verbose and debug output from the library.
- .Sh RETURN VALUES
--Most of the functions return NULL or -1 on error, dependent on the return type. For the actual return values refer to libewf.h
-+Most of the functions return NULL or \-1 on error, dependent on the return type. For the actual return values refer to libewf.h
- .Sh ENVIRONMENT
- None
- .Sh FILES
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 23fcf6b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-01-debian-directory.patch
-02-fix-acinclude-m4.patch
-03-fix-ldflags.patch
-10-fix-manpages.patch
diff --git a/debian/rules b/debian/rules
index b17e53b..21dbc9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
 %:
-	dh ${@} --with quilt
+	dh ${@}
 
 override_dh_auto_configure:
-	autoreconf -fi
 	dh_auto_configure -- LDFLAGS="-Wl,--as-needed"
 
 override_dh_strip:

-- 
debian-forensics/libewf



More information about the forensics-changes mailing list