[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-11-g0a22d3a
The following commit has been merged in the master branch: commit 3e0c1a19517bad9f3cd01d4ec727c521bd209dc3 Author: Jonas Smedegaard d...@jones.dk Date: Thu Jun 21 19:52:21 2012 +0200 Tidy rules file: Add commented out hint for fetching snapshot. diff --git a/debian/rules b/debian/rules index 46dc31c..fde988a 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,8 @@ CDBS_BUILD_DEPENDS += , node-uglify , node-jake DEB_UPSTREAM_URL = https://github.com/CloudMade/Leaflet/tarball DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION) +# Set below to fetch snapshot of HEAD instead of tagged release +#DEB_UPSTREAM_TARBALL_BASENAME = master DEB_UPSTREAM_TARBALL_DELIMITER = DEB_UPSTREAM_TARBALL_EXTENSION = DEB_UPSTREAM_RECEIVED_EXTENSION = tar.gz -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-11-g0a22d3a
The following commit has been merged in the master branch:
commit a62b0f9b152d22d72dc9593d2259acaa9ca1fcc8
Author: Jonas Smedegaard d...@jones.dk
Date: Thu Jun 21 19:57:05 2012 +0200
Refresh patch 01, and simplify to minimally needed.
diff --git a/debian/patches/01-dont_test_during_build.diff
b/debian/patches/01-dont_test_during_build.diff
index 77fd223..c7dfe81 100644
--- a/debian/patches/01-dont_test_during_build.diff
+++ b/debian/patches/01-dont_test_during_build.diff
@@ -1,41 +1,18 @@
--- a/Jakefile.js
+++ b/Jakefile.js
-@@ -1,29 +1,12 @@
--var build = require('./build/build.js'),
+@@ -1,5 +1,5 @@
+ var build = require('./build/build.js'),
- lint = require('./build/hint.js');
-+var build = require('./build/build.js');
++ lint = null;
var crlf = '\r\n',
COPYRIGHT = '/*' + crlf + ' Copyright (c) 2010-2011, CloudMade,
Vladimir Agafonkin' + crlf +
- ' Leaflet is a modern open-source JavaScript library for
interactive maps.' + crlf +
- ' http://leaflet.cloudmade.com' + crlf + '*/' + crlf;
+@@ -23,7 +23,7 @@
+ });
--desc('Check Leaflet source for errors with JSHint');
--task('lint', function () {
-- var files = build.getFiles();
--
-- console.log('Checking for JS errors...');
--
-- var errorsFound = lint.jshint(files);
--
-- if (errorsFound 0) {
-- console.log(errorsFound + ' error(s) found.\n');
-- fail();
-- } else {
-- console.log('\tCheck passed');
-- }
--});
--
desc('Combine and compress Leaflet source files');
-task('build', ['lint'], function (compsBase32, buildName) {
+task('build', function (compsBase32, buildName) {
var pathPart = 'dist/leaflet' + (buildName ? '-' + buildName : ''),
srcPath = pathPart + '-src.js',
path = pathPart + '.js';
-@@ -62,4 +45,4 @@
- }
- });
-
--task('default', ['build']);
-\ No newline at end of file
-+task('default', ['build']);
--
JavaScript library for displaying map data in web browsers
___
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-11-g0a22d3a
The following commit has been merged in the master branch: commit bba4855623188934798e9f4b1ee29e75b6b68652 Author: Jonas Smedegaard d...@jones.dk Date: Thu Jun 21 19:45:38 2012 +0200 Fix tighten build-dpendency on cdbs: Needed for recent debhelper support. Relax slightly build-dependency on debhelper: Eases backporting. diff --git a/debian/control b/debian/control index e439a88..6e5c5ac 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: web Priority: extra Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org Uploaders: Andrew Harvey andrew.harv...@gmail.com -Build-Depends: cdbs, - debhelper (= 8.0.0), +Build-Depends: cdbs (= 0.4.85~), + debhelper (= 8~), dh-buildinfo, node-uglify, node-jake -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet annotated tag, upstream/0.4_20120621, created. upstream/0.4_20120621
The annotated tag, upstream/0.4_20120621 has been created at f5d64b6fa01755f00444d9cb156813ca5591bb00 (tag) tagging d156b9685e6cc23b6a52e9a32c676e138ba6d248 (commit) replaces upstream/0.3.1 tagged by Jonas Smedegaard on Thu Jun 21 18:52:03 2012 +0200 - Shortlog Upstream version 0.4~20120621 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJP41EzAAoJECx8MUbBoAEh4qQQAKFSS225gQNANaNBcBjv0x+2 887QBJN/42QDhnMEwDbm4JOpNDNit3zOU6i6oyPeOR/rlaXNs/LeVohopdWmoEM0 KAUyhEGJPMp3vrp7KU1ZFfeLnMLTdkCS85LTZpcgur0lORE3jiwD/D0F+2Pke4q9 8hnHXy+BeriBftBthrpslURFS0LTJf9r365jFHTe4tie4R2NRsOhCF9DCTk0SIQM g7bFv1GQX491YN+PYWAn6U39b+ICN534kQKZzEgNENxx+KS6jX0EHdQxGubNB80F w7UwwKQ3bfuGPA1oczMv2AOIMZB0N/QCnz+Q/W9Cy/zxZ/0LsT8RhUufaWCxybfX c9j1qWPMhC2O+AzuGw4mC3CNRCMS6eZdTb78DlttufyJMtzvvzbgYXEvv0rrWCrs Nz8WkqTZ/IaDGrDsdiMOMkhRahvuO3QBtiaoa0jSusADc84UJ9qMvu80vrfo5FYQ AJqoZfGMu5pVPiKilT5rV/rcWo8uVicUlGL0+SlbfYqDlgtDSnlPcaBn2K01gMs0 PTRcAJEIOhJmkrOlduChhQvXm3Law7pJoWkJO3XMdPKx13RvgcjVN8KpYEG25z8a A9S8vqxF5aVmT/iB3G46bdZHIQUq9pmoU6Gw0PztNzcQeIpkSYVRr07jOaKANiKa e7A+iA50J1Zz0pyQfSPy =/YqM -END PGP SIGNATURE- Jonas Smedegaard (1): Imported Upstream version 0.4~20120621 --- -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-19-ged4f1ea
The following commit has been merged in the master branch: commit 3e21dfe2c677cd8fc88bb7273cba23f9f4885775 Author: Jonas Smedegaard d...@jones.dk Date: Tue Jun 26 02:22:08 2012 +0200 Add DEP3 header to patch 2001. diff --git a/debian/patches/2001-dont_test_during_build.patch b/debian/patches/2001-dont_test_during_build.patch index c7dfe81..bc8f9f0 100644 --- a/debian/patches/2001-dont_test_during_build.patch +++ b/debian/patches/2001-dont_test_during_build.patch @@ -1,3 +1,8 @@ +Description: avoid running tests until jshlint is packaged +Author: Andrew Harvey andrew.harv...@gmail.com +Forwarded: not-needed +Last-Update: 2012-02-14 + --- a/Jakefile.js +++ b/Jakefile.js @@ -1,5 +1,5 @@ -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-19-ged4f1ea
The following commit has been merged in the master branch: commit 721c6e01a6869a8e5fe6fb0929472dc8ad79b83f Author: Jonas Smedegaard d...@jones.dk Date: Tue Jun 26 02:44:06 2012 +0200 Add myself as uploader. diff --git a/debian/control b/debian/control index 38774d0..e041201 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: leaflet Section: web Priority: extra Maintainer: Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org -Uploaders: Andrew Harvey andrew.harv...@gmail.com +Uploaders: Andrew Harvey andrew.harv...@gmail.com, + Jonas Smedegaard d...@jones.dk Build-Depends: cdbs (= 0.4.106~), debhelper (= 8~), dh-buildinfo, -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-19-ged4f1ea
The following commit has been merged in the master branch: commit cc58436a43e9012365f7cdda57d3816d43f25181 Author: Jonas Smedegaard d...@jones.dk Date: Tue Jun 26 02:44:47 2012 +0200 Bump standards-version to 3.9.3. diff --git a/debian/control b/debian/control index e041201..c40f691 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs (= 0.4.106~), dh-buildinfo, node-uglify, node-jake -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://leaflet.cloudmade.com/ Vcs-Git: git://git.debian.org/pkg-osm/leaflet.git Vcs-Browser: http://git.debian.org/?p=pkg-osm/leaflet.git -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.3-1-19-ged4f1ea
The following commit has been merged in the master branch: commit ed4f1ea7824f9c585396a5dacd43d88188958abd Author: Jonas Smedegaard d...@jones.dk Date: Tue Jun 26 02:46:36 2012 +0200 Prepare for release: Update changelog. diff --git a/debian/changelog b/debian/changelog index d010c60..9794e63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -leaflet (0.3.1-1) UNRELEASED; urgency=low +leaflet (0.3.1-1) unstable; urgency=low * New upstream release. Closes: bug#678419. @@ -14,9 +14,15 @@ leaflet (0.3.1-1) UNRELEASED; urgency=low Closes: bug#678426. Tighten build-dependency on cdbs: Needed for routine to put files aside. - * Refresh patch 01, and simplify to minimally needed. - - -- Jonas Smedegaard d...@jones.dk Thu, 21 Jun 2012 20:06:29 +0200 + * Refresh patch, minimize, add DEP3 header, and rename to 2001. + * Add debian/patches/README documenting numbering micro-policy. + * Add patch from upstream VCS to fix non-removable attributions +regression. + * Git-ignore quilt .pc subdir to ease git-buildpackage usage. + * Add myself as uploader. + * Bump standards-version to 3.9.3. + + -- Jonas Smedegaard d...@jones.dk Tue, 26 Jun 2012 02:46:21 +0200 leaflet (0.3-1) unstable; urgency=low -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] leaflet annotated tag, debian/0.3.1-1, created. debian/0.3.1-1
The annotated tag, debian/0.3.1-1 has been created at 4b108ecd80110999d8eaacb86a0e0d60670de491 (tag) tagging ed4f1ea7824f9c585396a5dacd43d88188958abd (commit) replaces debian/0.3-1 tagged by Jonas Smedegaard on Tue Jun 26 02:47:06 2012 +0200 - Shortlog Debian release 0.3.1-1 Andrew Harvey (3): update debian files for 0.3.1-1 release Imported Upstream version 0.3.1 Merge tag 'upstream/0.3.1' Jonas Smedegaard (16): Update watch, rules and copyrigh files to directly use github.com URL (not githubredir.debian.net or Homepage). Tidy control file: newline-delimit build-dependencies. Tidy rules file: shorten internal variable; improve header syntactically; drop unused parts. Fix tighten build-dpendency on cdbs: Needed for recent debhelper support. Relax slightly build-dependency on debhelper: Eases backporting. 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. Tidy rules file: Add commented out hint for fetching snapshot. Refresh patch 01, and simplify to minimally needed. Update changelog. Rename patch 01...diff → 2001...patch. Add debian/patches/README documenting numbering micro-policy. Add DEP3 header to patch 2001. Add patch from upstream VCS to fix non-removable attributions regression. Git-ignore quilt .pc subdir to ease git-buildpackage usage. Add myself as uploader. Bump standards-version to 3.9.3. Prepare for release: Update changelog. --- -- JavaScript library for displaying map data in web browsers ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
