[SCM] libshout/master: Tidy variable names in rules file.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8f37fbbaefc600b219d1ab29975b158cfef328ee
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 30 20:23:20 2013 +0100

    Tidy variable names in rules file.

diff --git a/debian/rules b/debian/rules
index 114dd64..39ea1c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,9 +30,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 stem = shout
 abi = 3
 pkg = lib$(stem)
-libname = lib$(stem)
-libpkgname = lib$(stem)$(abi)
-devpkgname = lib$(stem)$(abi)-dev
+lib = lib$(stem)
+libpkg = lib$(stem)$(abi)
+devpkg = lib$(stem)$(abi)-dev
 
 # Needed at build time by upstream code
 CDBS_BUILD_DEPENDS += , libogg-dev, libvorbis-dev, pkg-config
@@ -53,13 +53,13 @@ DEB_UPSTREAM_PACKAGE = $(pkg)
 DEB_UPSTREAM_URL = http://downloads.us.xiph.org/releases/$(pkg)
 DEB_UPSTREAM_TARBALL_MD5 = 11765b2592e7ea623ccd93d3f8df172c
 
-DEB_INSTALL_EXAMPLES_$(devpkgname) = examples/example.c
+DEB_INSTALL_EXAMPLES_$(devpkg) = examples/example.c
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 # avoid unneeded .la file
-binary-post-install/$(libpkgname):: debian/stamp-local-strip-la
-debian/stamp-local-strip-la: binary-install/$(libpkgname)
+binary-post-install/$(libpkg):: debian/stamp-local-strip-la
+debian/stamp-local-strip-la: binary-install/$(libpkg)
 	find debian -type f -name '*.la' -delete
 	touch $@
 clean::
@@ -67,18 +67,18 @@ clean::
 
 # Let d-shlibs calculate development package dependencies
 #  and handle shared library install
-binary-post-install/$(libpkgname) binary-post-install/$(devpkgname):: debian/stamp-local-shlibs-$(libname)
-debian/stamp-local-shlibs-$(libname): binary-install/$(libpkgname) binary-install/$(devpkgname) debian/stamp-local-strip-la
+binary-post-install/$(libpkg) binary-post-install/$(devpkg):: debian/stamp-local-shlibs-$(lib)
+debian/stamp-local-shlibs-$(lib): binary-install/$(libpkg) binary-install/$(devpkg) debian/stamp-local-strip-la
 	d-shlibmove --commit \
 		--multiarch \
 		--override s/ld1-dev// \
 		--movedev "debian/tmp/usr/include/*" usr/include/ \
 		--movedev "debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*" \
 			usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(libname).so
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(lib).so
 	touch $@
 clean::
-	rm -f debian/stamp-local-shlibs-$(libname)
+	rm -f debian/stamp-local-shlibs-$(lib)
 
 # put aside autogenerated files during build
 # TODO: use DEB_UPSTREAM_CRUFT_MOVE when cdbs 0.4.106 is in stable

-- 
libshout packaging