[Pkg-cli-libs-commits] [flickrnet] 01/03: Include ABI version in .pc filename in accordance with CLI Policy 3.2.4

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Wed Apr 19 11:42:24 UTC 2017


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

mans0954 pushed a commit to branch master
in repository flickrnet.

commit 0806a1043894b81ee9d76bbc00a1eada0c59e78c
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Wed Apr 19 11:40:36 2017 +0100

    Include ABI version in .pc filename in accordance with CLI Policy 3.2.4
---
 debian/changelog                    |  1 +
 debian/control                      |  2 +-
 debian/libflickrnet-cil-dev.install |  1 -
 debian/rules                        | 10 ++++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d98b5f..24587a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ 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 
 
  -- Christopher Hoskin <mans0954 at debian.org>  Mon, 17 Apr 2017 18:12:06 +0100
 
diff --git a/debian/control b/debian/control
index 93b6e1d..3dead81 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: Flickr.Net API Library
  .
  This package contains the Flickr.Net library
 
-Package: libflickrnet-cil-dev
+Package: libflickrnet2.2-cil-dev
 Architecture: all
 Depends: libflickrnet2.2-cil (= ${binary:Version}), ${misc:Depends}
 Replaces: libflickrnet2.2-cil (<< 1:2.2.0-2)
diff --git a/debian/libflickrnet-cil-dev.install b/debian/libflickrnet-cil-dev.install
deleted file mode 100644
index 10c8cf0..0000000
--- a/debian/libflickrnet-cil-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/pkgconfig/flickrnet.pc
diff --git a/debian/rules b/debian/rules
index d50ff9a..f402271 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,10 +26,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.pc
-	sed -i "s/@VERSION@/$(VERSION)/g" $(DEB_DESTDIR)/usr/lib/pkgconfig/flickrnet.pc
+	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/
+
+override_dh_link:
+	dh_link -plibflickrnet$(VERSION)-cil-dev /usr/lib/pkgconfig/flickrnet-$(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



More information about the Pkg-cli-libs-commits mailing list