[Python-modules-commits] [qscintilla2] 02/03: Rework getting the libqt5scintilla2 prf file in the -dev package so an empty directory isn't left.

[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 6461379eb55769311be469b0ff9543a20a17bce3
Author: Scott Kitterman <scott at kitterman.com>
Date:   Fri Oct 30 10:00:35 2015 -0400

    Rework getting the libqt5scintilla2 prf file in the -dev package so an empty directory isn't left.
---
 debian/changelog | 4 ++--
 debian/rules     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0bd833..9e2c5d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 qscintilla2 (2.9.1+dfsg-3) UNRELEASED; urgency=medium
 
-  * mv rather that cp the Qt5 prf file in debian/rules so it doesn't end up
-    installed in two packages
+  * rm the mkspecs dir from libqt5scintilla2-12v5 in debian/rules so the prf
+    file doesn't end up installed in two packages
   * Version libqt5scintilla2-dev Breaks/Replaces on libqt5scintilla2-12v5
     to make fixed packages installable
 
diff --git a/debian/rules b/debian/rules
index 43b35a1..e357f6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,7 +183,8 @@ 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
-	mv $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/$(DEB_HOST_MULTIARCH)/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
+	rm -rf $(CURDIR)/debian/libqt5scintilla2-$(SONAME)/usr/lib/$(DEB_HOST_MULTIARCH)
 	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