[Python-modules-commits] r29335 - in packages/qscintilla2/trunk/debian (changelog rules)

[kitterman at users.alioth.debian.org]

    Date: Saturday, June 14, 2014 @ 15:01:15
  Author: kitterman
Revision: 29335

* Correct location and content of qscintilla2.prf for Qt5 build
  (Closes:  #751531)
  - Set libqt5scintilla2 in LIBS if debug is enabled in qscintilla2.prf
  - Change qscintilla2.prf from usr/share to usr/lib so Qt5 finds it

Modified:
  packages/qscintilla2/trunk/debian/changelog
  packages/qscintilla2/trunk/debian/rules

Modified: packages/qscintilla2/trunk/debian/changelog
===================================================================
--- packages/qscintilla2/trunk/debian/changelog	2014-06-14 14:51:42 UTC (rev 29334)
+++ packages/qscintilla2/trunk/debian/changelog	2014-06-14 15:01:15 UTC (rev 29335)
@@ -1,6 +1,9 @@
 qscintilla2 (2.8.2+dfsg-3) UNRELEASED; urgency=medium
 
-  * Set libqt5scintilla2 in LIBS if debug is enabled in qscintilla2.prf
+  * Correct location and content of qscintilla2.prf for Qt5 build
+    (Closes:  #751531)
+    - Set libqt5scintilla2 in LIBS if debug is enabled in qscintilla2.prf
+    - Change qscintilla2.prf from usr/share to usr/lib so Qt5 finds it
 
  -- Scott Kitterman <scott at kitterman.com>  Sat, 14 Jun 2014 10:37:34 -0400
 

Modified: packages/qscintilla2/trunk/debian/rules
===================================================================
--- packages/qscintilla2/trunk/debian/rules	2014-06-14 14:51:42 UTC (rev 29334)
+++ packages/qscintilla2/trunk/debian/rules	2014-06-14 15:01:15 UTC (rev 29335)
@@ -131,13 +131,12 @@
 ifeq ($(qt5), "yes")
 	cd QSciQt5 && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/libqt5scintilla2-$(SONAME) install
 	mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/include/$(DEB_HOST_MULTIARCH)/qt5/Qsci
-	mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib
-	mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/share/qt5/mkspecs/features
+	mkdir -p $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
 	mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/api/python3
 	mv $(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
-	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/share/qt5/mkspecs/features
+	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
 	mkdir -p $(CURDIR)/debian/libqt5scintilla2-l10n/usr/share/qt5/translations
 	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/share/qt5/translations/* $(CURDIR)/debian/libqt5scintilla2-l10n/usr/share/qt5/translations
 	mkdir -p $(CURDIR)/debian/libqscintilla2-doc/usr/share/qt5/qsci/api/python