[Python-modules-commits] [qscintilla2] 13/14: Update debian/rules to account for Qt5 prf file being installed in usr/lib instead of usr/share by the upstream build system

[Scott Kitterman]

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

kitterman pushed a commit to branch master
in repository qscintilla2.

commit e03800aaca0114bd7f408524e296dc46d48e9869
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Oct 29 13:30:20 2015 -0400

    Update debian/rules to account for Qt5 prf file being installed in usr/lib instead of usr/share by the upstream build system
---
 debian/changelog | 4 +++-
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e0058c..ee15aac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qscintilla2 (2.9.1+dfsg-1) unstable; urgency=medium
 
   [ Scott Kitterman ]
   * New upstream release (Closes: #803142)
+  * Update debian/rules to account for Qt5 prf file being installed in usr/lib
+    instead of usr/share by the upstream build system
 
   [ SVN-Git Migration ]
   * Migrate packaging to git with git-dpm
@@ -9,7 +11,7 @@ qscintilla2 (2.9.1+dfsg-1) unstable; urgency=medium
   [ Michael Cree ]
   * Update symbols files for Alpha
 
- -- Scott Kitterman <scott at kitterman.com>  Thu, 29 Oct 2015 13:09:01 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 29 Oct 2015 13:29:29 -0400
 
 qscintilla2 (2.9+dfsg-9) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index df60db7..98651ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,7 +182,7 @@ ifeq ($(qt5), "yes")
 	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/*.h $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci/
 	rm -rf $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/include
 	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/*.so $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib
-	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
+	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
 	cd designer-Qt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/libqt5scintilla2-designer install
 	mkdir -p $(CURDIR)/debian/libqt5scintilla2-l10n/usr/share/qt5/translations
 	cp $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/translations/* $(CURDIR)/debian/libqt5scintilla2-l10n/usr/share/qt5/translations

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git