Commit defaab4c authored by Guillaume Delacour's avatar Guillaume Delacour

Prepare 0.8.10-1 release, drop libicu support and enable dpkg-buildflags

parent c2a26038
gdisk (0.8.10-1) unstable; urgency=medium
Upstream dropped libicu dependency but continue to support UTF-16LE
parition name.
As a consequence, the gdisk-noicu (if installed) has been replaced by
gdisk single package.
-- Guillaume Delacour <gui@iroqwa.org> Sun, 20 Jul 2014 14:52:52 +0200
gdisk (0.8.10-1) unstable; urgency=medium
* New upstream release (LP: #1281306): libicu dependency removed upstream,
drop all libicu related Debian patches and files: gdisk replaces gdisk-noicu
to do the transition (document it in debian/NEWS).
Build-Depends on ncurses with wide character support (libncursesw5-dev)
instead of libncurses5-dev and include <ncursesw/ncurses.h> instead of
<ncurses.h> in cgdisk (debian/patches/ncursesw5.diff)
* Enable parallel building and use dpkg-buildflags instead of
DEB_BUILD_HARDENING
* debian/patches/enable_make_test.diff: Add a test target to upstream
Makefile instead of overriding dh_auto_test
* Refresh patch debian/patches/manpages.diff
* Drop unnecessary debian/patches/gdisk_binary_dir.diff
* gdisk.lintian-overrides: Re-add as fixparts false positive against fortify
-- Guillaume Delacour <gui@iroqwa.org> Sun, 20 Jul 2014 14:52:52 +0200
gdisk (0.8.8-1) unstable; urgency=low
* New upstream release (Closes: #729958)
......
......@@ -2,8 +2,7 @@ Source: gdisk
Section: admin
Priority: extra
Maintainer: Guillaume Delacour <gui@iroqwa.org>
Build-Depends: debhelper (>= 9), libpopt-dev, uuid-dev, libicu-dev,
libncurses5-dev
Build-Depends: debhelper (>= 9), libpopt-dev, uuid-dev, libncursesw5-dev
Standards-Version: 3.9.5
Homepage: http://sourceforge.net/projects/gptfdisk/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gdisk.git
......@@ -11,7 +10,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/gdisk.git
Package: gdisk
Architecture: any
Conflicts: gdisk-noicu
Replaces: gdisk-noicu
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: groff-base
Description: GPT fdisk text-mode partitioning tool
......@@ -22,22 +21,3 @@ Description: GPT fdisk text-mode partitioning tool
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}
Recommends: groff-base
Description: GPT fdisk text-mode partitioning tool (without unicode support)
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.
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
gdisk.docs
\ No newline at end of file
gdisk.manpages
\ No newline at end of file
gdisk binary: hardening-no-fortify-functions sbin/fixparts
Description: Add LD_ICU flag in Makefile to disable icu support at build-time
Author: Ryan Finnie <ryan@finnie.org>
Last-Update: 2013-06-10
Bug-Debian: http://bugs.debian.org/702544
Forwarded: no
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,14 @@
CC=gcc
CXX=g++
CFLAGS+=-D_FILE_OFFSET_BITS=64
-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+ifeq ($(USE_ICU),0)
+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64
+LD_ICU=
+else
+CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16
+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
@@ -15,15 +21,15 @@
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
--- a/gdisk_test.sh
+++ b/gdisk_test.sh
@@ -33,8 +33,8 @@
# Try to generate a wrong GPT table to detect problems (test --verify)
# Create MBR partition table with fdisk and migrate it with gdisk
-GDISK_BIN=./gdisk
-SGDISK_BIN=./sgdisk
+GDISK_BIN=$1/gdisk
+SGDISK_BIN=$1/sgdisk
OPT_CLEAR="o"
OPT_NEW="n"
Subject: Enale gdisk_test.sh script in Makefile
Index: gdisk/Makefile
===================================================================
--- gdisk.orig/Makefile
+++ gdisk/Makefile
@@ -28,6 +28,9 @@ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
fixparts: $(MBR_LIB_OBJS) fixparts.o
$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
+test:
+ ./gdisk_test.sh
+
lint: #no pre-reqs
lint $(SRCS)
......@@ -3,7 +3,7 @@ Description: Fixup test script to exit 1 on all failures
it really should do to indicate test script failure.
Author: James Page <james.page@ubuntu.com>
Last-Update: 2013-06-10
Forwarded: no
Forwarded: https://sourceforge.net/p/gptfdisk/code/merge-requests/2/
--- a/gdisk_test.sh
+++ b/gdisk_test.sh
......
......@@ -2,7 +2,7 @@ From: Jeff Epler <jepler@unpythonic.net>
Subject: All devices are characters devices on kFreeBSD
Last-Update: 2013-07-31
Bug-Debian: http://bugs.debian.org/696813
Forwarded: https://sourceforge.net/p/gptfdisk/mailman/message/31237858/
Forwarded: https://sourceforge.net/p/gptfdisk/code/merge-requests/3/
--- a/diskio-unix.cc
+++ b/diskio-unix.cc
......
From: Guillaume Delacour <gui@iroqwa.org>
Subject: Fix minor errors in manpages (hyphen as minus)
Last-Update: 2013-12-19
Last-Update: 2014-05-02
Forwarded: no
--- a/sgdisk.8
......@@ -31,4 +31,4 @@ Forwarded: no
+Disk replication operation (\-R) failed
.SH "BUGS"
As of October 2013 (version 0.8.8), \fBsgdisk\fR
As of March 2014 (version 0.8.10), \fBsgdisk\fR
From: Guillaume Delacour <gui@iroqwa.org>
Subject: Use the ncurses.h of libncursesw5-dev instead of libncurses5-dev
Forwarded: https://sourceforge.net/p/gptfdisk/code/merge-requests/1/
Index: gdisk/gptcurses.cc
===================================================================
--- gdisk.orig/gptcurses.cc
+++ gdisk/gptcurses.cc
@@ -22,7 +22,7 @@
#include <iostream>
#include <string>
#include <sstream>
-#include <ncurses.h>
+#include <ncursesw/ncurses.h>
#include "gptcurses.h"
#include "support.h"
ncursesw5.diff
set_default_partition_type-test.diff
manpages.diff
kfreebsd_character_devices.diff
fix-change_disk_uid-test.diff
conditional-icu.diff
enable_make_test.diff
......@@ -2,7 +2,7 @@ Decription: Don't use a kernel dependent default gpt type when creating a
partition (Linux is 8300 and kFreeBSD is A503, see support.h)
Author: Guillaume Delacour <gui@iroqwa.org>
Last-Update: 2013-12-19
Forwarded: no
Forwarded: https://sourceforge.net/p/gptfdisk/code/merge-requests/2/
--- a/gdisk_test.sh
+++ b/gdisk_test.sh
......
......@@ -2,39 +2,25 @@
# -*- makefile -*-
# hardening options at build time
export DEB_BUILD_HARDENING=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
override_dh_clean:
$(RM) -rf $(CURDIR)/build-gdisk
$(RM) -rf $(CURDIR)/build-gdisk-noicu
$(MAKE) clean
dh_clean
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
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
dh_auto_build --parallel
# Upstream Makefile don't provide install rule
override_dh_install:
# 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 -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
# 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
override_dh_auto_test:
./gdisk_test.sh build-gdisk
./gdisk_test.sh build-gdisk-noicu
install -D debian/index.html \
$(CURDIR)/debian/gdisk/usr/share/doc/gdisk/index.html
%:
dh $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment