Author: ericmaeker-guest
Date: 2014-07-16 02:36:31 +0000 (Wed, 16 Jul 2014)
New Revision: 17473
Added:
trunk/packages/libquazip/trunk/debian/patches/quazip-qt5-target-name.patch
trunk/packages/libquazip/trunk/debian/patches/qztest-link-to-qt5.patch
Modified:
trunk/packages/libquazip/trunk/debian/changelog
trunk/packages/libquazip/trunk/debian/patches/no-test-build.patch
trunk/packages/libquazip/trunk/debian/patches/series
trunk/packages/libquazip/trunk/debian/rules
Log:
libquazip: including dual Qt quazip unit-tests
Modified: trunk/packages/libquazip/trunk/debian/changelog
===================================================================
--- trunk/packages/libquazip/trunk/debian/changelog 2014-07-16 01:51:18 UTC
(rev 17472)
+++ trunk/packages/libquazip/trunk/debian/changelog 2014-07-16 02:36:31 UTC
(rev 17473)
@@ -6,15 +6,17 @@
- Standards-Version: 3.9.5
* debian/rules;debian/control;debian/*qt5*:
- Dual build: Qt4 & Qt5
+ * debian/rules
+ - including quazip unit-tests in override_dh_auto_test
* debian/*.lintian-overrides
- managing multiarch warnings
* patches:
- updating patches to new upstream
+ - "-qt5" in target and lib names
* patches;debian/control;debian/*.symbols*
- renaming libquazip0 to libquazip1, updating lib soname version
- library soname version was switched to the qmake project files defined
ABI version (1.0.0), not the code release version (Closes: #719742)
- - creating a libquazip1-headers package
[ Andreas Tille ]
* debian/control: Fix Vcs fields using `cme fix dpkg-control`
Modified: trunk/packages/libquazip/trunk/debian/patches/no-test-build.patch
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/no-test-build.patch
2014-07-16 01:51:18 UTC (rev 17472)
+++ trunk/packages/libquazip/trunk/debian/patches/no-test-build.patch
2014-07-16 02:36:31 UTC (rev 17473)
@@ -4,10 +4,10 @@
Last-Update: 2014-06-12
Forwarded: no
-Index: quazip-0.6.2/quazip.pro
+Index: quazip-0.6.2/qztest/qztest.pro
===================================================================
---- quazip-0.6.2.orig/quazip.pro 2014-06-12 15:01:40.851420646 +0000
-+++ quazip-0.6.2/quazip.pro 2014-06-12 15:01:40.847420646 +0000
+--- quazip-0.6.2.orig/qztest/qztest.pro 2014-07-16 02:01:40.851420646
+0000
++++ quazip-0.6.2/qztest/qztest.pro 2014-07-16 02:01:40.847420646 +0000
@@ -1,3 +1,3 @@
TEMPLATE=subdirs
-SUBDIRS=quazip qztest
Added:
trunk/packages/libquazip/trunk/debian/patches/quazip-qt5-target-name.patch
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/quazip-qt5-target-name.patch
(rev 0)
+++ trunk/packages/libquazip/trunk/debian/patches/quazip-qt5-target-name.patch
2014-07-16 02:36:31 UTC (rev 17473)
@@ -0,0 +1,20 @@
+Author: Eric Maeker <[email protected]>
+Description: Correctly define lib name
+ libquazip does not manage -qt5 in target.
+Last-Update: 2014-07-16
+Forwarded: no
+
+Index: quazip-0.6.2/quazip/quazip.pro
+===================================================================
+--- quazip-0.6.2.orig/quazip/quazip.pro 2014-07-16 04:01:20.787420838
+0000
++++ quazip-0.6.2/quazip/quazip.pro 2014-07-16 04:01:35.635420696 +0000
+@@ -10,4 +10,9 @@
+
+ unix:!symbian {
++ isEqual(QT_MAJOR_VERSION, 5){
++ TARGET=quazip-qt5
++ }else{
++ TARGET=quazip
++ }
+ headers.path=$$PREFIX/include/quazip
+ headers.files=$$HEADERS
Added: trunk/packages/libquazip/trunk/debian/patches/qztest-link-to-qt5.patch
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/qztest-link-to-qt5.patch
(rev 0)
+++ trunk/packages/libquazip/trunk/debian/patches/qztest-link-to-qt5.patch
2014-07-16 02:36:31 UTC (rev 17473)
@@ -0,0 +1,25 @@
+Author: Eric Maeker <[email protected]>
+Description: Correctly define lib name
+ libquazip does not manage -qt5 in target.
+Last-Update: 2014-07-16
+Forwarded: yes
+
+Index: quazip-0.6.2/quazip/quazip.pro
+===================================================================
+--- quazip-0.6.2.orig/qztest/qztest.pro 2014-07-16 04:01:20.787420838
+0000
++++ quazip-0.6.2/qztest/qztest.pro 2014-07-16 04:01:35.635420696 +0000
+@@ -39,7 +39,13 @@
+
+ win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/
-lquazip
+ else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/
-lquazip
+-else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip
++else:unix{
++ isEqual(QT_MAJOR_VERSION, 5){
++ LIBS += -L$$OUT_PWD/../quazip/ -lquazip-qt5
++ }else{
++ LIBS += -L$$OUT_PWD/../quazip/ -lquazip
++ }
++}
+
+ INCLUDEPATH += $$PWD/..
+ DEPENDPATH += $$PWD/../quazip
Modified: trunk/packages/libquazip/trunk/debian/patches/series
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/series 2014-07-16
01:51:18 UTC (rev 17472)
+++ trunk/packages/libquazip/trunk/debian/patches/series 2014-07-16
02:36:31 UTC (rev 17473)
@@ -1,3 +1,6 @@
+#no-test-build.patch
+qztest-link-to-qt5.patch
multiarch_version.patch
-no-test-build.patch
+quazip-qt5-target-name.patch
logo-breach.patch
+
Modified: trunk/packages/libquazip/trunk/debian/rules
===================================================================
--- trunk/packages/libquazip/trunk/debian/rules 2014-07-16 01:51:18 UTC (rev
17472)
+++ trunk/packages/libquazip/trunk/debian/rules 2014-07-16 02:36:31 UTC (rev
17473)
@@ -8,7 +8,7 @@
# Enable multiarch builds & prepare qmake vars
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-QMAKE_GENERIC := LIBS+=-lz LIB_ARCH="$(DEB_HOST_MULTIARCH)"
+QMAKE_GENERIC := -r LIBS+=-lz LIB_ARCH="$(DEB_HOST_MULTIARCH)"
QMAKE_STATIC := CONFIG+=staticlib
QT4_SO_PATH = build/qt4/so
QT5_SO_PATH = build/qt5/so
@@ -45,14 +45,12 @@
QT_SELECT=qt5 \
dh_auto_configure -B$(QT5_SO_PATH) -- $(QMAKE_GENERIC) \
BUILD_DIR=$(QT5_SO_PATH) \
- TARGET="quazip-qt5" \
"QMAKE_CXXFLAGS=$(CFLAGS)" \
$(extra_configure_opts) \
$(PATH_TO_SOURCE)/quazip.pro
QT_SELECT=qt5 \
dh_auto_configure -B$(QT5_STATIC_PATH) -- $(QMAKE_GENERIC)
$(QMAKE_STATIC) \
BUILD_DIR=$(QT5_STATIC_PATH) \
- TARGET="quazip-qt5" \
"QMAKE_CXXFLAGS=$(CFLAGS)" \
$(extra_configure_opts) \
$(PATH_TO_SOURCE)/quazip.pro
@@ -68,6 +66,10 @@
QT_SELECT=qt5 dh_auto_build -B$(QT5_SO_PATH)
QT_SELECT=qt5 dh_auto_build -B$(QT5_STATIC_PATH)
+override_dh_auto_test:
+ $(QT4_STATIC_PATH)/qztest/qztest
+ $(QT5_STATIC_PATH)/qztest/qztest
+
override_dh_auto_clean:
dh_auto_clean -B$(QT4_SO_PATH)
dh_auto_clean -B$(QT4_STATIC_PATH)
@@ -100,10 +102,8 @@
dh_installchangelogs
override_dh_strip:
-# dh_strip --dbg-package=giblib1-dbg
dh_strip -plibquazip1 --dbg-package=libquazip1-dbg
dh_strip -plibquazip1-qt5 --dbg-package=libquazip1-qt5-dbg
-# dh_strip -pbar --dbg-package=bar-dbg
override_dh_install:
dh_install --list-missing
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
