[Forensics-changes] [SCM] debian-forensics/extundelete branch, debian, updated. debian/0.2.0-1-13-g09cf0c7

Christophe Monniez christophe.monniez at fccu.be
Thu Dec 13 07:24:19 UTC 2012


The following commit has been merged in the debian branch:
commit 4a903ff32bd02820409c9278925027a836c5cb76
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Wed Dec 12 15:03:49 2012 +0100

    Removing another absolete patch.

diff --git a/debian/patches/04_fix_frags_per_group_compile_error.patch b/debian/patches/04_fix_frags_per_group_compile_error.patch
deleted file mode 100644
index 55291ec..0000000
--- a/debian/patches/04_fix_frags_per_group_compile_error.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: fix compile error in insertionops.cc regarding rename of s_frags_per_group
-  Fixes:
-    insertionops.cc: In function 'std::ostream& operator<<(std::ostream&, const ext2_super_block*)':
-    insertionops.cc:66:47: error: 'const struct ext2_super_block' has no member named 's_frags_per_group'
-  See git commit 412376efff3c0e0c2fea00666c2457e6f2ae1878
-  "Add basic BIGALLOC support for cluster-based allocation" in
-  upstreams e2fsprogs repository
-Forwarded: yes
-Author: Michael Prokop <mika at debian.org>
-Last-Update: 2011-01-11
-
---- a/src/insertionops.cc
-+++ b/src/insertionops.cc
-@@ -63,7 +63,7 @@ std::ostream& operator<<(std::ostream& os, const ext2_super_block* const s_block
-   os << "Block size: " << EXT2_BLOCK_SIZE(s_block) << std::endl;
-   os << "Fragment size: " << EXT2_FRAG_SIZE(s_block) << std::endl;
-   os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl;
--  os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl;
-+  os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl;
-   os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl;
-   os << "Mount time: " << s_block->s_mtime << std::endl;
-   os << "Write time: " << s_block->s_wtime << std::endl;
diff --git a/debian/patches/series b/debian/patches/series
index 6347ad7..8388ca0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_output_dir.patch
-04_fix_frags_per_group_compile_error.patch

-- 
debian-forensics/extundelete



More information about the forensics-changes mailing list