[Pkg-cli-libs-commits] [flickrnet] 01/02: Revert change "Include ABI version in .pc filename in accordance with CLI Policy 3.2.4" This portion of the policy no longer applies

[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 d4c8934876e0f46e7da158f6518f9dcf7385db35
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Wed Apr 19 17:26:38 2017 +0100

    Revert change "Include ABI version in .pc filename in accordance with CLI Policy 3.2.4"
     This portion of the policy no longer applies
---
 debian/changelog                    | 1 -
 debian/control                      | 2 +-
 debian/libflickrnet-cil-dev.install | 1 +
 debian/rules                        | 9 ++-------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94785a6..7e48367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,6 @@ flickrnet (1:3.24+dfsg-1) UNRELEASED; urgency=medium
   * Switch debian/rules from CDBS to dh, use xbuild for build 
   * 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
   * Bump DEB_CLI_ABI_VERSION from 2.2 to 3.24
   * Add myself to uploaders 
diff --git a/debian/control b/debian/control
index dc6fb16..bb563dc 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Description: Flickr.Net API Library
  .
  This package contains the Flickr.Net library
 
-Package: libflickrnet3.24-cil-dev
+Package: libflickrnet-cil-dev
 Architecture: all
 Depends: libflickrnet3.24-cil (= ${binary:Version}), ${misc:Depends}
 Description: Flickr.Net API Library -- development
diff --git a/debian/libflickrnet-cil-dev.install b/debian/libflickrnet-cil-dev.install
new file mode 100644
index 0000000..10c8cf0
--- /dev/null
+++ b/debian/libflickrnet-cil-dev.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/pkgconfig/flickrnet.pc
diff --git a/debian/rules b/debian/rules
index 25b9684..6d7cfff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,16 +25,11 @@ 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-$(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 -m644 -D debian/flickrnet.pc $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet.pc
+	sed -i "s/@DEB_CLI_ABI_VERSION@/$(DEB_CLI_ABI_VERSION)/g" $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet.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$(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:
 	xbuild /p:Configuration=Release /t:Clean FlickrNet/FlickrNet.csproj

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