diff -Nru iso-flags-svg-1.0.1/debian/changelog iso-flags-svg-1.0.2/debian/changelog --- iso-flags-svg-1.0.1/debian/changelog 2016-12-06 22:24:08.000000000 +0000 +++ iso-flags-svg-1.0.2/debian/changelog 2018-05-10 09:23:41.000000000 +0000 @@ -1,3 +1,17 @@ +iso-flags-svg (1.0.2-1) unstable; urgency=medium + + * Use the salsa canonical urls + * Set new ml as Maintainer + * Set new ml as Copyright holder + * Bump debhelper build-dep and compat to 11. + * Bump Standards-Version to 4.1.3. + * New upstream release (1.0.2). + * Drop patches applied upstream + * Bump Standards-Version to 4.1.4. + * Release to unstable + + -- Maximiliano Curia Thu, 10 May 2018 11:23:41 +0200 + iso-flags-svg (1.0.1-1) unstable; urgency=medium * Initial Debian release. diff -Nru iso-flags-svg-1.0.1/debian/compat iso-flags-svg-1.0.2/debian/compat --- iso-flags-svg-1.0.1/debian/compat 2016-12-06 22:24:08.000000000 +0000 +++ iso-flags-svg-1.0.2/debian/compat 2018-05-10 09:23:41.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru iso-flags-svg-1.0.1/debian/control iso-flags-svg-1.0.2/debian/control --- iso-flags-svg-1.0.1/debian/control 2016-12-06 22:24:08.000000000 +0000 +++ iso-flags-svg-1.0.2/debian/control 2018-05-10 09:23:41.000000000 +0000 @@ -1,29 +1,20 @@ Source: iso-flags-svg Section: misc Priority: optional -Maintainer: Debian Cinnamon Team +Maintainer: Debian Cinnamon Team Uploaders: Maximiliano Curia , Margarita Manterola , Build-Depends: - debhelper (>= 9), + debhelper (>= 11~), imagemagick, libjson-perl, librsvg2-bin, libxml-libxml-perl, -Standards-Version: 3.9.8 +Standards-Version: 4.1.4 Homepage: https://github.com/joielechong/iso-country-flags-svg-collection -Vcs-Browser: https://anonscm.debian.org/git/pkg-cinnamon/iso-flags-svg.git -Vcs-Git: https://anonscm.debian.org/git/pkg-cinnamon/iso-flags-svg.git - -Package: iso-flags-svg -Architecture: all -Depends: ${misc:Depends} -Description: ISO country flags in SVG format - High quality vector graphics country flag icons. - . - It contains more than 240 country flag icons in a squared and in a 4x3 aspect - ratio. +Vcs-Browser: https://salsa.debian.org/cinnamon-team/iso-flags-svg +Vcs-Git: https://salsa.debian.org/cinnamon-team/iso-flags-svg.git Package: iso-flags-png-320x240 Architecture: all @@ -35,3 +26,12 @@ the iso-flags-svg package). . It contains more than 240 country flag icons. + +Package: iso-flags-svg +Architecture: all +Depends: ${misc:Depends} +Description: ISO country flags in SVG format + High quality vector graphics country flag icons. + . + It contains more than 240 country flag icons in a squared and in a 4x3 aspect + ratio. diff -Nru iso-flags-svg-1.0.1/debian/copyright iso-flags-svg-1.0.2/debian/copyright --- iso-flags-svg-1.0.1/debian/copyright 2016-12-06 22:24:08.000000000 +0000 +++ iso-flags-svg-1.0.2/debian/copyright 2018-05-10 09:23:41.000000000 +0000 @@ -27,7 +27,7 @@ Files: debian/* Copyright: 2016, Linux Mint - 2016, Debian Cinnamon Team + 2016, Debian Cinnamon Team 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 iso-flags-svg-1.0.1/debian/patches/Add-rsvg2png-build-command.patch iso-flags-svg-1.0.2/debian/patches/Add-rsvg2png-build-command.patch --- iso-flags-svg-1.0.1/debian/patches/Add-rsvg2png-build-command.patch 2016-12-06 22:24:08.000000000 +0000 +++ iso-flags-svg-1.0.2/debian/patches/Add-rsvg2png-build-command.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -From: Maximiliano Curia -Date: Sat, 19 Nov 2016 23:20:45 +0100 -Subject: Add rsvg2png build command - ---- - scripts/build.pl | 44 +++++++++++++++++++++++++++++++------------- - 1 file changed, 31 insertions(+), 13 deletions(-) - -diff --git a/scripts/build.pl b/scripts/build.pl -index e3dce07..468e78d 100755 ---- a/scripts/build.pl -+++ b/scripts/build.pl -@@ -52,6 +52,8 @@ my $imgSvg; # rel. image path to svg file - my $imgFore; my $imgFlag; my $imgBack; # images for template command - my $mask; # [D+D+DxD] mask spec for template command - -+my $zoom; # for rsvg2png -+ - # for --cmd example xplanet - my $json; my $lang; - -@@ -68,11 +70,12 @@ GetOptions( - "flag=s" => \$imgFlag, - "mask=s" => \$mask, - "back=s" => \$imgBack, -+ "zoom=f" => \$zoom, - "json=s" => \$json, - "lang=s" => \$lang, - ); - --my $cmds = "help|svg2png|svg2svg|example|db"; -+my $cmds = "help|svg2png|svg2svg|rsvg2png|example|db"; - my $stys = "none|flat|simple|fancy|glossy"; - - sub u { -@@ -615,10 +618,10 @@ if ($cmd eq "svg2svg") { - writeFile($out."/".$imgSvg, $doc->toString()); - } - --if ($cmd eq "svg2png") { -+if (($cmd eq "svg2png") || ($cmd eq "rsvg2png")) { - if (!$dirSvg){u("missing --svgs [dir], eg.: svg/country-squared.")} - if (!-d $dirSvg){u("--svgs \"".$dirSvg."\" does not exist.")} -- -+ - if (!$out) {u("missing --out [dir], eg.: build.")} - if (!-d $out){u("--out dir \"".$out."\" does not exist.")} - -@@ -630,7 +633,7 @@ if ($cmd eq "svg2png") { - my @rs = (); - foreach my $r (split (",", $res)) { - my ($w, $h) = ($r =~ m /(\d+)x(\d+)/); -- -+ - if ($w eq 0) {u("invalid res: \"".$r."\", width must be > 0.")} - if ($h eq 0) {u("invalid res: \"".$r."\", height must be > 0.")} - if (!$w or !$h) { -@@ -644,30 +647,35 @@ if ($cmd eq "svg2png") { - foreach my $r (@rs) { - my %dim = %{$r}; my $rx = $dim{w}; my $ry = $dim{h}; - my $o = $s; $o =~ s/.svg$/.png/; -- -+ - my ($name, $path, $suffix) = fileparse($o, (".png")); -- -+ - # keep things simple, make only 2 sub-dirs: - # path style is => build/png-dir/res-DxD, eg.: - # build/png-country-4x2/res-1280x960 - $path =~ s#/#-#g; - $path =~ s#-$##g; - $path =~ s#^svg#png#g; -- -+ - # case for path starting with "build-svg-" => "png-" - $path =~ s#^build-svg-#png-#g; -- -+ - my $png_out = $out."/".$path."/res-".$rx."x".$ry."/".$name.$suffix; -- my $cmd = svg2png($s, $png_out, $rx, $ry); -- -+ my $actual_cmd; -+ if ($cmd eq "rsvg2png") { -+ $actual_cmd = rsvg2png($s, $png_out, $rx, $ry, $zoom); -+ } else { -+ $actual_cmd = svg2png($s, $png_out, $rx, $ry); -+ } -+ - my ($n, $p, $s) = fileparse($png_out, (".png")); - if (! -d $p) { - print STDERR " mkdir " . $p . "\n"; - mkpath($p); - } -- --# print STDERR " " . $cmd . "\n"; -- cmd_exec($cmd); -+ -+# print STDERR " " . $actual_cmd . "\n"; -+ cmd_exec($actual_cmd); - } - } - } -@@ -816,6 +824,16 @@ sub svg2png { - } - } - -+sub rsvg2png { -+ my ($in, $o, $w, $h, $zoom) = @_; -+ -+ if (defined $zoom) { -+ return "rsvg-convert -o ".$o." -w ".$w." -h ".$h." -z ".$zoom." ".$in; -+ } else { -+ return "rsvg-convert -o ".$o." -w ".$w." -h ".$h." ".$in; -+ } -+} -+ - sub cmd_exec { - my $cmd = shift; - diff -Nru iso-flags-svg-1.0.1/debian/patches/Add-target-that-only-generates-the-320x240-fancy-pngs.patch iso-flags-svg-1.0.2/debian/patches/Add-target-that-only-generates-the-320x240-fancy-pngs.patch --- iso-flags-svg-1.0.1/debian/patches/Add-target-that-only-generates-the-320x240-fancy-pngs.patch 2016-12-06 22:24:08.000000000 +0000 +++ iso-flags-svg-1.0.2/debian/patches/Add-target-that-only-generates-the-320x240-fancy-pngs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -From: Maximiliano Curia -Date: Sat, 19 Nov 2016 23:30:31 +0100 -Subject: Add target that only generates the 320x240 fancy pngs - ---- - Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile b/Makefile -index e23e6b1..7f25880 100644 ---- a/Makefile -+++ b/Makefile -@@ -160,6 +160,9 @@ build/svg-country-4x2-none/%.svg: svg/country-4x3/%.svg - png-country-4x2: $(SVGS_42ALL) - $(Q)scripts/png-country-4x2.sh - -+png-country-320x240-fancy: $(SVGS_42_FANCY) -+ $(Q)scripts/build.pl --cmd rsvg2png --out build --res "320x240" --svgs build/svg-country-4x2-fancy -+ - png-country-squared: $(SVGS_11ALL) - $(Q)scripts/png-country-squared.sh - diff -Nru iso-flags-svg-1.0.1/debian/patches/series iso-flags-svg-1.0.2/debian/patches/series --- iso-flags-svg-1.0.1/debian/patches/series 2016-12-06 22:24:08.000000000 +0000 +++ iso-flags-svg-1.0.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Add-rsvg2png-build-command.patch -Add-target-that-only-generates-the-320x240-fancy-pngs.patch diff -Nru iso-flags-svg-1.0.1/iso-3166-1.json iso-flags-svg-1.0.2/iso-3166-1.json --- iso-flags-svg-1.0.1/iso-3166-1.json 2016-11-19 17:53:34.000000000 +0000 +++ iso-flags-svg-1.0.2/iso-3166-1.json 2018-01-18 07:20:03.000000000 +0000 @@ -6183,6 +6183,105 @@ "wm_commons" : "https://commons.wikimedia.org/wiki/File:Flag_of_Ethiopia.svg", "wp_en" : "https://en.wikipedia.org/wiki/Flag_of_Ethiopia" }, + + + + + "EU" : { + "Capital" : { + "DLST" : null, + "Flg" : 2, + "GeoPt" : [ + 50.51, + 4.21 + ], + "Name" : "Brussels", + "TD" : 3 + }, + "CountryCodes" : { + "fips" : "ET", + "iso2" : "ET", + "iso3" : "ETH", + "isoN" : 231, + "tld" : "et" + }, + "GeoPt" : [ + 8, + 38 + ], + "GeoRectangle" : { + "East" : 47.9861831665, + "North" : 14.8937511444, + "South" : 3.40242171288, + "West" : 32.9999351501 + }, + "Name" : "Ethiopia", + "Names" : { + "af" : "Ethiopië", + "ar" : "أثيوبيا", + "be" : "Эфіопія", + "bg" : "Етиопия", + "ca" : "Etiòpia", + "cs" : "Etiopie", + "cy" : "Ethiopia", + "da" : "Etiopien", + "de" : "Äthiopien", + "el" : "Αιθιοπία", + "es" : "Etiopía", + "et" : "Etioopia", + "fa" : "اتیوپی", + "fi" : "Etiopia", + "fr" : "L'Ethiopie", + "ga" : "An Aetóip", + "gl" : "Etiopía", + "hi" : "इथियोपिया", + "hr" : "Etiopija", + "ht" : "Etyopi", + "hu" : "Etiópia", + "id" : "Etiopia", + "is" : "Eþíópía", + "it" : "Etiopia", + "iw" : "אתיופיה", + "ja" : "エチオピア", + "ko" : "에티오피아", + "lt" : "Etiopija", + "lv" : "Etiopija", + "mk" : "Етиопија", + "ms" : "Ethiopia", + "mt" : "Etijopja", + "nl" : "Ethiopië", + "no" : "Etiopia", + "pl" : "Etiopia", + "pt" : "Etiópia", + "ro" : "Etiopia", + "ru" : "Эфиопия", + "sk" : "Etiópia", + "sl" : "Etiopija", + "sq" : "Etiopi", + "sr" : "Етиопија", + "sv" : "Etiopien", + "sw" : "Ethiopia", + "th" : "สาธารณรัฐเอธิโอเปีย", + "tl" : "Etyopya", + "tr" : "Etiyopya", + "uk" : "Ефіопія", + "vi" : "Ethiopia", + "yi" : "עטיאפיע", + "zh" : "埃塞俄比亚", + "zh-TW" : "埃塞俄比亞" + }, + "Notes" : null, + "SeqID" : 67, + "TelPref" : "251", + "Year" : "1974", + "wm_commons" : "https://commons.wikimedia.org/wiki/File:Flag_of_Ethiopia.svg", + "wp_en" : "https://en.wikipedia.org/wiki/Flag_of_Ethiopia" + }, + + + + + "FI" : { "Capital" : { "DLST" : 1, diff -Nru iso-flags-svg-1.0.1/Makefile iso-flags-svg-1.0.2/Makefile --- iso-flags-svg-1.0.1/Makefile 2016-11-19 17:53:34.000000000 +0000 +++ iso-flags-svg-1.0.2/Makefile 2018-01-18 07:20:03.000000000 +0000 @@ -160,6 +160,9 @@ png-country-4x2: $(SVGS_42ALL) $(Q)scripts/png-country-4x2.sh +png-country-320x240-fancy: $(SVGS_42_FANCY) + $(Q)scripts/build.pl --cmd rsvg2png --out build --res "320x240" --svgs build/svg-country-4x2-fancy + png-country-squared: $(SVGS_11ALL) $(Q)scripts/png-country-squared.sh diff -Nru iso-flags-svg-1.0.1/scripts/build.pl iso-flags-svg-1.0.2/scripts/build.pl --- iso-flags-svg-1.0.1/scripts/build.pl 2016-11-19 17:53:34.000000000 +0000 +++ iso-flags-svg-1.0.2/scripts/build.pl 2018-01-18 07:20:03.000000000 +0000 @@ -52,6 +52,8 @@ my $imgFore; my $imgFlag; my $imgBack; # images for template command my $mask; # [D+D+DxD] mask spec for template command +my $zoom; # for rsvg2png + # for --cmd example xplanet my $json; my $lang; @@ -68,11 +70,12 @@ "flag=s" => \$imgFlag, "mask=s" => \$mask, "back=s" => \$imgBack, + "zoom=f" => \$zoom, "json=s" => \$json, "lang=s" => \$lang, ); -my $cmds = "help|svg2png|svg2svg|example|db"; +my $cmds = "help|svg2png|svg2svg|rsvg2png|example|db"; my $stys = "none|flat|simple|fancy|glossy"; sub u { @@ -615,10 +618,10 @@ writeFile($out."/".$imgSvg, $doc->toString()); } -if ($cmd eq "svg2png") { +if (($cmd eq "svg2png") || ($cmd eq "rsvg2png")) { if (!$dirSvg){u("missing --svgs [dir], eg.: svg/country-squared.")} if (!-d $dirSvg){u("--svgs \"".$dirSvg."\" does not exist.")} - + if (!$out) {u("missing --out [dir], eg.: build.")} if (!-d $out){u("--out dir \"".$out."\" does not exist.")} @@ -630,7 +633,7 @@ my @rs = (); foreach my $r (split (",", $res)) { my ($w, $h) = ($r =~ m /(\d+)x(\d+)/); - + if ($w eq 0) {u("invalid res: \"".$r."\", width must be > 0.")} if ($h eq 0) {u("invalid res: \"".$r."\", height must be > 0.")} if (!$w or !$h) { @@ -644,30 +647,35 @@ foreach my $r (@rs) { my %dim = %{$r}; my $rx = $dim{w}; my $ry = $dim{h}; my $o = $s; $o =~ s/.svg$/.png/; - + my ($name, $path, $suffix) = fileparse($o, (".png")); - + # keep things simple, make only 2 sub-dirs: # path style is => build/png-dir/res-DxD, eg.: # build/png-country-4x2/res-1280x960 $path =~ s#/#-#g; $path =~ s#-$##g; $path =~ s#^svg#png#g; - + # case for path starting with "build-svg-" => "png-" $path =~ s#^build-svg-#png-#g; - + my $png_out = $out."/".$path."/res-".$rx."x".$ry."/".$name.$suffix; - my $cmd = svg2png($s, $png_out, $rx, $ry); - + my $actual_cmd; + if ($cmd eq "rsvg2png") { + $actual_cmd = rsvg2png($s, $png_out, $rx, $ry, $zoom); + } else { + $actual_cmd = svg2png($s, $png_out, $rx, $ry); + } + my ($n, $p, $s) = fileparse($png_out, (".png")); if (! -d $p) { print STDERR " mkdir " . $p . "\n"; mkpath($p); } - -# print STDERR " " . $cmd . "\n"; - cmd_exec($cmd); + +# print STDERR " " . $actual_cmd . "\n"; + cmd_exec($actual_cmd); } } } @@ -816,6 +824,16 @@ } } +sub rsvg2png { + my ($in, $o, $w, $h, $zoom) = @_; + + if (defined $zoom) { + return "rsvg-convert -o ".$o." -w ".$w." -h ".$h." -z ".$zoom." ".$in; + } else { + return "rsvg-convert -o ".$o." -w ".$w." -h ".$h." ".$in; + } +} + sub cmd_exec { my $cmd = shift; diff -Nru iso-flags-svg-1.0.1/svg/country-4x3/brl.svg iso-flags-svg-1.0.2/svg/country-4x3/brl.svg --- iso-flags-svg-1.0.1/svg/country-4x3/brl.svg 1970-01-01 00:00:00.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-4x3/brl.svg 2018-01-18 07:20:03.000000000 +0000 @@ -0,0 +1,260 @@ + + + + + + image/svg+xml + + + + + + + + + diff -Nru iso-flags-svg-1.0.1/svg/country-4x3/eo.svg iso-flags-svg-1.0.2/svg/country-4x3/eo.svg --- iso-flags-svg-1.0.1/svg/country-4x3/eo.svg 1970-01-01 00:00:00.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-4x3/eo.svg 2018-01-18 07:20:03.000000000 +0000 @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff -Nru iso-flags-svg-1.0.1/svg/country-4x3/eu.svg iso-flags-svg-1.0.2/svg/country-4x3/eu.svg --- iso-flags-svg-1.0.1/svg/country-4x3/eu.svg 1970-01-01 00:00:00.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-4x3/eu.svg 2018-01-18 07:20:03.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + + image/svg+xml + + + + + + + European flag + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru iso-flags-svg-1.0.1/svg/country-4x3/lk.svg iso-flags-svg-1.0.2/svg/country-4x3/lk.svg --- iso-flags-svg-1.0.1/svg/country-4x3/lk.svg 2016-11-19 17:53:34.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-4x3/lk.svg 2018-01-18 07:20:03.000000000 +0000 @@ -1,44 +1,200 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff -Nru iso-flags-svg-1.0.1/svg/country-squared/brl.svg iso-flags-svg-1.0.2/svg/country-squared/brl.svg --- iso-flags-svg-1.0.1/svg/country-squared/brl.svg 1970-01-01 00:00:00.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-squared/brl.svg 2018-01-18 07:20:03.000000000 +0000 @@ -0,0 +1,260 @@ + + + + + + image/svg+xml + + + + + + + + + diff -Nru iso-flags-svg-1.0.1/svg/country-squared/eo.svg iso-flags-svg-1.0.2/svg/country-squared/eo.svg --- iso-flags-svg-1.0.1/svg/country-squared/eo.svg 1970-01-01 00:00:00.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-squared/eo.svg 2018-01-18 07:20:03.000000000 +0000 @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff -Nru iso-flags-svg-1.0.1/svg/country-squared/eu.svg iso-flags-svg-1.0.2/svg/country-squared/eu.svg --- iso-flags-svg-1.0.1/svg/country-squared/eu.svg 1970-01-01 00:00:00.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-squared/eu.svg 2018-01-18 07:20:03.000000000 +0000 @@ -0,0 +1,176 @@ + + + + + + image/svg+xml + + + + + + + European flag + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru iso-flags-svg-1.0.1/svg/country-squared/lk.svg iso-flags-svg-1.0.2/svg/country-squared/lk.svg --- iso-flags-svg-1.0.1/svg/country-squared/lk.svg 2016-11-19 17:53:34.000000000 +0000 +++ iso-flags-svg-1.0.2/svg/country-squared/lk.svg 2018-01-18 07:20:03.000000000 +0000 @@ -1,44 +1,202 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -