This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit c8a88b8f4343fdda886af16d49c752cbedafd804 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Mar 3 01:15:42 2015 +0100 Add patch to exclude ElvenSword resources. --- debian/patches/exclude-elvensword-resources.patch | 108 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 109 insertions(+) diff --git a/debian/patches/exclude-elvensword-resources.patch b/debian/patches/exclude-elvensword-resources.patch new file mode 100644 index 0000000..cf97c4f --- /dev/null +++ b/debian/patches/exclude-elvensword-resources.patch @@ -0,0 +1,108 @@ +Description: Disable the ElevenSword gradients + The ElevenSword gradients has non-free usage terms. + . + The gradients are excluded from the repacked upstream tarball. +Author: Bas Couwenberg <sebas...@debian.org> +Forwarded: not-needed + +--- a/resources/cpt-city-qgis-min/selections/blues.xml ++++ b/resources/cpt-city-qgis-min/selections/blues.xml +@@ -5,10 +5,12 @@ + bathymetric maps</synopsis> + <description>A selection of blues which may be useful for + bathymetric maps.</description> ++<!-- + <seealsocollects> + <collect dir="es/skywalker">skywalker</collect> + <collect dir="es/sea_dreams">sea dreams</collect> + </seealsocollects> ++--> + <gradients> + <gradient dir="cb/seq" file="Blues_09"/> + <gradient dir="cb/seq" file="GnBu_09"/> +--- a/resources/cpt-city-qgis-min/selections/div.xml ++++ b/resources/cpt-city-qgis-min/selections/div.xml +@@ -17,8 +17,10 @@ + <gradient file="bhw2_39" dir="bhw/bhw2"/> + <gradient file="BrBG_11" dir="cb/div"/> + <gradient file="cw1-002" dir="cw/1"/> ++<!-- + <gradient file="es_landscape_90" dir="es/landscape"/> + <gradient file="es_landscape_76" dir="es/landscape"/> ++--> + <gradient file="fire_active_2" dir="esri/events"/> + <gradient file="seismic" dir="gery"/> + <gradient file="French_flag_smooth" dir="ggr"/> +--- a/resources/cpt-city-qgis-min/selections/greens.xml ++++ b/resources/cpt-city-qgis-min/selections/greens.xml +@@ -4,10 +4,12 @@ + <synopsis>Predominantly green gradients</synopsis> + <description>As Kermit the frog says, it's not + easy being green.</description> ++<!-- + <seealsocollects> + <collect dir="es/emerald_dragon">ElvenSword's + Emerald dragon series</collect> + </seealsocollects> ++--> + <gradients> + <gradient dir="occ/1" file="occ040"/> + <gradient dir="rc" file="girlcat"/> +@@ -20,8 +22,10 @@ + <gradient dir="h5" file="summer"/> + <gradient dir="gps" file="GPS-Nature-Grass"/> + <gradient dir="go2/webtwo" file="green-g1-2"/> ++<!-- + <gradient dir="es/emerald_dragon" file="es_emerald_dragon_12"/> + <gradient dir="es/emerald_dragon" file="es_emerald_dragon_10"/> ++--> + <gradient dir="cw/2" file="cw2-033"/> + <gradient dir="colo/smorin2002" file="All_kinds_of_green"/> + <gradient dir="colo/angelafaye" file="organic_vegetation"/> +--- a/resources/cpt-city-qgis-min/selections/greys.xml ++++ b/resources/cpt-city-qgis-min/selections/greys.xml +@@ -7,7 +7,9 @@ + <collect dir="tl">Thomas Lotze</collect> + <collect dir="erj">Eric R. Jeschke</collect> + <collect dir="ma/gray">Michele Albert</collect> ++<!-- + <collect dir="es/platinum">ElvenSword</collect> ++--> + </seealsocollects> + <gradients> + <gradient file="Greys_09" dir="cb/seq"/> +@@ -24,7 +26,9 @@ + <gradient file="stripes-six" dir="ocal"/> + <gradient file="power-0.50" dir="tl"/> + <gradient file="grey-g2-3" dir="go2/webtwo"/> ++<!-- + <gradient file="es_platinum_16" dir="es/platinum"/> ++--> + <gradient file="rock" dir="neota/env"/> + </gradients> + </selection> +--- a/resources/cpt-city-qgis-min/selections/reds.xml ++++ b/resources/cpt-city-qgis-min/selections/reds.xml +@@ -5,7 +5,9 @@ + <description>A selection of red, pinks and oranges.</description> + <seealsocollects> + <collect dir="nd/red">Nevit Dilmen</collect> ++<!-- + <collect dir="es/rosa">ElvenSword</collect> ++--> + </seealsocollects> + <gradients> + <gradient file="Reds_09" dir="cb/seq"/> +--- a/resources/cpt-city-qgis-min/selections/transparency.xml ++++ b/resources/cpt-city-qgis-min/selections/transparency.xml +@@ -10,8 +10,10 @@ + <collect dir="ggr">GIMP</collect> + </seealsocollects> + <gradients> ++<!-- + <gradient file="es_platinum_01" dir="es/platinum"/> + <gradient file="es_seadreams_14" dir="es/sea_dreams"/> ++--> + <gradient file="Aneurism" dir="ggr"/> + <gradient file="Flare_Glow_Radial_1" dir="ggr"/> + <gradient file="Radial_Rainbow_Hoop" dir="ggr"/> diff --git a/debian/patches/series b/debian/patches/series index 5798c0a..937e435 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,6 @@ python-env.patch disable-doxygen.patch developersmap-use-debian-package.patch exclude-dxf2shp-plugin.patch +exclude-elvensword-resources.patch 0001-processing-correctly-handle-tiny-polygons-smaller-th.patch 0001-backport-ada01603cb7b10786436aa0ed2361743b52ce48f.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel