[Forensics-changes] [SCM] debian-forensics/aimage branch, debian, updated. debian/3.2.4-1-17-gf8e7856

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 06cc449e518d7eadc47a0da918ba2eca41064eef
Author: Julien Valroff <julien at kirya.net>
Date:   Mon Oct 10 20:22:45 2011 +0200

    Fix typo in help and manpage

diff --git a/debian/aimage.1 b/debian/aimage.1
index 37cacc0..3c243d0 100644
--- a/debian/aimage.1
+++ b/debian/aimage.1
@@ -45,7 +45,7 @@ This configuration file contains questions to ask the user of aimage just before
 .IP "\fB\-o FILENAME, \-\-outfile=FILENAME\fR Specify the output file name as FILENAME." 4
 .IP "\fB\-S nnnn, \-\-image_pagesize=nnnn\fR Specify the AFF page size as nnnn (default to 16777216) (number can be suffixed with b, k, m or g)." 4
 .IP "\fB\-m, \-\-make_config\fR Make a sample config file if it doesn't exist.
-Config file is aimage.cfg by default and can be overridden by the AIMAGE_CONFIG enviroment variable.
+Config file is aimage.cfg by default and can be overridden by the AIMAGE_CONFIG environment variable.
 If the config file doesn't exist, it's created and the program exits right after.
 If the config file exists, the program directly starts the copy." 4
 .IP "\fB\-D, \-\-no_dmesg\fR Do not put dmesg into the AFF file." 4
diff --git a/debian/changelog b/debian/changelog
index 7e667e4..f231ca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ aimage (3.2.5-1) unstable; urgency=low
   * Bump debhelper compat to 8
   * Fix DEP-5 copyright syntax 
   * Restore original upstream files and add a patch to apply the changes 
+  * Fix typo in help and manpage 
 
- -- Julien Valroff <julien at debian.org>  Mon, 10 Oct 2011 20:16:56 +0200
+ -- Julien Valroff <julien at debian.org>  Mon, 10 Oct 2011 20:22:26 +0200
 
 aimage (3.2.4-1) unstable; urgency=low
 
diff --git a/debian/patches/001_fix-ftbfs.diff b/debian/patches/001_fix-ftbfs.diff
index e26a5aa..01ca3d8 100644
--- a/debian/patches/001_fix-ftbfs.diff
+++ b/debian/patches/001_fix-ftbfs.diff
@@ -1,3 +1,6 @@
+Description: Fix FTBFS
+Last-Updated: 2011-10-10
+
 diff --git a/Makefile.am b/Makefile.am
 index b52c829..99552b6 100644
 --- a/Makefile.am
diff --git a/debian/patches/002_spelling-errors.diff b/debian/patches/002_spelling-errors.diff
new file mode 100644
index 0000000..b8c788e
--- /dev/null
+++ b/debian/patches/002_spelling-errors.diff
@@ -0,0 +1,16 @@
+Description: fix typo
+Author: Julien Valroff <julien at debian.org>
+Last-Updated: 2011-10-10
+Forwarded: no
+
+--- a/src/aimage.cpp
++++ b/src/aimage.cpp
+@@ -187,7 +187,7 @@
+     printf("                           Also sets  maxsize to be 2^32 - image_pagesize if not otherwise set.\n"); 
+     printf("  --make_config, -m     -- Make the config file if it doesn't exist\n");
+     printf("                           Config file is %s by default\n",AIMAGE_CONFIG_FILENAME);
+-    printf("                           and can be overridden by the %s enviroment variable\n", AIMAGE_CONFIG);
++    printf("                           and can be overridden by the %s environment variable\n", AIMAGE_CONFIG);
+     printf("  --no_dmesg, -D        -- Do not put dmesg into the AFF file\n");
+     printf("  --no_ifconfig, -I     -- Do not put ifconfig output into AFF file\n");
+     if(getenv(AIMAGE_CONFIG)){
diff --git a/debian/patches/series b/debian/patches/series
index 988b22d..9b8aa47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 001_fix-ftbfs.diff
+002_spelling-errors.diff

-- 
debian-forensics/aimage