This is an automated email from the git hooks/post-receive script. ross-guest pushed a commit to branch master in repository tilemill.
commit 3526032f89891407a043a2e61e6853e2b71e7a32 Author: Ross Gammon <rossgam...@mail.dk> Date: Fri Apr 4 20:34:19 2014 +0200 Include debian files from upstream ppa --- debian/tilemill.config | 4 +++ debian/tilemill.desktop | 10 ++++++ debian/tilemill.install | 23 ++++++++++++ debian/tilemill.postinst | 38 ++++++++++++++++++++ debian/tilemill.postrm | 28 +++++++++++++++ debian/tilemill.preinst | 9 +++++ debian/tilemill.rotate | 9 +++++ debian/tilemill.svg | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 212 insertions(+) diff --git a/debian/tilemill.config b/debian/tilemill.config new file mode 100644 index 0000000..99cfe96 --- /dev/null +++ b/debian/tilemill.config @@ -0,0 +1,4 @@ +{ + "files": "/usr/share/mapbox", + "server": true +} diff --git a/debian/tilemill.desktop b/debian/tilemill.desktop new file mode 100644 index 0000000..a6eaf67 --- /dev/null +++ b/debian/tilemill.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=TileMill +Comment=TileMill Map Design Studio +Exec=bash -c "/usr/bin/nodejs /usr/share/tilemill/index.js >> $HOME/.tilemill.log 2>&1" +Icon=/usr/share/icons/hicolor/scalable/apps/tilemill.svg +Terminal=false +Type=Application +Encoding=UTF-8 +Categories=Graphics;Application;Geography; +StartupNotify=false diff --git a/debian/tilemill.install b/debian/tilemill.install new file mode 100644 index 0000000..56c9031 --- /dev/null +++ b/debian/tilemill.install @@ -0,0 +1,23 @@ +# Project source +## files +index.js usr/share/tilemill +package.json usr/share/tilemill +tilemill.ico usr/share/tilemill + +## directories +assets usr/share/tilemill +commands usr/share/tilemill +controllers usr/share/tilemill +examples usr/share/tilemill +lib usr/share/tilemill +models usr/share/tilemill +debian/node_modules usr/share/tilemill +servers usr/share/tilemill +templates usr/share/tilemill +views usr/share/tilemill + +# Package helpers +debian/tilemill.config etc/tilemill +debian/tilemill.rotate etc/logrotate.d +debian/tilemill.desktop usr/share/applications +debian/tilemill.svg usr/share/icons/hicolor/scalable/apps diff --git a/debian/tilemill.postinst b/debian/tilemill.postinst new file mode 100644 index 0000000..a67149f --- /dev/null +++ b/debian/tilemill.postinst @@ -0,0 +1,38 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + + # Create the "tilemill" user + if ! getent passwd mapbox > /dev/null; then + adduser --quiet --system --group --home /usr/share/mapbox \ + --gecos "MapBox system user" \ + mapbox + fi + + # Create files common to "tilemill" which need to be owned by the + # "tilemill" user + install --owner mapbox --group mapbox --directory \ + /var/log/tilemill + # Ownership on tilemill home dir + chown mapbox:mapbox /usr/share/tilemill + # Create mapbox dir if it doesn't already exist. + if [ ! -d "/usr/share/mapbox" ]; then + install --owner mapbox --group mapbox --directory \ + /usr/share/mapbox + fi +fi + +echo "\nTileMill has been installed. Start it using the Ubuntu launcher (>=11.10)" +echo "or the TileMill menu item, located in the Graphics section of the" +echo "Applications menu (10.10 & 11.04)." + +echo "\nLearn how to use TileMill" +echo "http://mapbox.com/tilemill/docs/" + +echo "\nLearn how to run TileMill as an Ubuntu service" +echo "http://mapbox.com/tilemill/docs/guides/ubuntu-service/" +echo "\n" + +#DEBHELPER# diff --git a/debian/tilemill.postrm b/debian/tilemill.postrm new file mode 100644 index 0000000..477e83e --- /dev/null +++ b/debian/tilemill.postrm @@ -0,0 +1,28 @@ +#!/bin/sh -e + +case "$1" in + purge) + rm -f /etc/tilemill/tilemill.config + rm -f /etc/init/tilemill.conf + # Remove puppet log files + rm -rf /var/log/tilemill/ + rm -rf /usr/share/tilemill/ + rm -rf /usr/share/applications/tilemill.desktop + rm -rf /usr/share/icons/hicolor/scalable/apps/tilemill.svg + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + if [ -n "$(status tilemill |grep running)" ]; then + /sbin/stop tilemill + fi + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/tilemill.preinst b/debian/tilemill.preinst new file mode 100644 index 0000000..e320cb7 --- /dev/null +++ b/debian/tilemill.preinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +BASE="/usr/local/lib" + +if [ -e "$BASE/libmapnik.so" ]; then + echo "\n\n\033[38;50;33mNOTICE:\033[39m You appear to have another version of libmapnik installed under /usr/local on this system. In order for TileMill to run correctly you must remove this version of libmapnik. The TileMill package includes its own libmapnik library, but your copy of libmapnik in /usr/local will interfere with the TileMill package version of libmapnik. Quick solution is to go to where you previously installed mapnik and run \`make uninstall\`.\n\n" +fi diff --git a/debian/tilemill.rotate b/debian/tilemill.rotate new file mode 100644 index 0000000..e32fcc8 --- /dev/null +++ b/debian/tilemill.rotate @@ -0,0 +1,9 @@ +/var/log/tilemill/*.log { + weekly + rotate 10 + copytruncate + delaycompress + compress + notifempty + missingok +} diff --git a/debian/tilemill.svg b/debian/tilemill.svg new file mode 100644 index 0000000..c129738 --- /dev/null +++ b/debian/tilemill.svg @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="70" + height="70" + id="svg3238" + version="1.1" + inkscape:version="0.48.1 r9760" + sodipodi:docname="tilemill.svg" + inkscape:export-filename="/Users/diggersf/src/tilemill/platforms/osx/tilemill.png" + inkscape:export-xdpi="658.28998" + inkscape:export-ydpi="658.28998"> + <defs + id="defs3240" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.6" + inkscape:cx="39.285714" + inkscape:cy="32.967174" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1440" + inkscape:window-height="852" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0"> + <inkscape:grid + type="xygrid" + id="grid3255" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata3243"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-982.36218)"> + <path + transform="matrix(0.7,0,0,0.7,-371,814.36218)" + d="m 630,290 c 0,27.61424 -22.38576,50 -50,50 -27.61424,0 -50,-22.38576 -50,-50 0,-27.61424 22.38576,-50 50,-50 27.61424,0 50,22.38576 50,50 z" + sodipodi:ry="50" + sodipodi:rx="50" + sodipodi:cy="290" + sodipodi:cx="580" + id="path4575" + style="color:#000000;fill:#ddeff4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" + inkscape:export-xdpi="658.28571" + inkscape:export-ydpi="658.28571" /> + <path + inkscape:connector-curvature="0" + id="path4577" + d="m 26.5,993.36217 -3,3 8,8.00003 1.99999,-4 -7,-7.00003 z m -3.5,3.5 -1.5,1.5 8.5,8.50003 1.5,-1.5 -8.5,-8.50003 z m 24,0 -8.5,8.50003 1.5,1.5 8.5,-8.50003 -1.5,-1.5 z m 2,2 -8,8.00003 4,2 7,-7 -3,-3.00003 z m -14,4.00003 -9.34375,9.3437 -0.65625,-0.3437 -7,7 3,3 3.8125,-3.8125 -0.125,1.125 -3.1875,3.1875 1.5,1.5 1.28125,-1.2813 L 23,1033.3622 c -5,1.0001 -8,5 -8,5 l 40,0 c 0,0 -3,-3.9999 -8,-5 l -1,-8.5 0.5,-0.5 -0.625,-0.5313 -0.15626,-1.25 1.28126,1.2813 1.5,-1.5 -3.1875,-3.1 [...] + style="color:#000000;fill:#202020;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.055;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/Users/diggersf/path4575.png" + inkscape:export-xdpi="658.28571" + inkscape:export-ydpi="658.28571" /> + </g> +</svg> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tilemill.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