[Python-modules-commits] [qscintilla2] 01/01: mv rather that cp the Qt5 prf file in debian/rules so it doesn't end up installed in two packages

[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 e4a65a8ec05e29c158f0d06646db3893f0e0c78f
Author: Scott Kitterman <scott at kitterman.com>
Date:   Fri Oct 30 07:38:06 2015 -0400

    mv rather that cp the Qt5 prf file in debian/rules so it doesn't end up installed in two packages
---
 debian/changelog | 7 +++++++
 debian/rules     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index afaead8..fdd3471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 30 Oct 2015 07:37:06 -0400
+
 qscintilla2 (2.9.1+dfsg-2) unstable; urgency=medium
 
   * Update symbols files from buildlogs
diff --git a/debian/rules b/debian/rules
index 0ce6d05..43b35a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,7 +183,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/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features/* $(CURDIR)/debian/libqt5scintilla2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features
+	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
 	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