[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.4.5-1-8-gb691156
The following commit has been merged in the master branch:
commit 7a6dc921b892a801f41ea6576922be1f0beece9b
Author: Jonas Smedegaard d...@jones.dk
Date: Fri Jan 11 16:01:46 2013 +0100
Update short and long description based on upstream texts.
diff --git a/debian/control.in b/debian/control.in
index 50239d5..ed19453 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,7 +14,14 @@ Package: libjs-leaflet
Architecture: all
Depends: ${misc:Depends}
Recommends: javascript-common
-Description: JavaScript library for displaying map data in web browsers
- Leaflet is a modern JavaScript library for interactive maps on both desktop
- and mobile browsers by CloudMade.
-
+Description: JavaScript library for mobile-friendly interactive maps
+ Leaflet is a modern JavaScript library for mobile-friendly interactive
+ maps. Weighing just about 27 KB of JS code, it has all the features
+ most developers ever need for online maps.
+ .
+ Leaflet is designed with simplicity, performance and usability in mind.
+ It works efficiently across all major desktop and mobile platforms out
+ of the box, taking advantage of HTML5 and CSS3 on modern browsers while
+ still being accessible on older ones. It can be extended with many
+ plugins, has a beautiful, easy to use and well-documented API and a
+ simple, readable source code that is a joy to contribute to.
--
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-8-gb691156
The following commit has been merged in the master branch: commit f724984120fac0ba21c56d0e4b72b334412f72aa Author: Jonas Smedegaard d...@jones.dk Date: Fri Jan 11 15:57:12 2013 +0100 Tidy control file: Shorten Vcs-Git URL. diff --git a/debian/control.in b/debian/control.in index 0d2e2c6..50239d5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -7,7 +7,7 @@ Uploaders: Andrew Harvey andrew.harv...@gmail.com, Build-Depends: @cdbs@ Standards-Version: 3.9.3 Homepage: http://leafletjs.com/ -Vcs-Git: git://git.debian.org/pkg-osm/leaflet.git +Vcs-Git: git://git.debian.org/pkg-osm/leaflet Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/leaflet.git Package: libjs-leaflet -- 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-8-gb691156
The following commit has been merged in the master branch: commit e7cc7c16a28cb3f00c9ee0dc7da1630da5d42a16 Author: Jonas Smedegaard d...@jones.dk Date: Fri Jan 11 16:11:45 2013 +0100 Enable copyright check during normal builds. Build-depend on devscripts. diff --git a/debian/rules b/debian/rules index 1374a0e..48516c8 100755 --- a/debian/rules +++ b/debian/rules @@ -24,10 +24,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk libname = leaflet pkg = libjs-leaflet -# suppress optional build-dependencies -CDBS_BUILD_DEPENDS_rules_upstream-tarball = -CDBS_BUILD_DEPENDS_rules_utils_copyright-check = - CDBS_BUILD_DEPENDS += , node-uglify , node-jake DEB_UPSTREAM_URL = https://github.com/Leaflet/Leaflet/archive -- 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-8-gb691156
The following commit has been merged in the master branch: commit fa8a05113eed761db44f62d55efe0c46f5de4be7 Author: Jonas Smedegaard d...@jones.dk Date: Fri Jan 11 13:51:11 2013 +0100 Update upstream URLs to reflect new Homepage and development project home. diff --git a/debian/control.in b/debian/control.in index fd803fe..0d2e2c6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,7 +6,7 @@ Uploaders: Andrew Harvey andrew.harv...@gmail.com, Jonas Smedegaard d...@jones.dk Build-Depends: @cdbs@ Standards-Version: 3.9.3 -Homepage: http://leaflet.cloudmade.com/ +Homepage: http://leafletjs.com/ Vcs-Git: git://git.debian.org/pkg-osm/leaflet.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-osm/leaflet.git diff --git a/debian/copyright b/debian/copyright index 969acf4..f5d559d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Leaflet -Upstream-Contact: https://github.com/CloudMade/Leaflet/issues -Source: https://github.com/CloudMade/Leaflet/ +Upstream-Contact: https://github.com/Leaflet/Leaflet/issues +Source: https://github.com/Leaflet/Leaflet/ Files: * Copyright: 2010-2012, CloudMade, Vladimir Agafonkin diff --git a/debian/rules b/debian/rules index 546d98b..9e6c494 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ CDBS_BUILD_DEPENDS_rules_utils_copyright-check = CDBS_BUILD_DEPENDS += , node-uglify , node-jake -DEB_UPSTREAM_URL = https://github.com/CloudMade/Leaflet/archive +DEB_UPSTREAM_URL = https://github.com/Leaflet/Leaflet/archive DEB_UPSTREAM_TARBALL_BASENAME = v$(DEB_UPSTREAM_TARBALL_VERSION) DEB_UPSTREAM_WGET_OPTS += --no-check-certificate DEB_UPSTREAM_TARBALL_MD5 = 988f242c5aa76f0389798cd3e8f2c7cd diff --git a/debian/watch b/debian/watch index 9174e3f..85e3c3b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -https://github.com/CloudMade/Leaflet/tags .*/archive/v?(\d[\d\.]+).tar.gz +https://github.com/Leaflet/Leaflet/tags .*/archive/v?(\d[\d\.]+).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.4.5-1-8-gb691156
The following commit has been merged in the master branch: commit 3597d7639b9ff60a4fb9343ca0383f04376b2a8d Author: Jonas Smedegaard d...@jones.dk Date: Fri Jan 11 16:22:42 2013 +0100 Add README.source covering use of CDBS and git-buildpackage. diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000..63f32b1 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +CDBS+git-buildpackage +- + +This source package uses CDBS and git-buildpackage. + +More info here: http://wiki.debian.org/CDBS+git-buildpackage + + + -- Jonas Smedegaard d...@jones.dk Wed, 14 Nov 2012 18:34:55 +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 branch, master, updated. debian/0.4.5-1-8-gb691156
The following commit has been merged in the master branch: commit 691b70a75c4d62bbb2753fc5bbe4df0ac3fb3ce6 Author: Jonas Smedegaard d...@jones.dk Date: Fri Jan 11 16:15:10 2013 +0100 Extend copyright coverage of packaging, and tighten to GPL-3+ (except patch 2001 kept as BSD-2-clause or GPL-2+). diff --git a/debian/copyright b/debian/copyright index f5d559d..144b9b3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,13 +12,13 @@ Copyright: 2008-2011, Pivotal Labs License: Expat Files: debian/* -Copyright: 2011 Andrew Harvey andrew.harv...@gmail.com -License: BSD-2-clause or GPL-2+ - -Files: debian/rules Copyright: 2011, Andrew Harvey andrew.harv...@gmail.com - 2010-2011, Jonas Smedegaard d...@jones.dk -License: GPL-2+ + 2010-2013, Jonas Smedegaard d...@jones.dk +License: GPL-3+ + +Files: debian/patches/2001-dont_test_during_build.patch +Copyright: 2012, Andrew Harvey andrew.harv...@gmail.com +License: BSD-2-clause or GPL-2+ License: BSD-2-clause All rights reserved. @@ -85,3 +85,19 @@ License: GPL-2+ . You should have received a copy of the 'GNU General Public License' along with this program. If not, see http://www.gnu.org/licenses/. + +License: GPL-3+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3 of the License, or (at your + option) any later version. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + Comment: + . + On Debian systems the 'GNU General Public License' version 3 is located + in '/usr/share/common-licenses/GPL-3'. diff --git a/debian/rules b/debian/rules index 48516c8..f43a0a5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,12 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -# Copyright 2010, 2011 Jonas Smedegaard d...@jones.dk -# Copyright 2011 Andrew Harvey andrew.harv...@gmail.com +# Copyright © 2010, 2011, 2012, 2013 Jonas Smedegaard d...@jones.dk +# Copyright © 2011 Andrew Harvey andrew.harv...@gmail.com # Description: Main Debian packaging script for Leaflet # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, but -- 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
