Release 1.0.18

talisein · Oct 13, 2023 · d470a00 · d470a00
1 parent 9f0219f
commit d470a00
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,8 @@
+dregarnuhr (1.0.18-1) jammy; urgency=medium
+
+  * M3V2
+ -- Andrew Potter <[email protected]>  Thu, 12 Oct 2023 19:27:47 -0700
+
 dregarnuhr (1.0.17-1) jammy; urgency=medium
 
   * P5V6

diff --git a/dregarnuhr.spec b/dregarnuhr.spec
@@ -51,6 +51,9 @@ Rearrange Ascendence of a Bookworm epubs into Chronological Order
 
 
 %changelog
+* Thu Oct 12 2023 Andrew Potter <[email protected]> - v1.0.18-1
+- M3V2
+
 * Tue Jul 1 2023 Andrew Potter <[email protected]> - v1.0.17-1
 - Add P5V6
 - Fix --slim cover image bug

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('dregarnuhr', ['c', 'cpp'],
         license : 'GPLv3+',
-        version : '1.0.17',
+        version : '1.0.18',
         default_options : ['c_std=gnu17',
                            'buildtype=release',
                            'default_library=static',

diff --git a/src/part3_defs.h b/src/part3_defs.h
@@ -116,7 +116,6 @@ namespace part_3_defs
 { volume::P3V1, "Text/chapter12_1.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },
 { volume::P3V1, "Text/extra2.xhtml"sv, "application/xhtml+xml"sv, "One Stressed-Out Chef"sv, true },
 
-/* suffering */
 { volume::M3V2, /* CHAPTER */ "xhtml/p-155.xhtml", "application/xhtml+xml", "Extra: Benno and Gustav's Suffering", true },
 { volume::M3V2, /* CHAPTER */ "xhtml/p-156.xhtml", "application/xhtml+xml", std::nullopt, true },
 { volume::M3V2, /* CHAPTER */ "xhtml/p-157.xhtml", "application/xhtml+xml", std::nullopt, true },
@@ -127,13 +126,11 @@ namespace part_3_defs
 { volume::M3V2, /* IMAGE */ "image/i-157.jpg", "image/jpeg", std::nullopt, false },
 { volume::M3V2, /* IMAGE */ "image/i-158.jpg", "image/jpeg", std::nullopt, false },
 
-
 { volume::P3V1, "Text/chapter13.xhtml"sv, "application/xhtml+xml"sv, "How to Gather Donations"sv, true },
 { volume::P3V1, "Text/insert6.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },
 { volume::P3V1, "Text/chapter13_1.xhtml"sv, "application/xhtml+xml"sv, std::nullopt, true },
 { volume::P3V1, "Text/chapter14.xhtml"sv, "application/xhtml+xml"sv, "My First Magic Training Regimen"sv, true },
 
-/* SS */
 { volume::M3V2, /* CHAPTER */ "xhtml/p-160.xhtml", "application/xhtml+xml", "Changes at Home", true },
 { volume::M3V2, /* CHAPTER */ "xhtml/p-161.xhtml", "application/xhtml+xml", std::nullopt, true },
 { volume::M3V2, /* CHAPTER */ "xhtml/p-162.xhtml", "application/xhtml+xml", std::nullopt, true },
@@ -143,7 +140,6 @@ namespace part_3_defs
 { volume::M3V2, /* CHAPTER */ "xhtml/p-166.xhtml", "application/xhtml+xml", std::nullopt, true },
 { volume::M3V2, /* CHAPTER */ "xhtml/p-167.xhtml", "application/xhtml+xml", std::nullopt, true },
 { volume::M3V2, /* CHAPTER */ "xhtml/p-168.xhtml", "application/xhtml+xml", std::nullopt, true },
-
 { volume::M3V2, /* IMAGE */ "image/i-160.jpg", "image/jpeg", std::nullopt, false },
 { volume::M3V2, /* IMAGE */ "image/i-161.jpg", "image/jpeg", std::nullopt, false },
 { volume::M3V2, /* IMAGE */ "image/i-162.jpg", "image/jpeg", std::nullopt, false },
@@ -154,7 +150,6 @@ namespace part_3_defs
 { volume::M3V2, /* IMAGE */ "image/i-167.jpg", "image/jpeg", std::nullopt, false },
 { volume::M3V2, /* IMAGE */ "image/i-168.jpg", "image/jpeg", std::nullopt, false },
 
-
 { volume::P3V1, "Text/chapter15.xhtml"sv, "application/xhtml+xml"sv, "Working Toward Wax Stencils"sv, true },
 { volume::P3V1, "Text/chapter16.xhtml"sv, "application/xhtml+xml"sv, "An Illustration of Ferdinand"sv, true },
 { volume::P3V1, "Text/chapter17.xhtml"sv, "application/xhtml+xml"sv, "Johann and Zack"sv, true },