Package: gdisk
Version: 0.8.5-1
Severity: wishlist
Tags: l10n
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
gdisk is (by default) built with libicu support, which is fine, but
libicu is very large. For space-constrained systems, it would be nice
to have a version of the package which is not built against libicu.
Please find attached a patch against 0.8.5-1 which builds both "gdisk"
and "gdisk-noicu". gdisk-noicu Provides: gdisk, so packages which
depend on gdisk should function normally. I've patched the Makefile to
accept USE_ICU=0 or USE_ICU=1 (the default Makefile expected you to edit
this to do it manually), and debian/rules builds the objects/binaries in
separate directories so it doesn't have to clean between makes.
- -- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages gdisk depends on:
ii groff-base 1.22.1-3
ii libc6 2.13-38
ii libgcc1 1:4.7.2-5
ii libicu48 4.8.1.1-10
ii libncurses5 5.9-10
ii libpopt0 1.16-7
ii libstdc++6 4.7.2-5
ii libtinfo5 5.9-10
ii libuuid1 2.20.1-5.3
gdisk recommends no packages.
gdisk suggests no packages.
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJROZHkAAoJEH5go6aGro2Y0GwP+wWg1rlOO3u+JZ7mwR98GbRN
VS5thGA1vOGACVWBaF7Y5DqbEcwmHFEiB4Erg6u3UPSOatKW4GBs3U9zYQEBxT8e
BIG1psuvAH4VN5O5fBZh8E+IpXHjGF6AVnUuX1jAdEoFLzS31MZ+JMyV+cQyvG3y
EAbxhIjpP9dzxEZFBewMEyGhMCQgo6wond045uyETYQr5xtIjpt+wlPfY78LGdRB
1IOmz4mRg3ExT4eDHhE23hQBSkBoxL5PVVnD6Wj//lx8fyAlgiNWEdHFlmjlxpf0
4JpHAl801dWoaui3upswhehAnw5vV5Jv0N050XNEFSTUWCo5mh/vl0sNmXNHpzIt
EgV8yWfWFA38xFsqe6MpL5MNC0zgYkH825TBGhWPX6NHzC1JwF1VFzgDhQ6hTfPV
fOdmk87JF4c5Ge+IExca54o4lEqYruKawM1ofy8my+QHDzv8ZJbiV8vk7b26Uno7
elLIpvely92dmyPWU3undXOg93RfmH5XvTHcMCmehaPetyDwKy5dUMfEClhG4HwA
r7L5dosToK3AXjPAZIS19NiMMF4/OwkXPach0IPV0xf4s8WAFRorNthOrRLzLX3+
ajvWIBPZUZigrmTO5EMPNdDdKUmtXv2w5j0NqkiVcMaqzjH8I56x2+S13unnjkbc
lkVRJAhMySs255MLh0h8
=LKz1
-----END PGP SIGNATURE-----
diff -ruN gdisk-0.8.5.orig/debian/control gdisk-0.8.5/debian/control
--- gdisk-0.8.5.orig/debian/control 2012-03-05 12:32:34.000000000 -0800
+++ gdisk-0.8.5/debian/control 2013-03-07 22:50:13.611349862 -0800
@@ -11,6 +11,7 @@
Package: gdisk
Architecture: any
+Conflicts: gdisk-noicu
Depends: ${shlibs:Depends}, ${misc:Depends}, groff-base
Description: GPT fdisk text-mode partitioning tool
GPT fdisk (aka gdisk) is a text-mode partitioning
@@ -20,3 +21,21 @@
Master Boot Record (MBR) partition tables.
.
Please note that gdisk is still in beta version.
+
+Package: gdisk-noicu
+Architecture: any
+Provides: gdisk
+Conflicts: gdisk
+Depends: ${shlibs:Depends}, ${misc:Depends}, groff-base
+Description: GPT fdisk text-mode partitioning tool
+ GPT fdisk (aka gdisk) is a text-mode partitioning
+ tool that works on Globally Unique Identifier
+ (GUID) Partition Table (GPT) disks, rather than
+ on the more common (through 2009)
+ Master Boot Record (MBR) partition tables.
+ .
+ This package is not built with Unicode, for
+ space-constrained systems. For Unicode support,
+ please install the gdisk package.
+ .
+ Please note that gdisk is still in beta version.
diff -ruN gdisk-0.8.5.orig/debian/doc-base gdisk-0.8.5/debian/doc-base
--- gdisk-0.8.5.orig/debian/doc-base 2012-06-16 13:40:50.000000000 -0700
+++ gdisk-0.8.5/debian/doc-base 1969-12-31 16:00:00.000000000 -0800
@@ -1,9 +0,0 @@
-Document: gdisk
-Title: Gdisk manuals
-Author: Roderick W. Smith
-Abstract: Manuals for cgdisk, fixparts, gdisk and sgdisk
-Section: System/Administration
-
-Format: HTML
-Index: /usr/share/doc/gdisk/index.html
-Files: /usr/share/doc/gdisk/*.html
diff -ruN gdisk-0.8.5.orig/debian/gdisk.doc-base gdisk-0.8.5/debian/gdisk.doc-base
--- gdisk-0.8.5.orig/debian/gdisk.doc-base 1969-12-31 16:00:00.000000000 -0800
+++ gdisk-0.8.5/debian/gdisk.doc-base 2013-03-07 22:48:38.371553286 -0800
@@ -0,0 +1,9 @@
+Document: gdisk
+Title: Gdisk manuals
+Author: Roderick W. Smith
+Abstract: Manuals for cgdisk, fixparts, gdisk and sgdisk
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/gdisk/index.html
+Files: /usr/share/doc/gdisk/*.html
diff -ruN gdisk-0.8.5.orig/debian/gdisk.lintian-overrides gdisk-0.8.5/debian/gdisk.lintian-overrides
--- gdisk-0.8.5.orig/debian/gdisk.lintian-overrides 1969-12-31 16:00:00.000000000 -0800
+++ gdisk-0.8.5/debian/gdisk.lintian-overrides 2013-03-07 22:51:52.323138291 -0800
@@ -0,0 +1 @@
+gdisk binary: hardening-no-fortify-functions sbin/fixparts
diff -ruN gdisk-0.8.5.orig/debian/gdisk.manpages gdisk-0.8.5/debian/gdisk.manpages
--- gdisk-0.8.5.orig/debian/gdisk.manpages 1969-12-31 16:00:00.000000000 -0800
+++ gdisk-0.8.5/debian/gdisk.manpages 2011-10-03 12:28:27.000000000 -0700
@@ -0,0 +1,4 @@
+gdisk.8
+sgdisk.8
+fixparts.8
+cgdisk.8
diff -ruN gdisk-0.8.5.orig/debian/gdisk-noicu.doc-base gdisk-0.8.5/debian/gdisk-noicu.doc-base
--- gdisk-0.8.5.orig/debian/gdisk-noicu.doc-base 1969-12-31 16:00:00.000000000 -0800
+++ gdisk-0.8.5/debian/gdisk-noicu.doc-base 2013-03-07 22:48:45.079536961 -0800
@@ -0,0 +1,9 @@
+Document: gdisk-noicu
+Title: Gdisk manuals
+Author: Roderick W. Smith
+Abstract: Manuals for cgdisk, fixparts, gdisk and sgdisk
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/gdisk-noicu/index.html
+Files: /usr/share/doc/gdisk-noicu/*.html
diff -ruN gdisk-0.8.5.orig/debian/gdisk-noicu.lintian-overrides gdisk-0.8.5/debian/gdisk-noicu.lintian-overrides
--- gdisk-0.8.5.orig/debian/gdisk-noicu.lintian-overrides 1969-12-31 16:00:00.000000000 -0800
+++ gdisk-0.8.5/debian/gdisk-noicu.lintian-overrides 2013-03-07 22:51:59.675123596 -0800
@@ -0,0 +1 @@
+gdisk-noicu binary: hardening-no-fortify-functions sbin/fixparts
diff -ruN gdisk-0.8.5.orig/debian/gdisk-noicu.manpages gdisk-0.8.5/debian/gdisk-noicu.manpages
--- gdisk-0.8.5.orig/debian/gdisk-noicu.manpages 1969-12-31 16:00:00.000000000 -0800
+++ gdisk-0.8.5/debian/gdisk-noicu.manpages 2011-10-03 12:28:27.000000000 -0700
@@ -0,0 +1,4 @@
+gdisk.8
+sgdisk.8
+fixparts.8
+cgdisk.8
diff -ruN gdisk-0.8.5.orig/debian/lintian-overrides gdisk-0.8.5/debian/lintian-overrides
--- gdisk-0.8.5.orig/debian/lintian-overrides 2012-06-16 10:14:16.000000000 -0700
+++ gdisk-0.8.5/debian/lintian-overrides 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-gdisk binary: hardening-no-fortify-functions sbin/fixparts
diff -ruN gdisk-0.8.5.orig/debian/manpages gdisk-0.8.5/debian/manpages
--- gdisk-0.8.5.orig/debian/manpages 2011-10-03 12:28:27.000000000 -0700
+++ gdisk-0.8.5/debian/manpages 1969-12-31 16:00:00.000000000 -0800
@@ -1,4 +0,0 @@
-gdisk.8
-sgdisk.8
-fixparts.8
-cgdisk.8
diff -ruN gdisk-0.8.5.orig/debian/patches/conditional-icu.diff gdisk-0.8.5/debian/patches/conditional-icu.diff
--- gdisk-0.8.5.orig/debian/patches/conditional-icu.diff 1969-12-31 16:00:00.000000000 -0800
+++ gdisk-0.8.5/debian/patches/conditional-icu.diff 2013-03-07 22:33:17.033191592 -0800
@@ -0,0 +1,37 @@
+--- a/Makefile 2012-05-30 08:38:43.000000000 -0700
++++ b/Makefile 2013-03-07 22:22:07.442455899 -0800
+@@ -1,8 +1,13 @@
+ CC=gcc
+ CXX=g++
+ CFLAGS+=-D_FILE_OFFSET_BITS=64
++ifeq ($(USE_ICU),0)
++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++LD_ICU=
++else
+ CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
++LD_ICU=-licuio -licuuc
++endif
+ LDFLAGS+=
+ LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix
+ MBR_LIBS=support diskio diskio-unix basicmbr mbrpart
+@@ -14,16 +19,13 @@
+ all: cgdisk gdisk sgdisk fixparts
+
+ gdisk: $(LIB_OBJS) gdisk.o gpttext.o
+-# $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
+- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(LD_ICU) -luuid -o gdisk
+
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
+- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) $(LD_ICU) -luuid -lncurses -o cgdisk
+
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+-# $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
+- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(LD_ICU) -luuid -lpopt -o sgdisk
+
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
diff -ruN gdisk-0.8.5.orig/debian/patches/series gdisk-0.8.5/debian/patches/series
--- gdisk-0.8.5.orig/debian/patches/series 2012-06-16 05:41:09.000000000 -0700
+++ gdisk-0.8.5/debian/patches/series 2013-03-07 22:33:38.385152765 -0800
@@ -1 +1,2 @@
manpages.diff
+conditional-icu.diff
diff -ruN gdisk-0.8.5.orig/debian/rules gdisk-0.8.5/debian/rules
--- gdisk-0.8.5.orig/debian/rules 2012-06-16 10:09:52.000000000 -0700
+++ gdisk-0.8.5/debian/rules 2013-03-07 22:57:47.346405683 -0800
@@ -4,14 +4,33 @@
# hardening options at build time
export DEB_BUILD_HARDENING=1
+override_dh_clean:
+ $(RM) -rf $(CURDIR)/build-gdisk
+ $(RM) -rf $(CURDIR)/build-gdisk-noicu
+ $(MAKE) clean
+ dh_clean
+
+override_dh_auto_build:
+ install -d $(CURDIR)/build-gdisk
+ $(MAKE) -C $(CURDIR)/build-gdisk -f ../Makefile VPATH=..
+ install -d $(CURDIR)/build-gdisk-noicu
+ $(MAKE) -C $(CURDIR)/build-gdisk-noicu -f ../Makefile VPATH=.. USE_ICU=0
+
# Upstream Makefile don't provide install rule
override_dh_install:
- install -D gdisk $(CURDIR)/debian/gdisk/sbin/gdisk
- install -D sgdisk $(CURDIR)/debian/gdisk/sbin/sgdisk
- install -D cgdisk $(CURDIR)/debian/gdisk/sbin/cgdisk
- install -D fixparts $(CURDIR)/debian/gdisk/sbin/fixparts
+ # gdisk
+ install -D build-gdisk/gdisk $(CURDIR)/debian/gdisk/sbin/gdisk
+ install -D build-gdisk/sgdisk $(CURDIR)/debian/gdisk/sbin/sgdisk
+ install -D build-gdisk/cgdisk $(CURDIR)/debian/gdisk/sbin/cgdisk
+ install -D build-gdisk/fixparts $(CURDIR)/debian/gdisk/sbin/fixparts
+ # gdisk-noicu
+ install -D build-gdisk-noicu/gdisk $(CURDIR)/debian/gdisk-noicu/sbin/gdisk
+ install -D build-gdisk-noicu/sgdisk $(CURDIR)/debian/gdisk-noicu/sbin/sgdisk
+ install -D build-gdisk-noicu/cgdisk $(CURDIR)/debian/gdisk-noicu/sbin/cgdisk
+ install -D build-gdisk-noicu/fixparts $(CURDIR)/debian/gdisk-noicu/sbin/fixparts
# install index page for doc-base
install -D debian/index.html $(CURDIR)/debian/gdisk/usr/share/doc/gdisk/index.html
+ install -D debian/index.html $(CURDIR)/debian/gdisk-noicu/usr/share/doc/gdisk-noicu/index.html
%:
dh $@
