tags -1 -moreinfo quit Sorry, forgot to attach it in previous email. Should be attached now.
-- أحمد المحمودي (Ahmed El-Mahmoudy) Digital design engineer GPG KeyID: 0xEDDDA1B7 GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7
diff -Nru itools-1.0/debian/changelog itools-1.0/debian/changelog --- itools-1.0/debian/changelog 2011-09-15 17:12:44.000000000 +0200 +++ itools-1.0/debian/changelog 2014-10-31 05:36:07.000000000 +0200 @@ -1,3 +1,25 @@ +itools (1.0-4) unstable; urgency=medium + + * debian/control: + + Use canonical URIs in Vcs-* fields + + Remove obsolete DMUA field + + Bumped Standards-Version to 3.9.6 + * Bumped compat level to 9 + * Update my email address. + * debian/copyright: + + Update copyright format & years. + + Moved section for debian/* to be after the all files section + * 01_manpages.diff: Use DEP-5 headers + * Added str_format_security.diff patch to add format argument for an sprintf + call that prints a variable string. + * Added use_CPPFLAGS.diff patch to use CPPFLAGS during compilation. + This is needed to get fortify libc functions to be used. + * Added ipraytime-unicode.patch patch to fix unicode support for printing + the degree (0xB0) character. + Thanks to Adam Borowski <kilob...@angband.pl> (Closes: #755269) + + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@users.sourceforge.net> Thu, 30 Oct 2014 21:46:06 +0200 + itools (1.0-3) unstable; urgency=low [ أحمد المحمودي (Ahmed El-Mahmoudy) ] diff -Nru itools-1.0/debian/compat itools-1.0/debian/compat --- itools-1.0/debian/compat 2011-09-15 17:06:21.000000000 +0200 +++ itools-1.0/debian/compat 2014-10-31 05:36:07.000000000 +0200 @@ -1 +1 @@ -8 +9 diff -Nru itools-1.0/debian/control itools-1.0/debian/control --- itools-1.0/debian/control 2011-09-15 17:11:16.000000000 +0200 +++ itools-1.0/debian/control 2014-10-31 05:36:07.000000000 +0200 @@ -2,13 +2,12 @@ Section: misc Priority: optional Maintainer: Debian Islamic Maintainers <debian-islamic-maintain...@lists.alioth.debian.org> -Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@sabily.org> -DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 8), libitl-dev -Standards-Version: 3.9.2 +Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@users.sourceforge.net> +Build-Depends: debhelper (>= 9), libitl-dev +Standards-Version: 3.9.6 Homepage: http://www.arabeyes.org/project.php?proj=ITL -Vcs-Git: git://git.debian.org/git/debian-islamic/packages/itools.git -Vcs-Browser: http://git.debian.org/?p=debian-islamic/packages/itools.git +Vcs-Git: git://anonscm.debian.org/debian-islamic/packages/itools.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-islamic/packages/itools.git Package: itools Architecture: any diff -Nru itools-1.0/debian/copyright itools-1.0/debian/copyright --- itools-1.0/debian/copyright 2011-09-15 17:06:21.000000000 +0200 +++ itools-1.0/debian/copyright 2014-10-31 05:36:07.000000000 +0200 @@ -1,18 +1,18 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: itools Upstream-Contact: Arabeyes <develo...@arabeyes.org> Source: http://www.arabeyes.org/project.php?proj=ITL -Files: debian/* -Copyright: Copyright 2004-2009, Thamer Mahmoud <tha...@newkuwait.org> -Copyright: Copyright 2009-2011, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@sabily.org> -License: GPL-2+ - Files: * Copyright: Copyright 2003-2009, Arabeyes, Nadim Shaikli, Thamer Mahmoud License: GPL-2+ +Files: debian/* +Copyright: 2004-2009, Thamer Mahmoud <tha...@newkuwait.org> + 2009-2011,2014 أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@users.sourceforge.net> +License: GPL-2+ + License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru itools-1.0/debian/patches/01_manpages.diff itools-1.0/debian/patches/01_manpages.diff --- itools-1.0/debian/patches/01_manpages.diff 2011-09-15 17:06:21.000000000 +0200 +++ itools-1.0/debian/patches/01_manpages.diff 2014-10-31 05:36:07.000000000 +0200 @@ -1,4 +1,4 @@ -Fixes hyphenation issues in ipraytime.1 +Description: Fixes hyphenation issues in ipraytime.1 Index: itools-1.0/doc/ipraytime.1 =================================================================== --- itools-1.0.orig/doc/ipraytime.1 2009-03-19 18:39:16.000000000 +0200 diff -Nru itools-1.0/debian/patches/ipraytime-unicode.patch itools-1.0/debian/patches/ipraytime-unicode.patch --- itools-1.0/debian/patches/ipraytime-unicode.patch 1970-01-01 02:00:00.000000000 +0200 +++ itools-1.0/debian/patches/ipraytime-unicode.patch 2014-10-31 05:36:07.000000000 +0200 @@ -0,0 +1,55 @@ +Description: Fix unicode support for printing the degree (0xB0) character +Author: Adam Borowski <kilob...@angband.pl> +Bug-Debian: https://bugs.debian.org/755269 +diff -Nurd itools-1.0.orig/ipraytime.c itools-1.0/ipraytime.c +--- itools-1.0.orig/ipraytime.c 2009-07-06 22:41:13.000000000 +0200 ++++ itools-1.0/ipraytime.c 2014-10-30 16:58:13.301433287 +0100 +@@ -30,6 +30,7 @@ + #include <string.h> /* for strlen/strcat/etc */ + #include <unistd.h> /* for getuid */ + #include <pwd.h> /* for getpwuid */ ++#include <locale.h> /* for setlocale */ + + /* For time_t */ + #ifdef TM_IN_SYS_TIME +@@ -460,7 +461,7 @@ + + int deg, min; + double sec; +- const char symb = (char)0xB0; ++ const wchar_t symb = 0xB0; + + printf("\n"); + printf("Prayer schedule for,\n"); +@@ -470,11 +471,11 @@ + printf(" City : %s\n", city_name); + + decimal2Dms(loc->degreeLat, °, &min, &sec); +- printf(" Latitude : %03d%c %02d\' %02d\" %c\n", abs(deg), symb, ++ printf(" Latitude : %03d%lc %02d\' %02d\" %c\n", abs(deg), symb, + abs(min), abs(sec), (loc->degreeLat >=0 ? 'N' : 'S')); + + decimal2Dms(loc->degreeLong, °, &min, &sec); +- printf(" Longitude : %03d%c %02d\' %02d\" %c\n", abs(deg), symb, ++ printf(" Longitude : %03d%lc %02d\' %02d\" %c\n", abs(deg), symb, + abs(min), abs(sec), (loc->degreeLong >=0 ? 'E' : 'W')); + + printf(" Angle Method : %s\n", method_name); +@@ -485,7 +486,7 @@ + /* Deal with Qibla Information */ + qibla = getNorthQibla(loc); + decimal2Dms (qibla, °, &min, &sec); +- printf(" Qibla : %03d%c %02d\' %02d\" %c of true North\n", ++ printf(" Qibla : %03d%lc %02d\' %02d\" %c of true North\n", + abs (deg), symb, abs (min), abs (sec), (qibla >=0 ? 'W' : 'E')); + + printf("\n"); +@@ -645,6 +646,8 @@ + Date dst_end; + sPref user_input; + ++ setlocale(LC_CTYPE, ""); ++ + /* Read-in the init RC file */ + do_init_file(&user_input, &loc, &date); + diff -Nru itools-1.0/debian/patches/series itools-1.0/debian/patches/series --- itools-1.0/debian/patches/series 2011-09-15 17:06:21.000000000 +0200 +++ itools-1.0/debian/patches/series 2014-10-31 05:36:07.000000000 +0200 @@ -1,2 +1,4 @@ 01_manpages.diff fix_link_libs_placement.diff +str_format_security.diff +use_CPPFLAGS.diff diff -Nru itools-1.0/debian/patches/str_format_security.diff itools-1.0/debian/patches/str_format_security.diff --- itools-1.0/debian/patches/str_format_security.diff 1970-01-01 02:00:00.000000000 +0200 +++ itools-1.0/debian/patches/str_format_security.diff 2014-10-31 05:36:07.000000000 +0200 @@ -0,0 +1,13 @@ +Description: Added format argument for an sprintf call that prints a variable string +Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@users.sourceforge.net> +--- a/ipraytime.c ++++ b/ipraytime.c +@@ -908,7 +908,7 @@ + /* Fill the city name */ + if (user_input.city && !user_cmdline) + { +- sprintf(city_name, user_input.city); ++ sprintf(city_name, "%s", user_input.city); + free(user_input.city); + } + else diff -Nru itools-1.0/debian/patches/use_CPPFLAGS.diff itools-1.0/debian/patches/use_CPPFLAGS.diff --- itools-1.0/debian/patches/use_CPPFLAGS.diff 1970-01-01 02:00:00.000000000 +0200 +++ itools-1.0/debian/patches/use_CPPFLAGS.diff 2014-10-31 05:36:07.000000000 +0200 @@ -0,0 +1,43 @@ +Description: Use CPPFLAGS during compilation + This is needed to get fortify libc functions to be used. +Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@users.sourceforge.net> + +--- a/Makefile.in ++++ b/Makefile.in +@@ -16,27 +16,27 @@ + + ical: ical.c + @echo "==> Building ical..." +- $(CC) $(CFLAGS) $(LDFLAGS) ical.c $(LIBS) -o ical ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ical.c $(LIBS) -o ical + + idate: idate.c + @echo "==> Building idate..." +- $(CC) $(CFLAGS) $(LDFLAGS) idate.c $(LIBS) -o idate ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) idate.c $(LIBS) -o idate + + ipraytime: ipraytime.c + @echo "==> Building ipraytime..." +- $(CC) $(CFLAGS) $(LDFLAGS) ipraytime.c $(LIBS) -o ipraytime ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ipraytime.c $(LIBS) -o ipraytime + + static: ical.c idate.c ipraytime.c +- $(CC) $(CFLAGS) $(LDFLAGS) ipraytime.c -o ipraytime -static $(LIBS) +- $(CC) $(CFLAGS) $(LDFLAGS) idate.c -o idate -static $(LIBS) +- $(CC) $(CFLAGS) $(LDFLAGS) ical.c -o ical -static $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ipraytime.c -o ipraytime -static $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) idate.c -o idate -static $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ical.c -o ical -static $(LIBS) + + static-tree: ical.c idate.c ipraytime.c +- $(CC) $(CFLAGS) -g $(LDFLAGS) ipraytime.c -o ipraytime -I../../libs/build/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -g $(LDFLAGS) ipraytime.c -o ipraytime -I../../libs/build/ \ + -L../../libs/build/ ../../libs/build/libitl.a -lm +- $(CC) $(CFLAGS) -g $(LDFLAGS) idate.c -o idate -I../../libs/build/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -g $(LDFLAGS) idate.c -o idate -I../../libs/build/ \ + -L../../libs/build/ ../../libs/build/libitl.a -lm +- $(CC) $(CFLAGS) -g $(LDFLAGS) ical.c -o ical -I../../libs/build/ \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) -g $(LDFLAGS) ical.c -o ical -I../../libs/build/ \ + -L../../libs/build/ ../../libs/build/libitl.a -lm + + install: all
signature.asc
Description: Digital signature
