[Pkg-osm-commits] [SCM] leaflet branch, master, updated. debian/0.5-1-6-gf962eff
The following commit has been merged in the master branch: commit 303d34af9ae65706731cf586a81fe98d456ba523 Author: Jonas Smedegaard d...@jones.dk 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
The following commit has been merged in the master branch: commit e7dffc34241b775a025090030d7eaa189ec185a0 Merge: e82eacb459e0b635473288cde83dc988622d934a f55784b879b91d5be0f461644d47eefb1a73f8d6 Author: Jonas Smedegaard d...@jones.dk 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
The following commit has been merged in the master branch: commit a560589bcf483058a13b9291dddbe17c289f4a55 Author: Jonas Smedegaard d...@jones.dk 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
