diff -Nru hoz-1.65/debian/changelog hoz-1.65/debian/changelog --- hoz-1.65/debian/changelog 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/changelog 2018-10-17 09:47:43.000000000 +0000 @@ -1,8 +1,13 @@ -hoz (1.65-2build1) bionic; urgency=high +hoz (1.65-3) unstable; urgency=medium - * No change rebuild to pick up -fPIE compiler default + * Fixed partsize miscalculation. Closes: #499318 + - Thanks to Carlos G. + * Upgraded Standards-Version from 3.8.0 to 4.2.1.2 + * Increased compat level to 9 + * Sanitize debian/rules + * Removed debian/watch file. It was useless. Closes: #450270 - -- Balint Reczey Tue, 03 Apr 2018 12:28:12 +0000 + -- Miriam Ruiz Wed, 17 Oct 2018 11:47:43 +0200 hoz (1.65-2) unstable; urgency=low diff -Nru hoz-1.65/debian/compat hoz-1.65/debian/compat --- hoz-1.65/debian/compat 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/compat 2018-10-17 09:47:43.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru hoz-1.65/debian/control hoz-1.65/debian/control --- hoz-1.65/debian/control 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/control 2018-10-17 09:47:43.000000000 +0000 @@ -1,10 +1,9 @@ Source: hoz Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Miriam Ruiz -Build-Depends: debhelper (>= 5), quilt, gettext, help2man, libgtk2.0-dev -Standards-Version: 3.8.0 +Maintainer: Miriam Ruiz +Build-Depends: debhelper, quilt, gettext, help2man, libgtk2.0-dev +Standards-Version: 4.2.1.2 Homepage: http://hoz.sourceforge.net/ Package: hoz diff -Nru hoz-1.65/debian/h2m/hoz.1 hoz-1.65/debian/h2m/hoz.1 --- hoz-1.65/debian/h2m/hoz.1 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/h2m/hoz.1 2018-10-17 09:47:43.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH HOZ "1" "August 2008" "hoz 1.65" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH HOZ "1" "October 2018" "hoz 1.65" "User Commands" .SH NAME hoz \- file splitter that uses the hacha file format .SH SYNOPSIS diff -Nru hoz-1.65/debian/patches/makefile.patch hoz-1.65/debian/patches/makefile.patch --- hoz-1.65/debian/patches/makefile.patch 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/patches/makefile.patch 2018-10-17 09:47:43.000000000 +0000 @@ -1,9 +1,11 @@ # Copyright (C) 2006 by Miriam Ruiz # Distributed under the same license as the program. See debian/copyright +Index: hoz-1.65/Makefile +=================================================================== --- hoz-1.65.orig/Makefile +++ hoz-1.65/Makefile -@@ -4,14 +4,10 @@ +@@ -4,14 +4,10 @@ CC = gcc OBJ = hoz.o hozgtk.o hozgtk_c.o hozgtk_i.o hozgtk_s.o hozcli.o LINKOBJ = hoz.o hozcli.o GLINKOBJ = hoz.o hozgtk.o hozgtk_c.o hozgtk_i.o hozgtk_s.o @@ -15,14 +17,14 @@ - -DGTK_DISABLE_DEPRECATED -BIN = /usr/bin/hoz -GBIN = /usr/bin/ghoz -+CFLAGS = -Wall -O2 ++CFLAGS ?= -Wall -O2 +#CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED +BIN = hoz +GBIN = ghoz GTK_COMP = `pkg-config gtk+-2.0 --cflags` GTK_LINK = `pkg-config gtk+-2.0 --libs` -@@ -30,30 +26,29 @@ +@@ -30,30 +26,29 @@ gtk: all-before ${GBIN} all-after clean: clean-custom rm -f $(OBJ) diff -Nru hoz-1.65/debian/patches/partsize.patch hoz-1.65/debian/patches/partsize.patch --- hoz-1.65/debian/patches/partsize.patch 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/patches/partsize.patch 2018-10-17 09:47:43.000000000 +0000 @@ -3,9 +3,9 @@ Index: hoz-1.65/hozcli.c =================================================================== ---- hoz-1.65.orig/hozcli.c 2008-08-19 13:33:22.000000000 +0200 -+++ hoz-1.65/hozcli.c 2008-08-19 13:33:50.000000000 +0200 -@@ -133,7 +133,7 @@ +--- hoz-1.65.orig/hozcli.c ++++ hoz-1.65/hozcli.c +@@ -133,7 +133,7 @@ int main(int argc, char **argv) hoz_echo(409, cval); return 409; } @@ -14,3 +14,42 @@ } j = 0; +Index: hoz-1.65/hoz.c +=================================================================== +--- hoz-1.65.orig/hoz.c ++++ hoz-1.65/hoz.c +@@ -758,33 +758,5 @@ int atolp(const char *s) + + int atolmp(const char *s, const int mult) + { +- size_t n = 0, p = 0, d = 1; +- char *c = (char*)s; +- while (*c) { +- if (*c == '.') { +- if (p) { +- return 0; /* more than one '.' in the string? error */ +- } +- p = 1; +- *c++; +- } else if (*c >= '0' && *c <= '9') { +- if (p) { +- d *= 10; /* final decimal division */ +- } +- n *= 10; +- n += (*c++ - '0'); +- } else { +- return 0; +- } +- } +- if (d) { +- n /= d; +- } +- n *= (size_t)mult; +- if (n < 0) { +- printf("DA FOC!\n"); +- /* number is too big for size_t, error */ +- return 0; +- } +- return n; ++ return (size_t)(atof(s)*mult); + } diff -Nru hoz-1.65/debian/patches/printf.patch hoz-1.65/debian/patches/printf.patch --- hoz-1.65/debian/patches/printf.patch 1970-01-01 00:00:00.000000000 +0000 +++ hoz-1.65/debian/patches/printf.patch 2018-10-17 09:47:43.000000000 +0000 @@ -0,0 +1,13 @@ +Index: hoz-1.65/hozcli.c +=================================================================== +--- hoz-1.65.orig/hozcli.c ++++ hoz-1.65/hozcli.c +@@ -12,7 +12,7 @@ extern int showprogress, forceow, simula + + void hoz_print(const char *str) + { +- printf(str); ++ printf("%s", str); + } + + void hoz_lf() diff -Nru hoz-1.65/debian/patches/series hoz-1.65/debian/patches/series --- hoz-1.65/debian/patches/series 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/patches/series 2018-10-17 09:47:43.000000000 +0000 @@ -1,4 +1,5 @@ -makefile.patch gettext.patch removepath.patch partsize.patch +printf.patch +makefile.patch diff -Nru hoz-1.65/debian/rules hoz-1.65/debian/rules --- hoz-1.65/debian/rules 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/rules 2018-10-17 09:47:43.000000000 +0000 @@ -4,13 +4,11 @@ #export DH_VERBOSE=1 -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined configure: configure-stamp configure-stamp: @@ -18,12 +16,14 @@ $(MAKE) -f /usr/share/quilt/quilt.make patch touch $@ -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: configure-stamp dh_testdir - $(MAKE) - cd debian/msg && $(MAKE) - cd debian/h2m && chmod +x hoz && help2man ./hoz --include=hoz.h2m --no-info > hoz.1 + $(MAKE) CFLAGS="$(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS) $(LDFLAGS2)" + cd debian/msg && $(MAKE) CFLAGS="$(CFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS) $(LDFLAGS2)" + cd debian/h2m && chmod +x hoz && help2man ./hoz --no-discard-stderr --include=hoz.h2m --no-info > hoz.1 touch $@ clean: @@ -39,7 +39,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs cd debian/msg && $(MAKE) install LOCALEDIR=$(CURDIR)/debian/hoz/usr/share/locale/ dh_installdirs -phoz-gui usr/share/pixmaps @@ -72,4 +72,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure diff -Nru hoz-1.65/debian/source/format hoz-1.65/debian/source/format --- hoz-1.65/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ hoz-1.65/debian/source/format 2018-10-17 09:47:43.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru hoz-1.65/debian/watch hoz-1.65/debian/watch --- hoz-1.65/debian/watch 2018-11-09 15:19:18.000000000 +0000 +++ hoz-1.65/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# Watch control file for uscan -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Examine a Webpage: -http://hoz.sourceforge.net/ hoz-(.*)\.tar\.gz - -# Find new files on sourceforge, for debscripts >= 2.9 -# http://sf.net/hoz/hoz-(.*)\.tar\.gz