The following commit has been merged in the master branch:
commit cd19ca9c2f87cc3870c6bdcc3794f12d30326621
Author: Jonas Smedegaard <d...@jones.dk>
Date:   Thu Jun 21 19:41:30 2012 +0200

    Tidy rules file: shorten internal variable; improve header syntactically; 
drop unused parts.

diff --git a/debian/rules b/debian/rules
index ed6bd52..18ac783 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2010-2011, Jonas Smedegaard <d...@jones.dk>
-#             2011,      Andrew Harvey <andrew.harv...@gmail.com>
-# Description: Main Debian packaging script for leaflet
+# Copyright 2010, 2011 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
@@ -22,7 +22,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 libname = leaflet
-libpkgname = libjs-leaflet
+pkg = libjs-leaflet
 
 # suppress optional build-dependencies
 CDBS_BUILD_DEPENDS_rules_upstream-tarball =
@@ -40,18 +40,11 @@ DEB_UPSTREAM_TARBALL_MD5 =
 DEB_UPSTREAM_REPACKAGE_EXCLUDES = ./lib/ ./dist/leaflet.js 
./dist/leaflet-src.js
 DEB_UPSTREAM_TARBALL_SRCDIR = CloudMade-Leaflet-538dfb4
 
-# suppress checking binary files, to not upset dpkg-source
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = 
^(.*/\..*\.swp|.*\?.*|debian/(changelog|copyright(|_hints|_newhints)))$
-
 js-destdir = /usr/share/javascript/$(libname)
 
-DEB_DH_INSTALL_ARGS_DEFAULT = dist/* $(js-destdir)
+DEB_DH_INSTALL_ARGS_$(pkg) = dist/* $(js-destdir)
 
-build/$(libpkgname)::
+build/$(pkg)::
        jake
 clean::
        rm -f dist/leaflet.js dist/leaflet-src.js
-
-# No files here should be set executable
-#common-binary-fixup-indep::
-#      chmod -R a-x,a+X $(cdbs_curdestdir)

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

Reply via email to