Control: tags 769631 pending Control: tags 932483 pending Control: tags 932750 pending
Christoph Biedl wrote... > hereby I declare my intentention to salvage the gdisk package as > described in the developer's reference and also > https://wiki.debian.org/PackageSalvaging > by uploading a new upstream version. Find attached the debdiff (for the debian/ directory only) of the the salvaging upload for gdisk I have prepared and uploaded it to DELAYED/7, versioned as 1.0.4-1. Please feel free to tell me if I should delay it longer. Regards, Christoph
diff --git a/debian/changelog b/debian/changelog index b694cb6..5d97b60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gdisk (1.0.4-1) unstable; urgency=medium + + * Salvaging upload. Closes: #932750 + * New upstream version 1.0.4. Closes: #769631, #932483 + + -- Christoph Biedl <debian.a...@manchmal.in-ulm.de> Mon, 12 Aug 2019 19:39:41 +0200 + gdisk (1.0.3-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 0cf6954..a2115a1 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,6 @@ Maintainer: Guillaume Delacour <g...@iroqwa.org> Build-Depends: debhelper (>= 9), libpopt-dev, uuid-dev, libncursesw5-dev Standards-Version: 4.0.0 Homepage: http://sourceforge.net/projects/gptfdisk/ -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/gdisk.git -Vcs-Git: https://anonscm.debian.org/git/collab-maint/gdisk.git Package: gdisk Architecture: any diff --git a/debian/patches/alignment-fixes.diff b/debian/patches/alignment-fixes.diff deleted file mode 100644 index 72bc75b..0000000 --- a/debian/patches/alignment-fixes.diff +++ /dev/null @@ -1,43 +0,0 @@ -From: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> -Subject: [PATCH] Reset struct alignment back to standard after each #pragma pack (n) -Forwarded: https://sourceforge.net/p/gptfdisk/code/merge-requests/10/ - ---- gdisk-1.0.3.orig/basicmbr.h -+++ gdisk-1.0.3/basicmbr.h -@@ -34,6 +34,7 @@ struct TempMBR { - struct MBRRecord partitions[4]; - uint16_t MBRSignature; - }; // struct TempMBR -+#pragma pack () - - // Possible states of the MBR - enum MBRValidity {invalid, gpt, hybrid, mbr}; ---- gdisk-1.0.3.orig/bsd.h -+++ gdisk-1.0.3/bsd.h -@@ -89,5 +89,6 @@ class BSDData { - int GetNumParts(void); - GPTPart AsGPT(int i); // Return BSD part. as GPT part. - }; // struct MBRData -+#pragma pack () - - #endif ---- gdisk-1.0.3.orig/gpt.h -+++ gdisk-1.0.3/gpt.h -@@ -57,6 +57,7 @@ struct GPTHeader { - uint32_t partitionEntriesCRC; - unsigned char reserved2[GPT_RESERVED]; - }; // struct GPTHeader -+#pragma pack () - - // Data in GPT format - class GPTData { ---- gdisk-1.0.3.orig/mbrpart.h -+++ gdisk-1.0.3/mbrpart.h -@@ -50,6 +50,7 @@ struct MBRRecord { - uint32_t firstLBA; // see above - uint32_t lengthLBA; - }; // struct MBRRecord -+#pragma pack () - - class MBRPart { - protected: diff --git a/debian/patches/manpages.diff b/debian/patches/manpages.diff index ee2b76b..c58db10 100644 --- a/debian/patches/manpages.diff +++ b/debian/patches/manpages.diff @@ -7,7 +7,7 @@ Index: gdisk/sgdisk.8 =================================================================== --- gdisk.orig/sgdisk.8 +++ gdisk/sgdisk.8 -@@ -165,7 +165,7 @@ when using this option. The others requi +@@ -167,7 +167,7 @@ when using this option. The others requi \fItoggle\fR options enable you to change the attribute bit value. The \fIset\fR, \fIclear\fR, \fItoggle\fR, and \fIget\fR options work on a bit number; the others work on a hexadecimal bit mask. For example, type @@ -16,7 +16,7 @@ Index: gdisk/sgdisk.8 bootable) on partition 4 on \fI/dev/sdc\fR. .TP -@@ -347,7 +347,7 @@ use the first available partition number +@@ -354,7 +354,7 @@ use the first available partition number Clear out all partition data. This includes GPT header data, all partition definitions, and the protective MBR. Note that this operation will, like most other operations, fail on a damaged disk. If you want to prepare a @@ -25,7 +25,7 @@ Index: gdisk/sgdisk.8 and then partition it normally. This option will work even if the disk's original partition table is bad; however, most other options on the same command line will be ignored. -@@ -496,7 +496,7 @@ sgdisk, but may with gdisk) +@@ -504,7 +504,7 @@ sgdisk, but may with gdisk) .TP .B 8 diff --git a/debian/patches/series b/debian/patches/series index 4fd018b..4a8dc30 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ ncursesw5.diff manpages.diff -alignment-fixes.diff
signature.asc
Description: PGP signature
