[Pkg-cli-libs-commits] [flickrnet] 02/03: Rename VERSION variable DEB_CLI_ABI_VERSION in debian/rules

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository flickrnet.

commit 7f0c805fcb1d91bdcb6925c2b22134a22831026e
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Wed Apr 19 12:19:06 2017 +0100

    Rename VERSION variable DEB_CLI_ABI_VERSION in debian/rules
---
 debian/changelog    |  1 +
 debian/flickrnet.pc |  4 ++--
 debian/rules        | 18 +++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24587a1..f8c67fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ flickrnet (1:3.24+dfsg-1) UNRELEASED; urgency=medium
   * Update homepage and versioned dependencies in debian/control 
   * Bump Standards Version from 3.9.2 to 3.9.8 (no change necessary) 
   * Include ABI version in .pc filename in accordance with CLI Policy 3.2.4 
+  * Rename VERSION variable DEB_CLI_ABI_VERSION in debian/rules
 
  -- Christopher Hoskin <mans0954 at debian.org>  Mon, 17 Apr 2017 18:12:06 +0100
 
diff --git a/debian/flickrnet.pc b/debian/flickrnet.pc
index 1fae161..5b47b1d 100644
--- a/debian/flickrnet.pc
+++ b/debian/flickrnet.pc
@@ -3,5 +3,5 @@ libdir=${prefix}/lib
 
 Name: flickrnet
 Description: Flickr.Net API Library
-Version: @VERSION@
-Libs: -r:${libdir}/cli/FlickrNet- at VERSION@/FlickrNet.dll
+Version: @DEB_CLI_ABI_VERSION@
+Libs: -r:${libdir}/cli/FlickrNet- at DEB_CLI_ABI_VERSION@/FlickrNet.dll
diff --git a/debian/rules b/debian/rules
index f402271..a745074 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 #Keep version as 2.2 until we determine the correct version
-VERSION=2.2
+DEB_CLI_ABI_VERSION=2.2
 DEB_DESTDIR=debian/tmp
 
 %:
@@ -25,16 +25,16 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 #Install to debian/tmp
-	install -D FlickrNet/bin/Release/FlickrNet.dll $(DEB_DESTDIR)/usr/lib/cli/FlickrNet-$(VERSION)/FlickrNet.dll 
-	install -m644 -D debian/flickrnet.pc $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet-$(VERSION).pc
-	sed -i "s/@VERSION@/$(VERSION)/g" $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet-$(VERSION).pc
-#Install to debian/libflickrnet$(VERSION)-cil
-	dh_install -plibflickrnet$(VERSION)-cil $(DEB_DESTDIR)/usr/lib/cli/FlickrNet-$(VERSION)/FlickrNet.dll /usr/lib/cli/FlickrNet-$(VERSION)/
-#Install to debian/libflickrnet$(VERSION)-cil-dev
-	dh_install -plibflickrnet$(VERSION)-cil-dev $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet-$(VERSION).pc /usr/lib/pkgconfig/
+	install -D FlickrNet/bin/Release/FlickrNet.dll $(DEB_DESTDIR)/usr/lib/cli/FlickrNet-$(DEB_CLI_ABI_VERSION)/FlickrNet.dll 
+	install -m644 -D debian/flickrnet.pc $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet-$(DEB_CLI_ABI_VERSION).pc
+	sed -i "s/@DEB_CLI_ABI_VERSION@/$(DEB_CLI_ABI_VERSION)/g" $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet-$(DEB_CLI_ABI_VERSION).pc
+#Install to debian/libflickrnet$(DEB_CLI_ABI_VERSION)-cil
+	dh_install -plibflickrnet$(DEB_CLI_ABI_VERSION)-cil $(DEB_DESTDIR)/usr/lib/cli/FlickrNet-$(DEB_CLI_ABI_VERSION)/FlickrNet.dll /usr/lib/cli/FlickrNet-$(DEB_CLI_ABI_VERSION)/
+#Install to debian/libflickrnet$(DEB_CLI_ABI_VERSION)-cil-dev
+	dh_install -plibflickrnet$(DEB_CLI_ABI_VERSION)-cil-dev $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet-$(DEB_CLI_ABI_VERSION).pc /usr/lib/pkgconfig/
 
 override_dh_link:
-	dh_link -plibflickrnet$(VERSION)-cil-dev /usr/lib/pkgconfig/flickrnet-$(VERSION).pc /usr/lib/pkgconfig/flickrnet.pc
+	dh_link -plibflickrnet$(DEB_CLI_ABI_VERSION)-cil-dev /usr/lib/pkgconfig/flickrnet-$(DEB_CLI_ABI_VERSION).pc /usr/lib/pkgconfig/flickrnet.pc
 	dh_link
 
 override_dh_auto_clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/flickrnet.git