[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-11-g0a22d3a

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 2138678a053902327c979c91489634d017dac234
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jun 21 19:49:20 2012 +0200

    Put aside upstream shipped autogenerated files during build (instead of stripping and repackaging source tarball). Tighten build-dependency on cdbs: Needed for routine to put files aside.

diff --git a/debian/control b/debian/control
index 6e5c5ac..38774d0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
 Uploaders: Andrew Harvey <andrew.harvey4 at gmail.com>
-Build-Depends: cdbs (>= 0.4.85~),
+Build-Depends: cdbs (>= 0.4.106~),
  debhelper (>= 8~),
  dh-buildinfo,
  node-uglify,
diff --git a/debian/rules b/debian/rules
index 18ac783..46dc31c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,8 +37,9 @@ DEB_UPSTREAM_TARBALL_EXTENSION =
 DEB_UPSTREAM_RECEIVED_EXTENSION = tar.gz
 DEB_UPSTREAM_WGET_OPTS += --no-check-certificate
 DEB_UPSTREAM_TARBALL_MD5 = 
-DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./lib/ ./dist/leaflet.js ./dist/leaflet-src.js
-DEB_UPSTREAM_TARBALL_SRCDIR = CloudMade-Leaflet-538dfb4
+
+# Put aside upstream shipped autogenerated files during build
+DEB_UPSTREAM_CRUFT_MOVE = dist/leaflet.js dist/leaflet-src.js
 
 js-destdir = /usr/share/javascript/$(libname)
 
@@ -46,5 +47,3 @@ DEB_DH_INSTALL_ARGS_$(pkg) = dist/* $(js-destdir)
 
 build/$(pkg)::
 	jake
-clean::
-	rm -f dist/leaflet.js dist/leaflet-src.js

-- 
JavaScript library for displaying map data in web browsers