[openstreetmap-map-icons] 01/02: Merge tag 'debian/0.0.svn32805-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Thu Aug 18 09:21:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository openstreetmap-map-icons.
commit fe7d3f5385a15aa435c4a87bd7d21d43f3ef2f68
Merge: 08804a9 3799a95
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Aug 18 09:55:44 2016 +0200
Merge tag 'debian/0.0.svn32805-1' into jessie-backports
Conflicts:
debian/changelog
classic.small/accommodation/alpine_hut.png | Bin 182 -> 0 bytes
.../accommodation/camping/dump-station.png | Bin 427 -> 0 bytes
classic.small/accommodation/camping/gas-refill.png | Bin 214 -> 0 bytes
classic.small/accommodation/camping/hookup.png | Bin 250 -> 0 bytes
classic.small/accommodation/camping/trash.png | Bin 248 -> 0 bytes
classic.small/accommodation/camping/wastewater.png | Bin 413 -> 0 bytes
classic.small/accommodation/hotel/five_star.png | Bin 303 -> 0 bytes
classic.small/accommodation/hotel/four_star.png | Bin 292 -> 0 bytes
classic.small/accommodation/hotel/one_star.png | Bin 256 -> 0 bytes
classic.small/accommodation/hotel/three_star.png | Bin 280 -> 0 bytes
classic.small/accommodation/hotel/two_star.png | Bin 274 -> 0 bytes
classic.small/accommodation/shelter-bw.png | Bin 382 -> 0 bytes
classic.small/craft/stonemason.png | Bin 488 -> 0 bytes
classic.small/education.png | Bin 463 -> 0 bytes
classic.small/education/school/primary.png | Bin 145 -> 0 bytes
classic.small/empty.png | Bin 148 -> 0 bytes
classic.small/food.png | Bin 755 -> 0 bytes
classic.small/food/bacon_and_eggs.png | Bin 851 -> 0 bytes
classic.small/food/fastfood/burger-king.png | Bin 912 -> 0 bytes
classic.small/food/fastfood/mc-donalds.png | Bin 858 -> 0 bytes
classic.small/food/restaurant/japanese.png | Bin 703 -> 0 bytes
classic.small/food/snacks.png | Bin 724 -> 0 bytes
classic.small/food/snacks/pizza.png | Bin 887 -> 0 bytes
classic.small/food/teashop.png | Bin 127 -> 0 bytes
classic.small/food/wine_tavern.png | Bin 746 -> 0 bytes
classic.small/geocache.png | Bin 519 -> 0 bytes
classic.small/health.png | Bin 116 -> 0 bytes
classic.small/health/clinic.svg | 2 +-
classic.small/health/dentist.svg | 2 +-
classic.small/health/doctors.svg | 2 +-
classic.small/incomming/Broad.png | Bin 73 -> 0 bytes
classic.small/incomming/OLmarker.png | Bin 441 -> 0 bytes
classic.small/incomming/amenity.png | Bin 92 -> 0 bytes
classic.small/incomming/aroad.png | Bin 74 -> 0 bytes
classic.small/incomming/bridleway.png | Bin 72 -> 0 bytes
classic.small/incomming/byway.png | Bin 71 -> 0 bytes
classic.small/incomming/contours.png | Bin 145 -> 0 bytes
classic.small/incomming/footpath.png | Bin 72 -> 0 bytes
classic.small/incomming/fwpbr.png | Bin 72 -> 0 bytes
classic.small/incomming/industry.png | Bin 123 -> 0 bytes
classic.small/incomming/interest.png | Bin 106 -> 0 bytes
classic.small/incomming/london-tube-24.png | Bin 462 -> 0 bytes
classic.small/incomming/minorroad.png | Bin 73 -> 0 bytes
classic.small/incomming/motorway_shield2.png | Bin 126 -> 0 bytes
classic.small/incomming/motorway_shield3.png | Bin 158 -> 0 bytes
classic.small/incomming/one.png | Bin 90 -> 0 bytes
classic.small/incomming/pbridleway.png | Bin 69 -> 0 bytes
classic.small/incomming/place.png | Bin 114 -> 0 bytes
classic.small/incomming/railway.png | Bin 71 -> 0 bytes
classic.small/incomming/road.png | Bin 74 -> 0 bytes
classic.small/incomming/station.png | Bin 190 -> 0 bytes
classic.small/incomming/stationnew.png | Bin 111 -> 0 bytes
classic.small/incomming/three.png | Bin 92 -> 0 bytes
classic.small/incomming/two.png | Bin 96 -> 0 bytes
classic.small/leisure.png | Bin 613 -> 0 bytes
classic.small/leisure/bicycling.png | Bin 247 -> 0 bytes
classic.small/leisure/billboard.svg | 4 +-
classic.small/leisure/music.png | Bin 271 -> 0 bytes
classic.small/leisure/shelter.png | Bin 410 -> 0 bytes
classic.small/leisure/theater.png | Bin 478 -> 0 bytes
classic.small/misc.png | Bin 633 -> 0 bytes
classic.small/misc/bunny.png | Bin 539 -> 0 bytes
classic.small/misc/butterfly.png | Bin 438 -> 0 bytes
classic.small/misc/city_wall.png | Bin 235 -> 0 bytes
classic.small/misc/door.png | Bin 160 -> 0 bytes
classic.small/misc/drinking_water.png | Bin 311 -> 0 bytes
classic.small/misc/error.png | Bin 1137 -> 0 bytes
classic.small/misc/fence.png | Bin 351 -> 0 bytes
classic.small/misc/fixme.png | Bin 334 -> 0 bytes
classic.small/misc/hedge.png | Bin 215 -> 0 bytes
classic.small/misc/landmark.png | Bin 144 -> 0 bytes
classic.small/misc/landmark/barn.png | Bin 322 -> 0 bytes
classic.small/misc/landmark/farm.png | Bin 442 -> 0 bytes
classic.small/misc/landmark/glacier.png | Bin 175 -> 0 bytes
classic.small/misc/landmark/glacier_small.png | Bin 148 -> 0 bytes
classic.small/misc/landmark/peak_small.png | Bin 151 -> 0 bytes
classic.small/misc/landmark/power.png | Bin 151 -> 0 bytes
classic.small/misc/landmark/volcano.png | Bin 199 -> 0 bytes
.../misc/landuse/greenhouse_horticulture.png | Bin 1230 -> 0 bytes
classic.small/misc/landuse/residential.png | Bin 219 -> 0 bytes
classic.small/misc/lock_closed.png | Bin 527 -> 0 bytes
classic.small/misc/lock_open.png | Bin 545 -> 0 bytes
classic.small/misc/no_smoking.png | Bin 625 -> 0 bytes
classic.small/misc/note.png | Bin 153 -> 0 bytes
classic.small/misc/proposed.png | Bin 425 -> 0 bytes
classic.small/misc/retaining_wall.png | Bin 254 -> 0 bytes
classic.small/misc/wall.png | Bin 338 -> 0 bytes
classic.small/money.png | Bin 226 -> 0 bytes
classic.small/money/bank/vr-bank.png | Bin 556 -> 0 bytes
classic.small/nautical.png | Bin 108 -> 0 bytes
classic.small/nautical/alpha_flag.png | Bin 256 -> 0 bytes
classic.small/nautical/anchor.png | Bin 181 -> 0 bytes
classic.small/nautical/boat.png | Bin 440 -> 0 bytes
classic.small/nautical/buoy.svg | 175 --------------
classic.small/office/accountant.svg | 2 +-
classic.small/office/administrative.svg | 2 +-
classic.small/office/advertising_agency.svg | 2 +-
classic.small/office/architect.svg | 2 +-
classic.small/office/association.svg | 10 +-
classic.small/office/educational_institution.svg | 2 +-
classic.small/office/employment_agency.svg | 4 +-
classic.small/office/foundation.svg | 2 +-
classic.small/office/government.svg | 2 +-
classic.small/office/insurance.svg | 2 +-
classic.small/office/it.svg | 2 +-
classic.small/office/lawyer.svg | 4 +-
classic.small/office/newspaper.svg | 2 +-
classic.small/office/notary.svg | 2 +-
classic.small/office/ong.svg | 2 +-
classic.small/office/political_party.svg | 6 +-
classic.small/office/private_company.svg | 2 +-
classic.small/office/real_state.svg | 2 +-
classic.small/office/religion.svg | 2 +-
classic.small/office/research.svg | 2 +-
classic.small/office/tax_advisor.svg | 2 +-
classic.small/office/telecommunication.svg | 2 +-
classic.small/people.png | Bin 199 -> 0 bytes
classic.small/people/friends.png | Bin 414 -> 0 bytes
classic.small/people/friendsd.png | Bin 626 -> 0 bytes
classic.small/people/work.png | Bin 145 -> 0 bytes
classic.small/place.png | Bin 393 -> 0 bytes
classic.small/place/peak.png | Bin 187 -> 0 bytes
classic.small/place/settlement.png | Bin 210 -> 0 bytes
classic.small/place/settlement/openGeoDB.png | Bin 239 -> 0 bytes
classic.small/power/catenary_mast.svg | 240 -------------------
classic.small/power/heliostat.svg | 254 ---------------------
classic.small/power/location_transition.svg | 239 -------------------
classic.small/power/terminal.svg | 239 -------------------
classic.small/religion/chapel.png | Bin 328 -> 0 bytes
classic.small/religion/christian/catholic.png | Bin 270 -> 0 bytes
classic.small/religion/christian/mormon.png | Bin 270 -> 0 bytes
classic.small/religion/christian/orthodox.png | Bin 170 -> 0 bytes
classic.small/religion/christian/protestant.png | Bin 289 -> 0 bytes
classic.small/rendering.png | Bin 124 -> 0 bytes
classic.small/rendering/quarry.png | Bin 95 -> 0 bytes
classic.small/rendering/quarry2.png | Bin 102 -> 0 bytes
classic.small/rendering/rail_preserved.png | Bin 101 -> 0 bytes
classic.small/rendering/shield/motorway_shield.png | Bin 124 -> 0 bytes
.../rendering/shield/motorway_shield1.png | Bin 120 -> 0 bytes
.../rendering/shield/motorway_shield2.png | Bin 124 -> 0 bytes
.../rendering/shield/motorway_shield3.png | Bin 126 -> 0 bytes
.../rendering/shield/motorway_shield4.png | Bin 158 -> 0 bytes
.../rendering/shield/motorway_shield5.png | Bin 135 -> 0 bytes
.../rendering/shield/motorway_shield6.png | Bin 138 -> 0 bytes
classic.small/rendering/shield/primary_shield1.png | Bin 119 -> 0 bytes
classic.small/rendering/shield/primary_shield2.png | Bin 123 -> 0 bytes
classic.small/rendering/shield/primary_shield3.png | Bin 125 -> 0 bytes
classic.small/rendering/shield/primary_shield4.png | Bin 131 -> 0 bytes
classic.small/rendering/shield/primary_shield5.png | Bin 134 -> 0 bytes
classic.small/rendering/shield/primary_shield6.png | Bin 137 -> 0 bytes
classic.small/rendering/shield/primary_shield7.png | Bin 139 -> 0 bytes
classic.small/rendering/shield/primary_shield8.png | Bin 138 -> 0 bytes
.../rendering/shield/secondary_shield1.png | Bin 119 -> 0 bytes
.../rendering/shield/secondary_shield2.png | Bin 122 -> 0 bytes
.../rendering/shield/secondary_shield3.png | Bin 125 -> 0 bytes
.../rendering/shield/secondary_shield4.png | Bin 131 -> 0 bytes
.../rendering/shield/secondary_shield5.png | Bin 133 -> 0 bytes
.../rendering/shield/secondary_shield6.png | Bin 137 -> 0 bytes
.../rendering/shield/secondary_shield7.png | Bin 139 -> 0 bytes
.../rendering/shield/secondary_shield8.png | Bin 138 -> 0 bytes
.../rendering/shield/tertiary_shield1.png | Bin 120 -> 0 bytes
.../rendering/shield/tertiary_shield2.png | Bin 124 -> 0 bytes
.../rendering/shield/tertiary_shield3.png | Bin 127 -> 0 bytes
.../rendering/shield/tertiary_shield4.png | Bin 132 -> 0 bytes
.../rendering/shield/tertiary_shield5.png | Bin 135 -> 0 bytes
.../rendering/shield/tertiary_shield6.png | Bin 138 -> 0 bytes
.../rendering/shield/tertiary_shield7.png | Bin 139 -> 0 bytes
.../rendering/shield/tertiary_shield8.png | Bin 138 -> 0 bytes
classic.small/rendering/shield/trunk_shield1.png | Bin 120 -> 0 bytes
classic.small/rendering/shield/trunk_shield2.png | Bin 123 -> 0 bytes
classic.small/rendering/shield/trunk_shield3.png | Bin 126 -> 0 bytes
classic.small/rendering/shield/trunk_shield4.png | Bin 132 -> 0 bytes
classic.small/rendering/shield/trunk_shield5.png | Bin 134 -> 0 bytes
classic.small/rendering/shield/trunk_shield6.png | Bin 138 -> 0 bytes
classic.small/rendering/shield/trunk_shield7.png | Bin 139 -> 0 bytes
classic.small/rendering/shield/trunk_shield8.png | Bin 138 -> 0 bytes
classic.small/rendering/station_small.png | Bin 121 -> 0 bytes
classic.small/rendering/track/arrow.png | Bin 197 -> 0 bytes
classic.small/rendering/track/arrow_back.png | Bin 234 -> 0 bytes
classic.small/rendering/track/mini_round.png | Bin 163 -> 0 bytes
classic.small/rendering/track/rail.png | Bin 113 -> 0 bytes
classic.small/rendering/track/station_small.png | Bin 121 -> 0 bytes
classic.small/service.png | Bin 456 -> 0 bytes
classic.small/shop/groceries/fruits.png | Bin 370 -> 0 bytes
classic.small/shop/shoe_repair.png | Bin 817 -> 0 bytes
classic.small/shop/supermarket/aldi.png | Bin 610 -> 0 bytes
classic.small/shop/supermarket/aldi_nord.png | Bin 740 -> 0 bytes
classic.small/shop/supermarket/kaufland.png | Bin 525 -> 0 bytes
classic.small/shop/supermarket/lidl.png | Bin 723 -> 0 bytes
classic.small/social_facility/assisted_living.svg | 4 +-
classic.small/social_facility/group_home.svg | 4 +-
classic.small/social_facility/nursing_home.svg | 4 +-
classic.small/social_facility/outreach.svg | 2 +-
classic.small/social_facility/shelter.svg | 2 +-
classic.small/sport.png | Bin 385 -> 0 bytes
classic.small/sport/dart.png | Bin 625 -> 0 bytes
classic.small/sport/golf/tee_area.svg | 161 -------------
classic.small/sport/gymnastics.png | Bin 198 -> 0 bytes
classic.small/sport/indoor_pool.png | Bin 491 -> 0 bytes
classic.small/sport/kiteflying.png | Bin 402 -> 0 bytes
classic.small/sport/mountain_bike.png | Bin 490 -> 0 bytes
classic.small/sport/swimming.png | Bin 444 -> 0 bytes
classic.small/transport.png | Bin 302 -> 0 bytes
classic.small/transport/aerialway.png | Bin 199 -> 0 bytes
classic.small/transport/bridge.png | Bin 202 -> 0 bytes
classic.small/transport/bridge/bridge-car.png | Bin 321 -> 0 bytes
.../transport/bridge/bridge-pedestrian.png | Bin 281 -> 0 bytes
classic.small/transport/bridge/drawbridge.png | Bin 278 -> 0 bytes
classic.small/transport/ferry.png | Bin 247 -> 0 bytes
classic.small/transport/ferry/ferry-car.png | Bin 327 -> 0 bytes
classic.small/transport/ferry/ferry-pedestrian.png | Bin 317 -> 0 bytes
classic.small/transport/funicular.png | Bin 646 -> 0 bytes
classic.small/transport/handicapped.png | Bin 227 -> 0 bytes
classic.small/transport/harbour.png | Bin 270 -> 0 bytes
classic.small/transport/park_ride.png | Bin 239 -> 0 bytes
classic.small/transport/pedestrian.png | Bin 255 -> 0 bytes
classic.small/transport/railway/crossing2.svg | 120 ----------
.../transport/{ => railway}/funicular.svg | 0
.../transport/railway/level_crossing2.svg | 130 -----------
classic.small/transport/rapid_train.png | Bin 591 -> 0 bytes
classic.small/transport/steps.png | Bin 426 -> 0 bytes
classic.small/transport/track.png | Bin 113 -> 0 bytes
classic.small/transport/turntable.png | Bin 232 -> 0 bytes
classic.small/transport/way/way_pedestrian.svg | 4 +-
classic.small/unknown.png | Bin 234 -> 0 bytes
classic.small/vehicle/caution.png | Bin 394 -> 0 bytes
classic.small/vehicle/crossing.png | Bin 208 -> 0 bytes
classic.small/vehicle/fuel/agip.png | Bin 635 -> 0 bytes
classic.small/vehicle/fuel/aral.png | Bin 652 -> 0 bytes
classic.small/vehicle/fuel/elf.png | Bin 570 -> 0 bytes
classic.small/vehicle/fuel/esso.png | Bin 647 -> 0 bytes
classic.small/vehicle/fuel/jet.png | Bin 623 -> 0 bytes
classic.small/vehicle/fuel/omv.png | Bin 599 -> 0 bytes
classic.small/vehicle/fuel/shell.png | Bin 634 -> 0 bytes
classic.small/vehicle/fuel/texaco.png | Bin 585 -> 0 bytes
classic.small/vehicle/fuel/total.png | Bin 747 -> 0 bytes
classic.small/vehicle/parking/car.png | Bin 506 -> 0 bytes
classic.small/vehicle/parking/hiking.png | Bin 401 -> 0 bytes
classic.small/vehicle/parking/restarea.png | Bin 365 -> 0 bytes
classic.small/vehicle/parking/restarea_toilets.png | Bin 547 -> 0 bytes
classic.small/vehicle/rental.png | Bin 220 -> 0 bytes
classic.small/vehicle/rental/car/sixt.png | Bin 738 -> 0 bytes
classic.small/vehicle/restriction.png | Bin 284 -> 0 bytes
classic.small/vehicle/restriction/bicycle_road.svg | 121 ----------
classic.small/vehicle/restriction/city_limit.svg | 6 +-
classic.small/vehicle/restriction/incline.png | Bin 497 -> 0 bytes
classic.small/vehicle/restriction/parking.png | Bin 280 -> 0 bytes
classic.small/vehicle/restriction/play_street.png | Bin 508 -> 0 bytes
classic.small/vehicle/restriction/road_works.png | Bin 598 -> 0 bytes
classic.small/vehicle/restriction/speed/30-end.png | Bin 792 -> 0 bytes
classic.small/vehicle/restriction/traffic_jam.png | Bin 481 -> 0 bytes
classic.small/vehicle/tank.png | Bin 179 -> 0 bytes
classic.small/vehicle/tunnel.png | Bin 219 -> 0 bytes
classic.small/waypoint.png | Bin 214 -> 0 bytes
classic.small/waypoint/pin.png | Bin 623 -> 0 bytes
classic.small/waypoint/pin/green.png | Bin 625 -> 0 bytes
classic.small/waypoint/pin/red.png | Bin 631 -> 0 bytes
classic.small/waypoint/pin/yellow.png | Bin 635 -> 0 bytes
classic.small/waypoint/wpt1.png | Bin 218 -> 0 bytes
classic.small/waypoint/wpt2.png | Bin 218 -> 0 bytes
classic.small/waypoint/wpt3.png | Bin 239 -> 0 bytes
classic.small/waypoint/wpt4.png | Bin 249 -> 0 bytes
classic.small/waypoint/wpt5.png | Bin 319 -> 0 bytes
classic.small/waypoint/wpt6.png | Bin 965 -> 0 bytes
classic.small/waypoint/wpt7.png | Bin 805 -> 0 bytes
classic.small/waypoint/wpt8.png | Bin 951 -> 0 bytes
classic.small/waypoint/wpt9.png | Bin 965 -> 0 bytes
classic.small/waypoint/wptblue.png | Bin 264 -> 0 bytes
classic.small/waypoint/wptgreen.png | Bin 260 -> 0 bytes
classic.small/waypoint/wptorange.png | Bin 283 -> 0 bytes
classic.small/waypoint/wptred.png | Bin 254 -> 0 bytes
classic.small/waypoint/wptyellow.png | Bin 263 -> 0 bytes
classic.small/wlan/closed.png | Bin 235 -> 0 bytes
classic.small/wlan/closed/wep.png | Bin 281 -> 0 bytes
classic.small/wlan/nonfree.png | Bin 352 -> 0 bytes
classic.small/wlan/nonfree/fon.png | Bin 897 -> 0 bytes
classic.small/wlan/open.png | Bin 264 -> 0 bytes
debian/changelog | 6 +
278 files changed, 54 insertions(+), 1727 deletions(-)
diff --cc debian/changelog
index b8af070,da83af6..da9a335
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ openstreetmap-map-icons (1:0.0.svn32805-1) unstable; urgency=medium
+
+ * New upstream SVN snapshot.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 12 Aug 2016 13:49:49 +0200
+
+openstreetmap-map-icons (1:0.0.svn32641-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 17 Jul 2016 19:19:03 +0200
+
openstreetmap-map-icons (1:0.0.svn32641-1) unstable; urgency=medium
* New upstream SVN snapshot.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-map-icons.git
More information about the Pkg-grass-devel
mailing list