One small change needed in the patch.

Scott K
diff -Nru qwt5-5.2.2/debian/changelog qwt5-5.2.2/debian/changelog
--- qwt5-5.2.2/debian/changelog	2011-08-16 07:03:00.000000000 +0000
+++ qwt5-5.2.2/debian/changelog	2012-03-04 20:35:29.000000000 +0000
@@ -1,3 +1,15 @@
+qwt5 (5.2.2-2) experimental; urgency=low
+
+  * Update for multi-arch Qt
+    - Change install path for libqwt_designer_plugin.so in
+      libqwt5-qt4-dev.install
+    - Update build-depends version requirements for libqt4-dev and debhelper
+    - Add Multi-Arch: same and misc:Pre-Depends for libqwt5-qt4
+  * Bump compat to 8
+  * Bump standards version to 3.9.3 without further change
+
+ -- Scott Kitterman <sc...@kitterman.com>  Sun, 04 Mar 2012 15:31:49 -0500
+
 qwt5 (5.2.2-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru qwt5-5.2.2/debian/compat qwt5-5.2.2/debian/compat
--- qwt5-5.2.2/debian/compat	2011-08-05 05:48:00.000000000 +0000
+++ qwt5-5.2.2/debian/compat	2012-03-04 20:39:39.000000000 +0000
@@ -1 +1 @@
-7
+8
diff -Nru qwt5-5.2.2/debian/control qwt5-5.2.2/debian/control
--- qwt5-5.2.2/debian/control	2011-08-11 18:31:27.000000000 +0000
+++ qwt5-5.2.2/debian/control	2012-03-04 20:40:26.000000000 +0000
@@ -1,8 +1,8 @@
 Source: qwt5
 Priority: optional
 Maintainer: Gudjon I. Gudjonsson <gud...@gudjon.org>
-Build-Depends: debhelper (>= 8), libqt4-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8.1.3), libqt4-dev (>= 4:4.8.0~)
+Standards-Version: 3.9.3
 Section: libs
 Homepage: http://qwt.sourceforge.net
 
@@ -22,6 +22,8 @@
 Package: libqwt5-qt4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Qt4 widgets library for technical applications (runtime)
  The Qwt library contains Qt GUI Components and utility classes which
  are primarily useful for programs with a technical background. Most of
diff -Nru qwt5-5.2.2/debian/libqwt5-qt4-dev.install qwt5-5.2.2/debian/libqwt5-qt4-dev.install
--- qwt5-5.2.2/debian/libqwt5-qt4-dev.install	2011-08-05 05:48:00.000000000 +0000
+++ qwt5-5.2.2/debian/libqwt5-qt4-dev.install	2012-03-05 04:27:26.000000000 +0000
@@ -1,3 +1,3 @@
 usr/include/qwt-qt4
 usr/lib/libqwt-qt4.so
-usr/lib/qt4/plugins/designer/libqwt_designer_plugin.so
+usr/lib/*/qt4/plugins/designer/libqwt_designer_plugin.so
diff -Nru qwt5-5.2.2/debian/rules qwt5-5.2.2/debian/rules
--- qwt5-5.2.2/debian/rules	2011-08-12 04:45:16.000000000 +0000
+++ qwt5-5.2.2/debian/rules	2012-03-05 04:32:05.000000000 +0000
@@ -11,7 +11,7 @@
 	qmake qwt.pro
 
 #override_dh_auto_build:
-#	$(MAKE)
+#	$(MAKE)
 
 override_dh_auto_clean:
 	rm -f designer/plugins/designer/libqwt_designer_plugin.so
@@ -20,6 +20,8 @@
 override_dh_auto_install:
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
+	mkdir $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv $(CURDIR)/debian/tmp/usr/lib/qt4 $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES

Attachment: signature.asc
Description: This is a digitally signed message part.



Reply via email to