[Forensics-changes] [SCM] debian-forensics/libewf branch, debian, updated. debian/20080501+debian-3-31-gcc97de3

[Cristian Greco]

The following commit has been merged in the debian branch:
commit e4a62d3de225b3b9513af5b1f0fbb8316d854042
Author: Cristian Greco <cristian.debian at gmail.com>
Date:   Wed Sep 23 17:05:01 2009 +0200

    01-debian-directory.patch: refresh patch against new source files.

diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index f77405c..147c8b1 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -1,105 +1,31 @@
 Author: Daniel Baumann <daniel at debian.org>
 Description: Rebuild upstream-tarball without debian-directory.
 
-diff -Naurp libewf.orig/Makefile.am libewf/Makefile.am
---- libewf.orig/Makefile.am	2008-05-02 06:34:55.000000000 +0000
-+++ libewf/Makefile.am	2008-11-25 12:23:38.000000000 +0000
-@@ -93,7 +93,6 @@ REDHAT_FILES = \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -54,7 +54,6 @@
+ 	libewf.spec.in
  
  EXTRA_DIST = \
- 	$(CONFIG_FILES) \
 -	$(DEBIAN_FILES) \
- 	$(DOCUMENT_FILES) \
- 	$(INCLUDE_FILES) \
- 	$(MANUAL_FILES) \
-@@ -135,8 +134,6 @@ distclean: clean
- 	/bin/rm -f include/libewf/types.h
+ 	$(REDHAT_FILES) \
+ 	libewf.pc \
+ 	libewf.pc.in
+@@ -83,8 +82,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
- 	/bin/rm -f macosx/Introduction.rtf
  	@for dir in ${subdirs}; do \
  		(cd $$dir && $(MAKE) distclean) \
-diff -Naurp libewf.orig/Makefile.in libewf/Makefile.in
---- libewf.orig/Makefile.in	2008-05-02 06:35:28.000000000 +0000
-+++ libewf/Makefile.in	2008-11-25 12:23:44.000000000 +0000
-@@ -38,8 +38,6 @@ DIST_COMMON = README $(am__configure_dep
- 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/libewf.pc.in \
- 	$(srcdir)/libewf.spec.in $(top_srcdir)/configure \
--	$(top_srcdir)/debian/changelog.in \
--	$(top_srcdir)/debian/shlibs.local.ex.in \
- 	$(top_srcdir)/include/libewf.h.in \
- 	$(top_srcdir)/include/libewf/definitions.h.in \
- 	$(top_srcdir)/include/libewf/types.h.in \
-@@ -55,7 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/common/config.h
- CONFIG_CLEAN_FILES = include/libewf.h include/libewf/definitions.h \
--	include/libewf/types.h debian/changelog debian/shlibs.local.ex \
-+	include/libewf/types.h \
- 	macosx/Introduction.rtf libewf.pc libewf.spec
- SOURCES =
- DIST_SOURCES =
-@@ -312,7 +310,6 @@ REDHAT_FILES = \
- 
- EXTRA_DIST = \
- 	$(CONFIG_FILES) \
--	$(DEBIAN_FILES) \
- 	$(DOCUMENT_FILES) \
- 	$(INCLUDE_FILES) \
- 	$(MANUAL_FILES) \
-@@ -377,10 +374,6 @@ include/libewf/definitions.h: $(top_buil
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- include/libewf/types.h: $(top_builddir)/config.status $(top_srcdir)/include/libewf/types.h.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
--debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
--	cd $(top_builddir) && $(SHELL) ./config.status $@
--debian/shlibs.local.ex: $(top_builddir)/config.status $(top_srcdir)/debian/shlibs.local.ex.in
--	cd $(top_builddir) && $(SHELL) ./config.status $@
- macosx/Introduction.rtf: $(top_builddir)/config.status $(top_srcdir)/macosx/Introduction.rtf.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- libewf.pc: $(top_builddir)/config.status $(srcdir)/libewf.pc.in
-@@ -851,8 +844,6 @@ distclean: clean
- 	/bin/rm -f include/libewf/types.h
- 	/bin/rm -f libewf.pc
- 	/bin/rm -f libewf.spec
--	/bin/rm -f debian/changelog
--	/bin/rm -f debian/shlibs.local.ex
- 	/bin/rm -f macosx/Introduction.rtf
- 	@for dir in ${subdirs}; do \
- 		(cd $$dir && $(MAKE) distclean) \
-diff -Naurp libewf.orig/configure libewf/configure
---- libewf.orig/configure	2008-05-02 06:35:19.000000000 +0000
-+++ libewf/configure	2008-11-25 12:22:53.000000000 +0000
-@@ -34236,10 +34236,6 @@ ac_config_files="$ac_config_files includ
- 
- ac_config_files="$ac_config_files include/libewf/types.h"
- 
--ac_config_files="$ac_config_files debian/changelog"
--
--ac_config_files="$ac_config_files debian/shlibs.local.ex"
--
- ac_config_files="$ac_config_files macosx/Introduction.rtf"
- 
- ac_config_files="$ac_config_files libewf.pc"
-@@ -34849,8 +34845,6 @@ do
-     "include/libewf.h") CONFIG_FILES="$CONFIG_FILES include/libewf.h" ;;
-     "include/libewf/definitions.h") CONFIG_FILES="$CONFIG_FILES include/libewf/definitions.h" ;;
-     "include/libewf/types.h") CONFIG_FILES="$CONFIG_FILES include/libewf/types.h" ;;
--    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
--    "debian/shlibs.local.ex") CONFIG_FILES="$CONFIG_FILES debian/shlibs.local.ex" ;;
-     "macosx/Introduction.rtf") CONFIG_FILES="$CONFIG_FILES macosx/Introduction.rtf" ;;
-     "libewf.pc") CONFIG_FILES="$CONFIG_FILES libewf.pc" ;;
-     "libewf.spec") CONFIG_FILES="$CONFIG_FILES libewf.spec" ;;
-diff -Naurp libewf.orig/configure.ac libewf/configure.ac
---- libewf.orig/configure.ac	2008-05-01 12:31:31.000000000 +0000
-+++ libewf/configure.ac	2008-11-25 12:23:01.000000000 +0000
-@@ -651,8 +651,6 @@ AC_CONFIG_FILES([include/libewf.h])
- AC_CONFIG_FILES([include/libewf/definitions.h])
- AC_CONFIG_FILES([include/libewf/types.h])
+ 		|| case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+--- a/configure.ac
++++ b/configure.ac
+@@ -1448,8 +1448,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])

-- 
debian-forensics/libewf