--- gworldclock-1.4.4.orig/debian/changelog +++ gworldclock-1.4.4/debian/changelog @@ -0,0 +1,365 @@ +gworldclock (1.4.4-10) unstable; urgency=medium + + * Standards-Version: 3.9.8 + - Remove deprecated Debian menu entry in favour of FreeDesktop + specification. + * Enable separate arch and arch-indep build targets. + Thanks Santiago Vila for the patch. Closes: #821990. + * Update autotools config files at build time. + Thanks Logan Rosen for the patch. Closes: #735396. + * debian/compat = 9 + - apply hardening flags during build + + -- Drew Parsons Thu, 28 Jul 2016 00:45:49 +0800 + +gworldclock (1.4.4-9) unstable; urgency=low + + * When the timer is counting to the minute, make sure it is + synchronised to 00 secs. Closes: #490203. + + -- Drew Parsons Sat, 04 Sep 2010 09:45:05 +1000 + +gworldclock (1.4.4-8) unstable; urgency=low + + * Use %ms rather than %as in scanf to get dynamic allocation of + input strings. See man scanf. + * autoreconf to update autoconf files + * German translation. Thanks Chris Leick! Closes: #576916. + * Put more detail into description for "rendezvous". Closes: #565870. + * lintian fixes: + - remove dh_desktop (deprecated) from debian/rules + - tzwatch Depends: ${misc:Depends} (for debhelper support) + * Standards-Version: 3.9.1 + * Add Universal zones to Add Zone tabs. Closes: #312241. + * Toggle box for rendezvous: toggle off if no zone was selected, + don't unsync was rendezvous is not running (or else new timer will + be set, preventing rendezvous from freezing the clock). Closes: #565869. + + -- Drew Parsons Wed, 01 Sep 2010 00:18:46 +1000 + +gworldclock (1.4.4-7) unstable; urgency=low + + * Use name "World Clock (gworldclock)" in desktop file, cowardly + capitulating to the Gnome Dummification Project. Closes: #465441. + * Update menu section to Applications/Amateur Radio. + * New standards version 3.7.3. + * Call dh_desktop in debian/rules (though it doesn't do anything yet). + + -- Drew Parsons Sun, 06 Apr 2008 22:18:27 +1000 + +gworldclock (1.4.4-6) unstable; urgency=low + + * Use gworldclock.png as icon in the Debian menu. Funny, the menu + docs say they only accept xpm, but png seems to work fine. I can't + find any window manager which uses icons in the menu that won't + display it. If you know something I don't know then tell me, + otherwise I'll just keep the one icon file for simplicity. + Closes: #397429. + + -- Drew Parsons Fri, 24 Nov 2006 01:27:31 +1100 + +gworldclock (1.4.4-5) unstable; urgency=low + + * Oh, and apply ubuntu's 01icon.dpatch to get the icon registered + inside gworldclock. + + -- Drew Parsons Sat, 14 Oct 2006 23:20:45 +1000 + +gworldclock (1.4.4-4) unstable; urgency=low + + * Use quote marks (and 'x') around $zone when testing if Local in + tzwatch. Closes: #388364. + * Accept ubuntu's .desktop menu file and uuencoded .png icon (flagged as + a patch at http://packages.qa.debian.org/g/gworldclock.html). You'd + think they'd have sent an email letting me know they'd made them, + if they'd bothered to go to all the trouble of creating them. *sigh* + * Use dh_install for both tzwatch and gworldclock. + * #include in zones.c, to get strlen() properly defined. + + -- Drew Parsons Sat, 14 Oct 2006 23:14:28 +1000 + +gworldclock (1.4.4-3) unstable; urgency=low + + * Include Swedish translation. Thanks Daniel Nylander. Closes: #345181 + * Standards version 3.7.2. + * Use debhelper 5. + * Run gettextize, update autoconf files and po directory (add + LINGUAS file to po, including en@quot en@boldquot in it) + Updated po/POTFILES.in. Closes: #317778. + + -- Drew Parsons Thu, 17 Aug 2006 17:45:58 +1000 + +gworldclock (1.4.4-2) unstable; urgency=low + + * Improved I18N of action menus and updated Japanese translation. + Thanks Junichi Uekawa. Closes: #317784, #317790. + * New standards version 3.6.2. + + -- Drew Parsons Sun, 17 Jul 2005 02:02:54 +1000 + +gworldclock (1.4.4-1) unstable; urgency=medium + + * New upstream version. + - modernised design of AddZone dialog. Closes: #193952. + - removed use of deprecated GTK functions and objects. + + -- Drew Parsons Mon, 28 Mar 2005 13:50:18 +1000 + +gworldclock (1.4.3-1) unstable; urgency=medium + + * New upstream version: + - Only beat on the second when required according to the date format, + otherwise beat once a minute. Closes: #271080, #299862. + + -- Drew Parsons Sat, 19 Mar 2005 02:15:01 +1100 + +gworldclock (1.4.2-1) unstable; urgency=medium + + * New upstream version. Adds #includes to options.c and timer.c missed in + 1.4.1 (see bug #288348). + + -- Drew Parsons Thu, 24 Feb 2005 23:55:57 +1100 + +gworldclock (1.4.1-1) unstable; urgency=medium + + * New upstream version: + - #include in rendezvous.c to use getenv() correctly. + Closes: #288348. + - Let Done button trigger Rendezvous toggle, to keep Rendezvous state + properly consistent. Closes: #293258. + + -- Drew Parsons Thu, 24 Feb 2005 21:45:50 +1100 + +gworldclock (1.4.0-1) unstable; urgency=low + + * New upstream release: the first in the 1.4 series, modernising the GTK + API used (no more deprecated functions). + * Allows the user to define an alternate label for the "Done" button in + Rendezvous. This is done through ~/.gworldclock, adding a + node inside , e.g. + + Return to normal clock operation + + Also, the zone being rendezvoused against can be selected with a single + left click on another zone. Note the toggle mark in the main menu for + turning Rendezvous on and off. Closes: #213368. + + -- Drew Parsons Mon, 3 Jan 2005 14:27:54 +1100 + +gworldclock (1.3-5) unstable; urgency=medium + + * In tzwatch, awk /^+/ is a GNU-only (gawk) means of checking for a + leading '+'. The posix-compliant method requires the '+' to be escaped: + awk /^\\+/ (for some reason the escape needs to be escaped too). + Syd Bauman's perl version: + DATEFORMAT=$( echo $DATEFORMAT | perl -pe"s/^['\"]//; s/['\"]$//; s/^\+?/+/;" ) + or + DATEFORMAT=$( echo $DATEFORMAT | perl -pe"s/^['\"]?\+?(.*?)['\"]?$/+\1/;" ) + might arguably be a little simpler, but I prefer not to use perl so as + not to force people with smaller systems to have to install it. + Closes: #286730. + + -- Drew Parsons Wed, 22 Dec 2004 15:29:17 +1100 + +gworldclock (1.3-4) unstable; urgency=low + + * Fixed the fix. The date format is not used if it is not there. Chris's + solution would have been simpler, but I didn't want to make my own + assumptions about the "default" format. Closes: #283813. (actually, + it's already closed). + * Use $(...) rather than `...` for checking the date format - seems more + robust for handling quotes-within-quotes (mostly anyway: "'+%I %a'" + remains invalid while "+'%I %a'" is OK. Anyway, if it's valid for date, + it should now be valid for tzwatch). + + -- Drew Parsons Mon, 6 Dec 2004 21:43:17 +1100 + +gworldclock (1.3-3) unstable; urgency=low + + * Placed double quotes around $DATEFORMAT when creating time string in + tzwatch, allows spaces to be used in the format string. Closes: #283813. + * While we're at it, ensure DATEFORMAT has a leading '+'. Hence the + format string for "tzwatch -f" should be robust, working with or without + the '+', with or without surrounding quote marks. (Of course, quote + marks are necessary if you want to include a space character!) + + -- Drew Parsons Fri, 3 Dec 2004 18:28:59 +1100 + +gworldclock (1.3-2) unstable; urgency=low + + * Build-depends: libxml2-dev. Closes: #224865. + + -- Drew Parsons Tue, 23 Dec 2003 15:31:20 +1100 + +gworldclock (1.3-1) unstable; urgency=low + + * New upstream version. + - Allows the format of the time & date display to be set and saved + in an XML preference file (~/.gworldclock). Closes: #189126. + + -- Drew Parsons Fri, 5 Dec 2003 10:31:20 +1100 + +gworldclock (1.2-2) unstable; urgency=low + + * Comment out xml references in options.c (Work In Progress...). + + -- Drew Parsons Mon, 29 Sep 2003 09:00:33 +1000 + +gworldclock (1.2-1) unstable; urgency=low + + * New upstream version. + - Includes Junichi Uekawa's I18N patch. Closes: #202928. + - Relabels the "synchronisation" function as "rendezvous". + Thanks Jeff Waugh for the inspiration! + * Standards version 3.6.1. + + -- Drew Parsons Mon, 29 Sep 2003 00:36:23 +1000 + +gworldclock (1.1-1) unstable; urgency=low + + * New upstream version. + * Reorganises code, making maintenance and development easier. + * Added ${misc:Depends} to debian/control. + * Standards version 3.5.9. + + -- Drew Parsons Sat, 5 Apr 2003 23:46:35 +1000 + +gworldclock (1.0.3-1) unstable; urgency=low + + * New upstream version. + * Fixes hanging dragged zone on right mouse click. + + -- Drew Parsons Sat, 28 Sep 2002 16:21:26 +1000 + +gworldclock (1.0.2-1) unstable; urgency=low + + * Fixes a bad memory leak. + + -- Drew Parsons Wed, 25 Sep 2002 23:30:59 +1000 + +gworldclock (1.0.1-1) unstable; urgency=low + + * New upstream version, fixes reference to version and release data in + "About" message. + + -- Drew Parsons Sat, 21 Sep 2002 18:02:15 +1000 + +gworldclock (1.0-1) unstable; urgency=low + + * New upstream version: port to GTK+ 2.0. + * GTK+ 2.0 rules! Full international support via Pango! + (Zone descriptions can now be written in any language). + * Standards version 3.5.7. + + -- Drew Parsons Sat, 21 Sep 2002 10:10:59 +1000 + +gworldclock (0.3.3-1) unstable; urgency=low + + * New upstream version. + * Changes "timezone" to the correct English phrase "time zone". + Closes: #124714, #125444. + + -- Drew Parsons Sun, 20 Jan 2002 18:31:49 +1100 + +gworldclock (0.3.2-1) unstable; urgency=low + + * New upstream version. Closes: #111848. + + -- Drew Parsons Sat, 29 Sep 2001 20:01:25 +1000 + +gworldclock (0.3.1-2) unstable; urgency=low + + * Let gworldclock suggest tzwatch. + + -- Drew Parsons Sun, 9 Sep 2001 15:44:43 +1000 + +gworldclock (0.3.1-1) unstable; urgency=low + + * New upstream version, fixes lintian complaint about + config.status in source package. + * Created tzwatch package for tzwatch shell script. + * New standards version 3.5.6.0. + + -- Drew Parsons Sat, 25 Aug 2001 13:25:45 +1000 + +gworldclock (0.3.0-1) unstable; urgency=low + + * New upstream version. + * Adds man page for gworldclock and for tzwatch (the man page + that Joop Stakenborg put in twclock). + * Use dh_installman to install gworldclock's man page. + + -- Drew Parsons Thu, 19 Jul 2001 11:42:48 +1000 + +gworldclock (0.2.1-1) unstable; urgency=low + * New upstream version. + * Replaces autoconf's symlinks to install-sh, missing and + mkinstalldirs with the actual files they were linked to. + They shouldn't have caused a problem if you compile with + ./configure, but oh well. Closes: #105188. + * Standards version 3.5.5.0. + + -- Drew Parsons Sun, 15 Jul 2001 00:43:00 +1000 + +gworldclock (0.2.0-1) unstable; urgency=low + + * New upstream version. + * Implements time-synchronisation, yay! + * Standards version 3.5.4.0. + + -- Drew Parsons Sat, 9 Jun 2001 19:04:10 +1000 + +gworldclock (0.1.0-4) unstable; urgency=low + + * Eeek, haven't I got time-synchronisation done yet? + * Recompile against lastest libraries (in particular, X 4) + * "New" maintainer. + Thank you Joop for the help and sponsoring! We'll have to work out + what to do with tzwatch now :) + * Suggests twclock, in order to get tzwatch (see above point). + * Added menu entry, to Hamradio, where twclock is. + * INSTALL removed from docs file. + + -- Drew Parsons Fri, 16 Feb 2001 23:30:56 +1100 + +gworldclock (0.1.0-3) unstable; urgency=low + + * Should list Drew Parsons as maintainer in the control file. + + -- Joop Stakenborg Sun, 1 Oct 2000 18:08:08 +0200 + +gworldclock (0.1.0-2) unstable; urgency=low + + * I am sponsoring this package on behalf of Drew Parsons. + + -- Joop Stakenborg Mon, 10 Jul 2000 16:39:01 +0200 + +gworldclock (0.1.0-1) unstable; urgency=low + + * New "upstream" version. + * Zone list is now reorderable. + * Some #include's added, and string functions better used. + + -- Drew Parsons Wed, 28 Jun 2000 14:07:54 -0700 + +gworldclock (0.0.1-1) unstable; urgency=low + + * New "upstream" version. + + -- Drew Parsons Sat, 20 May 2000 00:37:09 -0700 + +gworldclock (0.0.0-2) unstable; urgency=low + + * Test dch + + -- Drew Parsons Sat, 20 May 2000 00:29:09 -0700 + +gworldclock (0.0.0-1) unstable; urgency=low + + * Initial Release. + + -- Drew Parsons Sat, 20 May 2000 00:27:39 -0700 + +Local variables: +mode: debian-changelog +End: --- gworldclock-1.4.4.orig/debian/compat +++ gworldclock-1.4.4/debian/compat @@ -0,0 +1 @@ +9 --- gworldclock-1.4.4.orig/debian/control +++ gworldclock-1.4.4/debian/control @@ -0,0 +1,31 @@ +Source: gworldclock +Section: utils +Priority: optional +Maintainer: Drew Parsons +Build-Depends: debhelper (>> 9), libgtk2.0-dev, gettext, libxml2-dev, sharutils, autotools-dev +Standards-Version: 3.9.8 + +Package: gworldclock +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: tzwatch +Description: Displays time and date in specified time zones + This program displays the time and date of specified time zones using a + GTK+ interface. It also provides a "rendezvous" function allowing the zones + to be synchronised to a time other than the current time. This can help you + organise meetings across different timezones. + . + The time zones may be entered by hand in TZ format or chosen from a list + prepared from /usr/share/zoneinfo/zone.tab. The zone list is kept in a format + consistent with the shell script tzwatch. + +Package: tzwatch +Architecture: all +Depends: ${misc:Depends} +Suggests: gworldclock, twclock +Conflicts: twclock (<= 1.3-15) +Description: Displays time and date in specified time zones on console + This shell script displays the time and date of time zones specified by the + user. The time zones may be entered by hand in TZ format or chosen from a + list prepared from /usr/share/zoneinfo/zone.tab. The zone list is kept in a + format consistent with the GTK+ application gworldclock. --- gworldclock-1.4.4.orig/debian/copyright +++ gworldclock-1.4.4/debian/copyright @@ -0,0 +1,9 @@ +This package was debianized by the author, Drew Parsons . +Source may be found on the Debian page: +http://www.debian.org/packages/unstable/gworldclock + +Upstream Author: Drew Parsons + +Copyright: © 2003 Drew Parsons +Licenced under GPLv2 (see /usr/share/common-licenses/GPL-2) + --- gworldclock-1.4.4.orig/debian/docs +++ gworldclock-1.4.4/debian/docs @@ -0,0 +1,2 @@ +todo +README --- gworldclock-1.4.4.orig/debian/gworldclock.desktop +++ gworldclock-1.4.4/debian/gworldclock.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Comment=See the time in other timezones +Name=gworldclock +GenericName=World Clock +Encoding=UTF-8 +Comment[fr]=Voir l'heure dans d'autres fuseaux horaires +Exec=gworldclock +Terminal=false +Type=Application +Icon=gworldclock +Categories=Utility;Clock;HamRadio --- gworldclock-1.4.4.orig/debian/gworldclock.dirs +++ gworldclock-1.4.4/debian/gworldclock.dirs @@ -0,0 +1,2 @@ +usr/share/pixmaps +usr/share/applications --- gworldclock-1.4.4.orig/debian/gworldclock.install +++ gworldclock-1.4.4/debian/gworldclock.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin/gworldclock +debian/tmp/usr/share/locale +debian/gworldclock.desktop usr/share/applications +debian/gworldclock.png usr/share/pixmaps --- gworldclock-1.4.4.orig/debian/gworldclock.png.uuencode +++ gworldclock-1.4.4/debian/gworldclock.png.uuencode @@ -0,0 +1,80 @@ +begin 644 debian/gworldclock.png +MB5!.1PT*&@H````-24A$4@```"0````D"`8```#A`)B8````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```N)```+B0$WR]J]N]>&]B9G#`&(\QX)&#[(@` +M2F*$1T219A[RD"B1)E'>\IX\11$:19HG-&@$:/(PF00$`\0Q-H.-VS;>VFWW +M8G>W>W&[EZJNJKN=<_)PR\9)Q#"W=%4Z=6_=^_^^____?><^ZY^JQ;49 +MSW)K&!+7=>D9&OZM[Q/?=&%M88&IV2GA.(Z_.+_8XCC>(63Z@]F%A8/CXS<* +M"_.WV%A>0,=YYIN`B6\",WWGCK.\LM!:J58.A97J#V_?OGW@QOB%W#/[G^+(T=+_#&;=L.A[?M-H^^W_J_8"9N3>8F)V\]O;1T]\=+2_,G=@X7V_[\S]Y@ +M:.L>A-^*,@*E(G12@[C$)Q__DK__N[^BOZO`ML%^!!%:)>A$@?3IZAWBL3U[ +MV%B_QY7+8XU*)4_8CMOKNNZ"9=O+?_/7?YG^\[^\^1"#_2A-8Y?.>Y,STT^M +MKBS];5O!>_'PJR^Q:_3W$'8C*18JB2`-$:H,2@&"-%9$L6)AN42:1%B6`EW" +M&(.1#>`T(]TF#K[P1XP,;^7<%Z=RDQ-?O:K5[EQ'=^\_YO,-GT_=O!8^H.\A +MH(_^^[^LQ?FY[>72ZE_T]K8>^8/G#M)5W(Z6+@J#,`E190W+N'(D +M5:;VI(_>N2Y0[*KN!TE`U(#VBBD +M44AL;#M`N@6DY2&$9'ADD%Q.LJ78"6B$,&#Y&*L%;3>"=)$J1*HR6J>T=@^S +M=]_S)'%57K_^U=&EI877:]5:Q[4+8^(AH+&+E]SU]=47RN7U$P>?V9?O[ATD +M%2Y&*RRML#`(RZ:QI8,@ET.:!'2*,!K0:%W7I=%H58,TQ)$IA:8F0"R/_XMU^(^RNK7:5RZ8W#SSY= +MW+%C!ZD,T!HP*98PV-)!2A>$`312V%C2P;)SX'I$L2"5'MAYI),#Z68`50UT +ME(WM`#"@JD@!0R.C//[88]R>FBBNKJZ\4:E6NL;.G1%R?.*FA>;YUJ;",W]X +MY/MH&:"1J"0BCD.,D`AA@0&,!.F`],!RT4("&J-!&`,(C+#`]L#)UX&EH./, +M`*E!Q550%6PWX(FG#N$Z,#-]ZYFP5GM>):DE5];NYZZ/7S_^TI%G"ZZ70^.# +M4<11E6JU@@:,48`&(4!($'6J4)!F/UO&@%'9O4:#L#*JA`TF!142AB%Q%(.N +M@([)-W?P^'?W,G'C4J%6J1S7J<[)CJZ.H4JX>>#QT>TDV*`-I#&.X^#[?F9? +M3)TNP"C0&FUT?2S1`G0F1VPC,T!&9<"%G2$V!L]S<#P[NY96$,(P,K*;*"RQ +M=._>@2C10[)4WCSPQR\=;9261:(!%8)1V+;$=1TP8(Q`Z\QM6F@'_['JVJH#-"+3%!)A +M4FR1TM+2PM+2`FD4CMIK]Y?Z'=^CM%%C^O84U3"AV#M`1V<;4CI9^S74TZ^S +M@4[!&#[Z]8=HT=?Y.:MZWP@-(T)T]]RE?7KI`:D]4B#74!@3)9 +M@=<*=,I[[_Z;[X\CR5:@6$H!:&&!4VV2\^V9RE-54/$V`T:"5(!%@8I-39/.6A$`P:@R'% +M8'CWW?>(PYC^@4&6EI=I;&XA)R7:B`R6^5K@//Q2F#J=:`,&;%W&WKNML&%4 +MVNX[@J>?WD`,`\`Q:!#%")KR":B5DV87UAB;FZ>O:,C'UNOO72@QR2E8QV#SQ`G,=(H +MA)`HHU$JP1(R[Q,$#73W]-+6T<[$K2DN7KI$8$-W5PN> +M[V6JB3;1*D9)!Z,U1D5L5A0?G3Q'>[/-EO[BO\I/'Z>ULX:./_IU3GWU& +M)8Q0:4A8*U.-TGI-2HDC*$6&+\Y?I-C361)V[K1$Q=-18DZOW#F'Y>11TB75 +M"BDEGA^@C<[FR%JA=5:AM4[1)D&;A%1EI]8)F!3?AKW?VH[FE^32V.VV7JU2EW?S.XOC[WVOL +M'"T@/;2.D"(&.R#!JHM2U:<>LLZ:`*,Q.GZD:&:1^UZ.Q_9\AWQ+,V'I'I;> +M1.MFA-N$I5-(-JE%BOLEQ=CYL^S942S[N89WC*0JK88!9;3YM%*Z?V;IYJ_! +M6"!R&*TP22WC&OGU.*EA3))%J54F?ISZ`D9FE5D(`@=&BBWL'.HAEVO`.`6, +ML$%72>*(C:K%YU^.$=A5^GH[SKBV_2E63LECK__86'Y^R5CYMY8G3\]M+%[. +M7"8;,KTDFUF&A$-YLT)46X>XE)WI)J@8=*VNM2K$)4RTAJHLD50V<8-6K%Q[ +M-H]*2R1Q0BERF9B<8?K&!48&.N<*CWY +M\0\KJ\NW0/I@Y3,P21E4+6-&!%ES50FD(<0;$-V#Z!XF6D6EFVB3DLJ`U&Y! +MVPU`#,D:251EH^8P>6>5JY>_9&MO0Z78W?FVYP:?8.7BAPO%MW[^G_SH]6,U +M(^RE*"SW5-87=TFG(-R&5K00")T@5(0C%;8T"%Q2Z:&PF9ZYRX7+UU!&T-C6 +MBY(!1N3!LK"D0J@R.JD218IRS6%F=IE+%[X@YU3UR);^7[:T=K[I>`TSAU_^ +MD?Y?Z[*.'2^KU86Q";%^^R=1:;DP=_57+U8V]]/:OP?/;4#J&J3K6&D%(6RD +M<##2Y_*5"\S-S[&ZMD)QRQ!"U;!40FJJ2).@M,=F[+%9,TS*H$E*MTQ9L4LF5:`L:<&MW,"9%"1^E)94D1RUQ6"^% +MG/_R-RS>OL90L;G:7^S_(-_<]Z8(6LYB%Z+#1XY]\V;#V+DS(ER?]I/5&SM7 +MU^X?#\/-$W%BBD'['GJW[J50:,25`DNFN-*F5"Y1#:O8CD5COH$XC:E%AB11 +ME"LA5Z]=8FK\/,UY05='UUQG=]_;S4U-[UA>YWAD-X3'CAXSW[H=,W;N#,GZ +MI'-_>:X5R:&XO/C#I+)P8'YQ+1=Y`PP,[Z6[IXB3:\JL7O^00B7:9/'N#.-? +M?/_>X;5F/GSK!RYY+P +M&EK]ZKTK+8[7>JA6J_U@8W7ZH!.O%BJ5,AMAS,9Z3"FL`>![`:T%%\O+8P== +MY)M[ROF&CE..'_S,)SJIW.XUBUKH%=K-HS3]3H`>'&=.?J,")IJ +B?KR2Q&X_QUXZ]EO?]S\P9`7D[!,"X@````!)14Y$KD)@@@`` +` +end --- gworldclock-1.4.4.orig/debian/rules +++ gworldclock-1.4.4/debian/rules @@ -0,0 +1,81 @@ +#!/usr/bin/make -f +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# set hardening flags +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + +build-arch: build +build-indep: build +build: build-stamp +build-stamp: + dh_testdir + dh_autotools-dev_updateconfig + + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + -rm po/*.gmo po/stamp-po + + # clean up after the build process. + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + dh_autotools-dev_restoreconfig + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs -pgworldclock + $(MAKE) install DESTDIR=`pwd`/debian/tmp/ + +# Build architecture-independent files here. +binary-indep: + dh_testdir + dh_testroot + dh_installdirs -ptzwatch + dh_install -ptzwatch + dh_installman -ptzwatch tzwatch.1 + dh_installdocs -ptzwatch README + dh_installchangelogs -ptzwatch ChangeLog + dh_compress -ptzwatch + dh_fixperms -ptzwatch + dh_installdeb -ptzwatch + dh_gencontrol -ptzwatch + dh_md5sums -ptzwatch + dh_builddeb -ptzwatch + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdirs -pgworldclock + uudecode debian/gworldclock.png.uuencode + dh_install -pgworldclock + rm debian/gworldclock.png + dh_installdocs -pgworldclock + dh_installman -pgworldclock gworldclock.1 + dh_installchangelogs -pgworldclock ChangeLog + dh_link -pgworldclock + dh_strip -pgworldclock + dh_compress -pgworldclock + dh_fixperms -pgworldclock + dh_installdeb -pgworldclock + dh_shlibdeps -pgworldclock + dh_gencontrol -pgworldclock + dh_md5sums -pgworldclock + dh_builddeb -pgworldclock + +binary: binary-indep binary-arch +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install --- gworldclock-1.4.4.orig/debian/tzwatch.dirs +++ gworldclock-1.4.4/debian/tzwatch.dirs @@ -0,0 +1 @@ +usr/bin --- gworldclock-1.4.4.orig/debian/tzwatch.install +++ gworldclock-1.4.4/debian/tzwatch.install @@ -0,0 +1 @@ +tzwatch usr/bin --- gworldclock-1.4.4.orig/main.c +++ gworldclock-1.4.4/main.c @@ -67,6 +67,7 @@ #include "options.h" #include "zones.h" #include "resize.h" +#include "timer.h" /* so many global variables....how naughty! collect them in a structure to be passed around? */ @@ -182,7 +183,7 @@ 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - msg->str); + "%s", msg->str); gtk_dialog_add_buttons( GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL, NULL); @@ -200,7 +201,7 @@ 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - msg->str); + "%s", msg->str); choice = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); --- gworldclock-1.4.4.orig/misc.c +++ gworldclock-1.4.4/misc.c @@ -1,5 +1,7 @@ /* various ancillary functions */ +#include + #include "misc.h" void DestroyWindow(GtkWidget *w, gpointer window) @@ -65,7 +67,7 @@ 0, messageType, GTK_BUTTONS_OK, - message); + "%s", message); g_signal_connect_swapped (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), --- gworldclock-1.4.4.orig/options.c +++ gworldclock-1.4.4/options.c @@ -33,8 +33,11 @@ #include #include #include +#include +#include #include "timer.h" +#include "resize.h" #define _(A) gettext(A) --- gworldclock-1.4.4.orig/rendezvous.c +++ gworldclock-1.4.4/rendezvous.c @@ -6,14 +6,19 @@ "rendezvous". */ +#define _GNU_SOURCE + #include #include #include +#include +#include #define _(A) gettext(A) #include "main.h" #include "rendezvous.h" #include "timer.h" +#include "misc.h" extern GtkBox *syncBox; /* id of second timer. --- gworldclock-1.4.4.orig/timer.c +++ gworldclock-1.4.4/timer.c @@ -7,6 +7,7 @@ #include "main.h" #include "timer.h" +#include "misc.h" /* display format for time&date */ GString *displayFormat; @@ -54,7 +55,7 @@ [finds the first '"', accounting for any spaces or tabs, then grabs everything up to the second '"'] */ - if ( sscanf(line,"%as %*[ \t\"]%[^\"]",&timezone,description) < 2 ) + if ( sscanf(line,"%ms %*[ \t\"]%[^\"]",&timezone,description) < 2 ) strncpy(description,timezone,200); gtk_list_store_append ( GTK_LIST_STORE(clocklistModel), &iter); --- gworldclock-1.4.4.orig/zones.c +++ gworldclock-1.4.4/zones.c @@ -4,10 +4,13 @@ #include #include #include +#include #include "gworldclock.h" #include "zones.h" #include "misc.h" +#include "resize.h" +#include "timer.h" #define _(A) gettext(A) @@ -195,8 +198,8 @@ Also read country code at beginning of zone table entry. Strictly this is only 2 characters, but I will allow for a whole string (in my opinion 3 character would be more meaningful. The standard sux */ - sscanf(line,"%as %*s %as",&codez,&name); - if(strstr(name,continent)) { + sscanf(line,"%ms %*s %ms",&codez,&name); + if(name && strstr(name,continent)) { if(!CodeInList(codez,Countries)) { g_free(name); rewind(fpc); @@ -204,7 +207,7 @@ if (line[0] != '#') { /* first, identify country */ - if(sscanf(line,"%as",&codec)==1) { + if(sscanf(line,"%ms",&codec)==1) { if (!strcmp(codez,codec)) { /* then extract name as entire string to \0 after tab */ @@ -267,7 +270,7 @@ Get name of region from third item on the line. */ /* alternatively we may want to get the description from the optional fourth item, where available. Worry about that some other time */ - sscanf(line,"%as %*s %as",&code,&TZvalue); + sscanf(line,"%ms %*s %ms",&code,&TZvalue); if(!strcmp(code,country)) { /* region name is in format: continent/region Extract the region part from the continent */