[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit 15bd1dee305b4293666071dc66f1670ed77ea9a8
Author: Jonas Smedegaard 
Date:   Sat Jan 19 11:22:38 2013 +0100

Add patch 2002 to revive pre-0.5 use of Uglifyjs 1.x.

diff --git a/debian/patches/2002_use_old_uglifyjs.patch 
b/debian/patches/2002_use_old_uglifyjs.patch
new file mode 100644
index 000..34c60b2
--- /dev/null
+++ b/debian/patches/2002_use_old_uglifyjs.patch
@@ -0,0 +1,37 @@
+Description: Revive pre-0.5 use of Uglifyjs 1.x.
+Author: Jonas Smedegaard 
+Forwarded: not-needed
+Last-Update: 2013-01-19
+
+--- a/build/build.js
 b/build/build.js
+@@ -63,6 +63,17 @@
+   return files;
+ }
+ 
++function uglify(code) {
++  var pro = UglifyJS.uglify;
++
++  var ast = UglifyJS.parser.parse(code);
++  ast = pro.ast_mangle(ast, {mangle: true});
++  ast = pro.ast_squeeze(ast);
++  ast = pro.ast_squeeze_more(ast);
++
++  return pro.gen_code(ast) + ';';
++};
++
+ exports.lint = function () {
+ 
+   var files = getFiles();
+@@ -137,10 +148,7 @@
+ 
+   var path = pathPart + '.js',
+   oldCompressed = loadSilently(path),
+-  newCompressed = copy + UglifyJS.minify(newSrc, {
+-  warnings: true,
+-  fromString: true
+-  }).code,
++  newCompressed = copy + uglify(newSrc),
+   delta = getSizeDelta(newCompressed, oldCompressed);
+ 
+   console.log('\tCompressed size: ' + newCompressed.length + ' bytes (' + 
delta + ')');
diff --git a/debian/patches/series b/debian/patches/series
index cb10c03..fa8edf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 2001-dont_test_during_build.patch
+2002_use_old_uglifyjs.patch

-- 
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.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit 7f1fdf1191a9db4442fe7a617948518d1c5037a9
Author: Jonas Smedegaard 
Date:   Sat Jan 19 13:35:06 2013 +0100

Prepare for release: Update changelog and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 68f5dd6..fb15546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-leaflet (0.5-1) UNRELEASED; urgency=low
+leaflet (0.5-1) unstable; urgency=low
+
+  [ upstream ]
+  * New release.
+Highlights:
++ IE10 touch devices and Metro apps support.
++ Retina-enabled markers.
++ Much better panning inertia implementation.
++ Hand cursors for dragging.
++ New zoom control design.
 
   [ Jonas Smedegaard ]
   * Update upstream URLs to reflect new Homepage and development project
@@ -10,11 +19,16 @@ leaflet (0.5-1) UNRELEASED; urgency=low
   * Extend copyright coverage of packaging, and tighten to GPL-3+
 (except patch 2001 kept as BSD-2-clause or GPL-2+).
   * Add README.source covering use of CDBS and git-buildpackage.
+  * Update and extend coverage of main copyright holders, and add
+comment about misleading notes still at some places in source.
+  * Add patch 2002 to revive pre-0.5 use of Uglifyjs 1.x.
+  * Add NEWS file with entry echoing backwards-incompatible changes from
+upstream changelog.
 
   [ Andrew Harvey ]
-  * New upstream release.
+  * Refresh patch 2001.
 
- -- Andrew Harvey   Sat, 19 Jan 2013 09:16:51 +1100
+ -- Jonas Smedegaard   Sat, 19 Jan 2013 13:22:05 +0100
 
 leaflet (0.4.5-1) unstable; urgency=low
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 8fff444..06ef93e 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -5,17 +5,21 @@ Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
 Files: CHANGELOG.md
+ CONTRIBUTING.md
+ Jakefile.js
  README.md
  build/build.html
  build/build.js
  build/deps.js
- build/hint.js
  build/hintrc.js
+ debian/NEWS
  debian/README.source
  debian/compat
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/patches/2001-dont_test_during_build.patch
+ debian/patches/2002_use_old_uglifyjs.patch
  debian/patches/README
  debian/patches/series
  debian/source/format
@@ -32,9 +36,15 @@ Files: CHANGELOG.md
  debug/map/map.html
  debug/map/max-bounds.html
  debug/map/scroll.html
+ debug/map/simple-proj.html
  debug/map/wms-marble.html
  debug/map/wms.html
+ debug/map/zoomlevels.html
+ debug/tests/bringtoback.html
+ debug/tests/click_on_canvas.html
+ debug/tests/click_on_canvas_broken.html
  debug/tests/opacity.html
+ debug/tests/removetilewhilepan.html
  debug/vector/bounds-extend.html
  debug/vector/editable.html
  debug/vector/feature-group-bounds.html
@@ -51,16 +61,17 @@ Files: CHANGELOG.md
  debug/vector/vector.html
  dist/images/marker-icon.png
  dist/images/marker-shadow.png
- dist/images/zoom-in.png
- dist/images/zoom-out.png
  dist/leaflet.css
  dist/leaflet.ie.css
+ spec/happen.js
  spec/jasmine/jasmine-html.js
  spec/jasmine/jasmine.css
  spec/jasmine/jasmine.js
  spec/runner.html
  spec/suites/LeafletSpec.js
  spec/suites/SpecHelper.js
+ spec/suites/control/Control.LayersSpec.js
+ spec/suites/control/Control.ScaleSpec.js
  spec/suites/core/ClassSpec.js
  spec/suites/core/EventsSpec.js
  spec/suites/core/UtilSpec.js
@@ -73,6 +84,7 @@ Files: CHANGELOG.md
  spec/suites/geometry/PointSpec.js
  spec/suites/geometry/TransformationSpec.js
  spec/suites/layer/TileLayerSpec.js
+ spec/suites/layer/vector/CircleSpec.js
  spec/suites/layer/vector/PolylineGeometrySpec.js
  spec/suites/map/MapSpec.js
  src/Leaflet.js
@@ -87,12 +99,12 @@ Files: CHANGELOG.md
  src/core/Handler.js
  src/core/Util.js
  src/dom/DomEvent.DoubleTap.js
+ src/dom/DomEvent.MsTouch.js
  src/dom/DomEvent.js
  src/dom/DomUtil.js
  src/dom/Draggable.js
- src/dom/transition/Transition.Native.js
- src/dom/transition/Transition.Timer.js
- src/dom/transition/Transition.js
+ src/dom/PosAnimation.Timer.js
+ src/dom/PosAnimation.js
  src/geo/LatLng.js
  src/geo/LatLngBounds.js
  src/geo/crs/CRS.EPSG3395.js
@@ -109,6 +121,7 @@ Files: CHANGELOG.md
  src/geometry/Point.js
  src/geometry/PolyUtil.js
  src/geometry/Transformation.js
+ src/images/marker.svg
  src/layer/FeatureGroup.js
  src/layer/GeoJSON.js
  src/layer/ImageOverlay.js
@@ -156,12 +169,14 @@ License: UNKNOWN
 
 Files: dist/leaflet-src.js
  dist/leaflet.js
-Copyright: 2010-2012, CloudMade, Vladimir Agafonkin
+ src/copyright.js
+Copyright: 2010-2013, Vladimir Agafonkin, CloudMade
 License: UNKNOWN
  FIXME
 
 Files: LICENSE
-Copyright: 2010-2011, CloudMade, Vladimir Agafonkin
+Copyright: 2010-2011, CloudMade
+  2010-2013, Vladimir Agafonkin
   HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
SPECIAL
   HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 License: BSD-2-clause
@@ -179,15 +194,8 @@ Copyright: 2010-2013, Jonas Smedegaard 
 License: GPL-3+
  FIXME
 
-Files: Jakefile.js
-Copyright: + build.uglify(content)
-  + content
-  = '/*\n 2010-2012, CloudMa

[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit 779b6a4330dfbcd722eed376b93b7919807a9a47
Author: Jonas Smedegaard 
Date:   Sat Jan 19 10:31:48 2013 +0100

Fix typo in patch 2001 header.

diff --git a/debian/patches/2001-dont_test_during_build.patch 
b/debian/patches/2001-dont_test_during_build.patch
index 95d1f9d..ac98838 100644
--- a/debian/patches/2001-dont_test_during_build.patch
+++ b/debian/patches/2001-dont_test_during_build.patch
@@ -1,4 +1,4 @@
-Description: avoid running tests as jshlint isn't packaged
+Description: avoid running tests as jslint isn't packaged
 Author: Andrew Harvey 
 Forwarded: not-needed
 Last-Update: 2013-01-19

-- 
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.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit a7c44f284a05d369bc5c71680c887b52cdeec966
Author: Jonas Smedegaard 
Date:   Sat Jan 19 10:43:32 2013 +0100

Supress one more image from copyright check.

diff --git a/debian/rules b/debian/rules
index 5cc9119..da2df81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,8 @@ DEB_UPSTREAM_URL = https://github.com/Leaflet/Leaflet/archive
 DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)
 DEB_UPSTREAM_TARBALL_MD5 = 9b2afef5f3c4acc3c84cad8d31f75de1
 
-# Skip checking an image (in addition to the defaults)
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = 
^(dist/images/layers\.png|debian/(changelog|copyright(|_hints|_newhints)))$
+# Skip checking some images (in addition to the defaults)
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = 
^(dist/images/(layers|marker-icon@2x)\.png|debian/(changelog|copyright(|_hints|_newhints)))$
 
 # Put aside upstream shipped autogenerated files during build
 DEB_UPSTREAM_CRUFT_MOVE = dist/leaflet.js dist/leaflet-src.js

-- 
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.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit 68ed44b0f74cbe27e787da1a56386df502bdc06b
Author: Jonas Smedegaard 
Date:   Sat Jan 19 13:32:30 2013 +0100

Add NEWS file with entry echoing backwards-incompatible changes from 
upstream changelog.

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000..aa16702
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,14 @@
+leaflet (0.5-1) unstable; urgency=low
+
+  * This release includes the following backwards-incompatible changes:
+
++ Removed default 'LatLng' wrapping/clamping of coordinates
+  ('-180, -90' to '180, 90'), wrapping moved to an explicit method
+  ('LatLng' 'wrap').
++ Disabled 'Map' 'worldCopyJump' option by default (jumping back to
+  the original world copy when panning out of it). Enable it
+  explicitly if you need it.
++ Changed styles for the zoom control (you may need to update your
+  custom styles for it).
+
+ -- Jonas Smedegaard   Sat, 19 Jan 2013 13:22:05 +0100

-- 
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.5-1, created. debian/0.5-1

2013-02-14 Thread Jonas Smedegaard
The annotated tag, debian/0.5-1 has been created
at  5c1c4dc04d6188711581a83600acf981f9906f26 (tag)
   tagging  7f1fdf1191a9db4442fe7a617948518d1c5037a9 (commit)
  replaces  debian/0.4.5-1
 tagged by  Jonas Smedegaard
on  Sat Jan 19 13:36:08 2013 +0100

- Shortlog 
Debian release 0.5-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCgAGBQJQ+pM4AAoJECx8MUbBoAEhwEMQAI7ZOgCgF+kju4Ljuhju0t8n
tzLbIOoPOVAytMDclDmJeDWguWnZHqlMuzXoP3zlcMIN5Pe1GVrLsFTGacnd3Jrz
xndlq1nCgn3S+d2pNseePc/bMha6WAZTeDh4jvbMPM1VWfUUP+Uolwbxx+unsrX/
UaB2rimyupEYiYhp5sdFsVrgdabsi+eqzISbZM2FABDAzQMiakrXk64z1qJz9Qve
4FGm4Ub8eNU46Ly/G7Qw3jbc4Xuif69mFnpVBrvI7lNHARnkxycunRjv71Vv9HT0
GrG/WGvRtFfnYxjtGDPGoqIoMEFyT88UOfQg+fVf/jLmCude3WrpxBDJ22jC5Acj
/Yx3D84Lvxtg9tBlZGZNVQ8lRoZ33keG45bOM2W6UZ9vhsEy5hBcOwRhsKVm2Z6i
LJemG3m2WdchEr8+tuJYTQgOFzkrMk/fPw2+NjGzPiMF4L8mJ3RPqz0Dhj9hQcvT
s4bymUHn3jc1a4SIdYBKIAKFOCp5OiSBTyS35wCR5aP/lk+36X/8kh6IfvIoBct4
KPggQQIBtTqsDebjSO6786iKb99R2Vb7uKp+9K07+u4eKlb3Yy8CDPbtXviAucYh
2TU6uRooEavip89rK5ruV2U8P/t1cQxz33Ot9IDd0MUAn+undJXr8iN9sLRrCtcV
oyOieh9A/FxMAwLUGOn/
=Qp2y
-END PGP SIGNATURE-

Andrew Harvey (5):
  bump upstream version to 0.5
  Imported Upstream version 0.5
  Merge tag 'upstream/0.5'
  refresh patches
  bump dependency versions

Jonas Smedegaard (16):
  Update upstream URLs to reflect new Homepage and development project home.
  Tidy control file: Shorten Vcs-Git URL.
  Update short and long description based on upstream texts.
  Update upstream-tarball hints for current upstream source.
  Enable copyright check during normal builds. Build-depend on devscripts.
  Extend copyright coverage of packaging, and tighten to GPL-3+ (except 
patch 2001 kept as BSD-2-clause or GPL-2+).
  Add README.source covering use of CDBS and git-buildpackage.
  Update changelog, control file and copyright hints.
  Revert "bump dependency versions".
  Minimize patch 2001 to only avoid jslint, not eradicate its use in source.
  Fix typo in patch 2001 header.
  Supress one more image from copyright check.
  Update and extend coverage of main copyright holders, and add comment 
about misleading notes still at some places in source.
  Add patch 2002 to revive pre-0.5 use of Uglifyjs 1.x.
  Add NEWS file with entry echoing backwards-incompatible changes from 
upstream changelog.
  Prepare for release: Update changelog and copyright hints.

---

-- 
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.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit 5e6cb1beeb629ad01d629e129d7d456aa026307f
Author: Jonas Smedegaard 
Date:   Sat Jan 19 10:11:15 2013 +0100

Revert "bump dependency versions".

We can pick minifier independent from upstream, and uglifyjs2 is not yet
in Debian.

This reverts commit df68986df32009fa259fb20cf3a76a6622760dcc.

diff --git a/debian/changelog b/debian/changelog
index ede30b0..68f5dd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ leaflet (0.5-1) UNRELEASED; urgency=low
 
   [ Andrew Harvey ]
   * New upstream release.
-  * Bump dependency versions.
 
  -- Andrew Harvey   Sat, 19 Jan 2013 09:16:51 +1100
 
diff --git a/debian/control b/debian/control
index b53ac1b..287ceab 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: devscripts,
  cdbs (>= 0.4.106~),
  debhelper,
  dh-buildinfo,
- node-uglify2,
+ node-uglify,
  node-jake
 Standards-Version: 3.9.3
 Homepage: http://leafletjs.com/

-- 
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.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit f4c20110909b6da25683901713aca4006f1d8982
Author: Jonas Smedegaard 
Date:   Sat Jan 19 10:53:37 2013 +0100

Update and extend coverage of main copyright holders, and add comment about 
misleading notes still at some places in source.

diff --git a/debian/copyright b/debian/copyright
index 144b9b3..548df4e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,12 @@ Upstream-Contact: https://github.com/Leaflet/Leaflet/issues
 Source: https://github.com/Leaflet/Leaflet/
 
 Files: *
-Copyright: 2010-2012, CloudMade, Vladimir Agafonkin
+Copyright: 2010-2011, CloudMade
+  2010-2013, Vladimir Agafonkin
 License: BSD-2-clause
+Comment:
+ LICENSE file was updated on 2012-01-11 to clarify coverage of main
+ copyright holders, even if still written as a combo at other places.
 
 Files: spec/jasmine/*
 Copyright: 2008-2011, Pivotal Labs

-- 
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.4.5-1-21-g7f1fdf1

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit 54af272589f77f474665c6527f3c6e93629d78b9
Author: Jonas Smedegaard 
Date:   Sat Jan 19 10:30:47 2013 +0100

Minimize patch 2001 to only avoid jslint, not eradicate its use in source.

diff --git a/debian/patches/2001-dont_test_during_build.patch 
b/debian/patches/2001-dont_test_during_build.patch
index b323bcc..95d1f9d 100644
--- a/debian/patches/2001-dont_test_during_build.patch
+++ b/debian/patches/2001-dont_test_during_build.patch
@@ -3,84 +3,21 @@ Author: Andrew Harvey 
 Forwarded: not-needed
 Last-Update: 2013-01-19
 
 leaflet.orig/Jakefile.js
-+++ leaflet/Jakefile.js
-@@ -5,7 +5,6 @@
+--- a/Jakefile.js
 b/Jakefile.js
+@@ -18,6 +18,6 @@
+ task('lint', build.lint);
  
- npm install -g jake
- npm install uglify-js
--npm install jshint
- 
- To check the code and build Leaflet from source, run "jake"
- 
-@@ -14,10 +13,7 @@
- 
- var build = require('./build/build.js');
- 
--desc('Check Leaflet source for errors with JSHint');
--task('lint', build.lint);
--
  desc('Combine and compress Leaflet source files');
 -task('build', ['lint'], build.build);
-+task('build', [], build.build);
++task('build', build.build);
  
  task('default', ['build']);
 leaflet.orig/build/build.js
-+++ leaflet/build/build.js
-@@ -1,32 +1,10 @@
+--- a/build/build.js
 b/build/build.js
+@@ -1,5 +1,4 @@
  var fs = require('fs'),
 -jshint = require('jshint'),
  UglifyJS = require('uglify-js'),
  
  deps = require('./deps.js').deps,
- hintrc = require('./hintrc.js').config;
- 
- 
--function lintFiles(files) {
--
--  var errorsFound = 0,
--  i, j, len, len2, src, errors, e;
--
--  for (i = 0, len = files.length; i < len; i++) {
--
--  jshint.JSHINT(fs.readFileSync(files[i], 'utf8'), hintrc);
--  errors = jshint.JSHINT.errors;
--
--  for (j = 0, len2 = errors.length; j < len2; j++) {
--  e = errors[j];
--  console.log(files[i] + '\tline ' + e.line + '\tcol ' + 
e.character + '\t ' + e.reason);
--  }
--
--  errorsFound += len2;
--  }
--
--  return errorsFound;
--}
--
- function getFiles(compsBase32) {
-   var memo = {},
-   comps;
-@@ -64,23 +42,6 @@
-   return files;
- }
- 
--exports.lint = function () {
--
--  var files = getFiles();
--
--  console.log('Checking for JS errors...');
--
--  var errorsFound = lintFiles(files);
--
--  if (errorsFound > 0) {
--  console.log(errorsFound + ' error(s) found.\n');
--  fail();
--  } else {
--  console.log('\tCheck passed');
--  }
--};
--
--
- function getSizeDelta(newContent, oldContent) {
-   if (!oldContent) {
-   return 'new';

-- 
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.5-1-6-gf962eff

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit 303d34af9ae65706731cf586a81fe98d456ba523
Author: Jonas Smedegaard 
Date:   Thu Feb 14 13:12:53 2013 +0100

Extend git-buildpackage config to ignore upstream .gitignore files.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index a7281f9..790a2f9 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,3 +3,6 @@
 [DEFAULT]
 pristine-tar = True
 sign-tags = True
+
+[git-import-orig]
+filter = .gitignore

-- 
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.5-1-6-gf962eff

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit f962eff912d25cee5e9e4d3f7a47401171aa2e03
Author: Jonas Smedegaard 
Date:   Thu Feb 14 13:24:54 2013 +0100

Prepare for release: Update changelog.

diff --git a/debian/changelog b/debian/changelog
index fb15546..245dcfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+leaflet (0.5.1-1) unstable; urgency=low
+
+  [ upstream ]
+  * New release.
++ Fix bug properly detecting default marker icon path in some cases
+  in IE6 and IE7.
++ Fix bug handling null objects in Map hasLayer.
++ Fix bug escaping TileLayer.WMS param values in URLs.
+
+  [ Jonas Smedegaard ]
+  * Ignore upstream .gitignore files.
+
+ -- Jonas Smedegaard   Thu, 14 Feb 2013 13:21:41 +0100
+
 leaflet (0.5-1) unstable; urgency=low
 
   [ upstream ]

-- 
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, pristine-tar, updated. dac0629d59f69175c741af7019558a94100e761e

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the pristine-tar branch:
commit dac0629d59f69175c741af7019558a94100e761e
Author: Jonas Smedegaard 
Date:   Thu Feb 14 13:13:44 2013 +0100

pristine-tar data for leaflet_0.5.1.orig.tar.gz

diff --git a/leaflet_0.5.1.orig.tar.gz.delta b/leaflet_0.5.1.orig.tar.gz.delta
new file mode 100644
index 000..a6fec4c
Binary files /dev/null and b/leaflet_0.5.1.orig.tar.gz.delta differ
diff --git a/leaflet_0.5.1.orig.tar.gz.id b/leaflet_0.5.1.orig.tar.gz.id
new file mode 100644
index 000..ff7c76d
--- /dev/null
+++ b/leaflet_0.5.1.orig.tar.gz.id
@@ -0,0 +1 @@
+4256431ad5db4d591587337d47552bd44cf0ec22

-- 
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.5.1-1, created. debian/0.5.1-1

2013-02-14 Thread Jonas Smedegaard
The annotated tag, debian/0.5.1-1 has been created
at  9c4d05ad33dde6be0501f6ccd430024e77b4449f (tag)
   tagging  f962eff912d25cee5e9e4d3f7a47401171aa2e03 (commit)
  replaces  debian/0.5-1
 tagged by  Jonas Smedegaard
on  Thu Feb 14 13:26:02 2013 +0100

- Shortlog 
Debian release 0.5.1-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQEcBAABCgAGBQJRHNfaAAoJEE7BtyI3T5vWJfQH/0zF0MyjWAppcXCNh0pd43Y2
B2uTiA5ckajdYM6V6K6QlyoJ3QBnKyjT/sVpwZpllsMthPRNLm6eI4/QFxDIsI8F
ISS5v9l+o8OzVOwHlzh5E37AEUOFKX0sQiHNrFmUT6dVS2h6IwwZbYA86Or4Ffrf
HqEaCLHuuPggGgNOuRdAzTNuqHBX7gp2qIljqHTE6aoJ9aCSeW8VWTWMNtQJcfj0
6AWpLxQI0G0gyW8AbViCzFrYtFyUZvKCnawgHwDVM2ZI4K37RJMhBg8G1ruiXH69
P64xnQXJQ6+7/pY5HQLd+/HzOxpgmPpyDyLzRb8j5Zle6gxCOC580JEC5gENe6c=
=jbc9
-END PGP SIGNATURE-

Jonas Smedegaard (6):
  Extend git-buildpackage config to ignore upstream .gitignore files.
  Strip upstream parts of .gitignore file.
  Imported Upstream version 0.5.1
  Merge tag 'upstream/0.5.1'
  Update upstream-tarball hints for current upstream source.
  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


[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5-1-6-gf962eff

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit e82eacb459e0b635473288cde83dc988622d934a
Author: Jonas Smedegaard 
Date:   Thu Feb 14 13:13:33 2013 +0100

Strip upstream parts of .gitignore file.

diff --git a/.gitignore b/.gitignore
index fcbe042..b408e6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1 @@
 /.pc
-node_modules
-.DS_Store
-tmp/**/*
-.idea
-.idea/**/*
-*.iml
-*.sublime-*
-_site
-dist/*.js

-- 
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.5.1, created. upstream/0.5.1

2013-02-14 Thread Jonas Smedegaard
The annotated tag, upstream/0.5.1 has been created
at  68bb6ec8273f9888b2cd54de05e9e1b9e0ff5d08 (tag)
   tagging  f55784b879b91d5be0f461644d47eefb1a73f8d6 (commit)
  replaces  upstream/0.5
 tagged by  Jonas Smedegaard
on  Thu Feb 14 13:13:44 2013 +0100

- Shortlog 
Upstream version 0.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQEcBAABCgAGBQJRHNT4AAoJEE7BtyI3T5vWATsH+wXNWFwtSip+TIAUdy8x6pr6
RM9sdEPECDfzkAISmuwUedAzgnGxRVgYB4DSzDNOB5Mlno6nTdFi8231x/5QRou3
o1zmDOhI4m3pNnNriACwrxLnXqsPzaKYmXXM2ytAz50t532QneuS+hFomp60GmcM
0dAxb/xaZGN4AMlke1L+D6M9HuQWRnQNvOq1HKlrTiHdCVZpZnQXdkY6ZCWPr6vY
2iVmsfzKsxJJlM7XC51tMGOLmrgfLR32t2m1w1V6UM6utB56fFg5gmrKKwilyE3i
LhqejWVAWu1/ctqYoN3qjV1OPvjN8MxzFo7CqxTA809kKNfMKKC5KJgtX9gLLwg=
=Iv10
-END PGP SIGNATURE-

Jonas Smedegaard (1):
  Imported Upstream version 0.5.1

---

-- 
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.5-1-6-gf962eff

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit e7dffc34241b775a025090030d7eaa189ec185a0
Merge: e82eacb459e0b635473288cde83dc988622d934a 
f55784b879b91d5be0f461644d47eefb1a73f8d6
Author: Jonas Smedegaard 
Date:   Thu Feb 14 13:14:09 2013 +0100

Merge tag 'upstream/0.5.1'

Upstream version 0.5.1

Conflicts (manually resolved):
.gitignore


-- 
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.5-1-6-gf962eff

2013-02-14 Thread Jonas Smedegaard
The following commit has been merged in the master branch:
commit a560589bcf483058a13b9291dddbe17c289f4a55
Author: Jonas Smedegaard 
Date:   Thu Feb 14 13:14:46 2013 +0100

Update upstream-tarball hints for current upstream source.

diff --git a/debian/rules b/debian/rules
index da2df81..add215c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ CDBS_BUILD_DEPENDS += , node-uglify , node-jake
 
 DEB_UPSTREAM_URL = https://github.com/Leaflet/Leaflet/archive
 DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION)
-DEB_UPSTREAM_TARBALL_MD5 = 9b2afef5f3c4acc3c84cad8d31f75de1
+DEB_UPSTREAM_TARBALL_MD5 = ac54371aa1db3ac51255f5247e113469
 
 # Skip checking some images (in addition to the defaults)
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = 
^(dist/images/(layers|marker-icon@2x)\.png|debian/(changelog|copyright(|_hints|_newhints)))$

-- 
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