Author: ericmaeker-guest
Date: 2014-07-14 21:19:00 +0000 (Mon, 14 Jul 2014)
New Revision: 17461

Added:
   trunk/packages/libquazip/trunk/debian/libquazip1-qt5-dev.install
   trunk/packages/libquazip/trunk/debian/libquazip1-qt5.1
   trunk/packages/libquazip/trunk/debian/libquazip1-qt5.install
   trunk/packages/libquazip/trunk/debian/libquazip1-qt5.lintian-overrides
   trunk/packages/libquazip/trunk/debian/libquazip1-qt5.manpages
   trunk/packages/libquazip/trunk/debian/libquazip1-qt5.symbols_fixed_revision
Modified:
   trunk/packages/libquazip/trunk/debian/changelog
   trunk/packages/libquazip/trunk/debian/control
   trunk/packages/libquazip/trunk/debian/libquazip1.lintian-overrides
   trunk/packages/libquazip/trunk/debian/libquazip1.symbols_fixed_revision
   trunk/packages/libquazip/trunk/debian/rules
Log:
libquazip: dual build: qt4/qt5; only missing dbg packages

Modified: trunk/packages/libquazip/trunk/debian/changelog
===================================================================
--- trunk/packages/libquazip/trunk/debian/changelog     2014-07-14 15:08:21 UTC 
(rev 17460)
+++ trunk/packages/libquazip/trunk/debian/changelog     2014-07-14 21:19:00 UTC 
(rev 17461)
@@ -4,14 +4,13 @@
   * New upstream release
   * debian/control:
      - Standards-Version: 3.9.5
-     - Add warns about Qt4 build while waiting for a Qt4+Qt5 patch
-  * debian/rules:
-     - better file cleaning in dh_auto_clean
+  * debian/rules;debian/control;debian/*qt5*:
+     - Dual build: Qt4 & Qt5
   * debian/*.lintian-overrides
      - managing multiarch warnings
   * patches:
      - updating patches to new upstream
-  * patches;debian/control
+  * 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)

Modified: trunk/packages/libquazip/trunk/debian/control
===================================================================
--- trunk/packages/libquazip/trunk/debian/control       2014-07-14 15:08:21 UTC 
(rev 17460)
+++ trunk/packages/libquazip/trunk/debian/control       2014-07-14 21:19:00 UTC 
(rev 17461)
@@ -6,6 +6,10 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                libqt4-dev (>= 4:4.7.4),
+               qt4-qmake (>= 4:4.7.4),
+               qtchooser,
+               qt5-default,
+               qt5-qmake,
                libxext-dev,
                zlib1g-dev
 Standards-Version: 3.9.5
@@ -81,6 +85,73 @@
  .
  QuaZIP is by default built using Qt4 libraries.
 
+Package: libquazip1-qt5
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Suggests: libquazip-doc
+Pre-Depends: ${misc:Pre-Depends}
+Description: C++ wrapper wrapper for ZIP/UNZIP
+ QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+ can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
+ .
+ QuaZIP allows you to access files inside ZIP archives using QIODevice API,
+ and that means that you can also use QTextStream, QDataStream or
+ whatever you would like to use on your zipped files.
+ .
+ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading
+ from and writing to ZIP archives.
+ .
+ QuaZIP is by default built using Qt5 libraries.
+
+Package: libquazip1-qt5-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Depends: libquazip1-qt5 (= ${binary:Version}),
+         ${misc:Depends},
+         zlib1g-dev
+Conflicts: libquazip0-dev
+Description: C++ wrapper wrapper for ZIP/UNZIP (development files)
+ QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+ can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
+ .
+ QuaZIP allows you to access files inside ZIP archives using QIODevice API,
+ and that means that you can also use QTextStream, QDataStream or
+ whatever you would like to use on your zipped files.
+ .
+ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading
+ from and writing to ZIP archives.
+ .
+ This package contains the development files.
+ .
+ QuaZIP is by default built using Qt5 libraries.
+
+Package: libquazip1-qt5-dbg
+Architecture: any
+Multi-Arch: same
+Section: debug
+Priority: extra
+Depends: libquazip1-qt5 (= ${binary:Version}),
+         ${misc:Depends}
+Description: debugging symbols for libquazip
+ QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+ can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
+ .
+ QuaZIP allows you to access files inside ZIP archives using QIODevice API,
+ and that means that you can also use QTextStream, QDataStream or
+ whatever you would like to use on your zipped files.
+ .
+ QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both reading
+ from and writing to ZIP archives.
+ .
+ This package contains the debugging symbols for Qt Creator IDE.
+ .
+ QuaZIP is by default built using Qt5 libraries.
+
+
+
 Package: libquazip-doc
 Architecture: all
 Multi-Arch: foreign

Added: trunk/packages/libquazip/trunk/debian/libquazip1-qt5-dev.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1-qt5-dev.install            
                (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip1-qt5-dev.install    
2014-07-14 21:19:00 UTC (rev 17461)
@@ -0,0 +1,3 @@
+usr/lib/*/libquazip-qt5.so
+usr/lib/*/libquazip-qt5.a
+usr/include/quazip/*

Added: trunk/packages/libquazip/trunk/debian/libquazip1-qt5.1
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1-qt5.1                      
        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip1-qt5.1      2014-07-14 
21:19:00 UTC (rev 17461)
@@ -0,0 +1,27 @@
+.TH QuaZIP 1 "14 July 2014"
+.SH NAME
+quazip - C++/Qt wrapper for UNZIP/ZIP
+.SH SYNOPSIS
+.B quazip
+.SH DESCRIPTION
+.B QuaZIP
+is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
+can be used to access ZIP archives. It uses Trolltech's Qt toolkit.
+.
+.B QuaZIP
+allows you to access files inside ZIP archives using QIODevice API,
+and that means that you can also use QTextStream, QDataStream or
+whatever you would like to use on your zipped files.
+.
+.B QuaZIP
+provides complete abstraction of the ZIP/UNZIP API, for both reading
+from and writing to ZIP archives.
+.SH SEE ALSO
+.BR minizip (1),
+.BR miniunzip (1),
+.BR zlib (3),
+.BR zip (1).
+.SH AUTHOR
+This program was written by Sergey A. Tachenov.
+This manual page was written by Eric Maeker <[email protected]>.
+

Added: trunk/packages/libquazip/trunk/debian/libquazip1-qt5.install
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1-qt5.install                
                (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip1-qt5.install        
2014-07-14 21:19:00 UTC (rev 17461)
@@ -0,0 +1 @@
+usr/lib/*/libquazip-qt5.so.*

Added: trunk/packages/libquazip/trunk/debian/libquazip1-qt5.lintian-overrides
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1-qt5.lintian-overrides      
                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip1-qt5.lintian-overrides      
2014-07-14 21:19:00 UTC (rev 17461)
@@ -0,0 +1 @@
+#libquazip1-qt5: hardening-no-fortify-functions usr/lib/*/libquazip-qt5.so*

Added: trunk/packages/libquazip/trunk/debian/libquazip1-qt5.manpages
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1-qt5.manpages               
                (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip1-qt5.manpages       
2014-07-14 21:19:00 UTC (rev 17461)
@@ -0,0 +1,2 @@
+debian/libquazip1-qt5.1
+

Added: 
trunk/packages/libquazip/trunk/debian/libquazip1-qt5.symbols_fixed_revision
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1-qt5.symbols_fixed_revision 
                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/libquazip1-qt5.symbols_fixed_revision 
2014-07-14 21:19:00 UTC (rev 17461)
@@ -0,0 +1,163 @@
+libquazip-qt5.so.1 libquazip1-qt5 #MINVER#
+ _Z24qiodevice_open_file_funcPvS_i@Base 0.4.4
+ _Z24qiodevice_read_file_funcPvS_S_m@Base 0.4.4
+ _Z24qiodevice_seek_file_funcPvS_mi@Base 0.4.4
+ _Z24qiodevice_tell_file_funcPvS_@Base 0.4.4
+ _Z25qiodevice_close_file_funcPvS_@Base 0.4.4
+ _Z25qiodevice_error_file_funcPvS_@Base 0.4.4
+ _Z25qiodevice_write_file_funcPvS_PKvm@Base 0.4.4
+ _ZN10JlCompress10extractDirE7QStringS0_@Base 0.4.4
+ _ZN10JlCompress11compressDirE7QStringS0_b@Base 0.4.4
+ _ZN10JlCompress11extractFileE7QStringS0_S0_@Base 0.4.4
+ _ZN10JlCompress11getFileListE7QString@Base 0.4.4
+ _ZN10JlCompress12compressFileE7QStringS0_@Base 0.4.4
+ _ZN10JlCompress12extractFilesE7QString11QStringListS0_@Base 0.4.4
+ _ZN10JlCompress13compressFilesE7QString11QStringList@Base 0.4.4
+ _ZN10QuaAdler325resetEv@Base 0.4.4
+ _ZN10QuaAdler325valueEv@Base 0.4.4
+ _ZN10QuaAdler326updateERK10QByteArray@Base 0.4.4
+ _ZN10QuaAdler329calculateERK10QByteArray@Base 0.4.4
+ _ZN10QuaAdler32C1Ev@Base 0.4.4
+ _ZN10QuaAdler32C2Ev@Base 0.4.4
+ _ZN10QuaZipFile10setZipNameERK7QString@Base 0.4.4
+ _ZN10QuaZipFile11getFileInfoEP14QuaZipFileInfo@Base 0.4.4
+ _ZN10QuaZipFile11setFileNameERK7QStringN6QuaZip15CaseSensitivityE@Base 0.4.4
+ _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEE@Base 0.4.4
+ _ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEEPiS4_bPKc@Base 0.4.4
+ 
_ZN10QuaZipFile4openE6QFlagsIN9QIODevice12OpenModeFlagEERK13QuaZipNewInfoPKcjiibiii@Base
 0.4.4
+ _ZN10QuaZipFile5closeEv@Base 0.4.4
+ _ZN10QuaZipFile6setZipEP6QuaZip@Base 0.4.4
+ _ZN10QuaZipFile8readDataEPcx@Base 0.4.4
+ _ZN10QuaZipFile9writeDataEPKcx@Base 0.4.4
+ _ZN10QuaZipFileC1EP6QuaZipP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC1EP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC1ERK7QStringP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC1ERK7QStringS2_N6QuaZip15CaseSensitivityEP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC1Ev@Base 0.4.4
+ _ZN10QuaZipFileC2EP6QuaZipP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC2EP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC2ERK7QStringP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC2ERK7QStringS2_N6QuaZip15CaseSensitivityEP7QObject@Base 0.4.4
+ _ZN10QuaZipFileC2Ev@Base 0.4.4
+ _ZN10QuaZipFileD0Ev@Base 0.4.4
+ _ZN10QuaZipFileD1Ev@Base 0.4.4
+ _ZN10QuaZipFileD2Ev@Base 0.4.4
+ _ZN13QuaZipNewInfo15setFileDateTimeERK7QString@Base 0.4.4
+ _ZN13QuaZipNewInfoC1ERK7QString@Base 0.4.4
+ _ZN13QuaZipNewInfoC1ERK7QStringS2_@Base 0.4.4
+ _ZN13QuaZipNewInfoC2ERK7QString@Base 0.4.4
+ _ZN13QuaZipNewInfoC2ERK7QStringS2_@Base 0.4.4
+ _ZN13QuaZipNewInfoD1Ev@Base 0.4.4
+ _ZN13QuaZipNewInfoD2Ev@Base 0.4.4
+ _ZN14QuaZipFileInfoD1Ev@Base 0.4.4
+ _ZN14QuaZipFileInfoD2Ev@Base 0.4.4
+ _ZN6QuaZip10getUnzFileEv@Base 0.4.4
+ _ZN6QuaZip10getZipFileEv@Base 0.4.4
+ _ZN6QuaZip10setCommentERK7QString@Base 0.4.4
+ _ZN6QuaZip10setZipNameERK7QString@Base 0.4.4
+ _ZN6QuaZip11setIoDeviceEP9QIODevice@Base 0.4.4
+ _ZN6QuaZip12goToNextFileEv@Base 0.4.4
+ _ZN6QuaZip13goToFirstFileEv@Base 0.4.4
+ _ZN6QuaZip14setCurrentFileERK7QStringNS_15CaseSensitivityE@Base 0.4.4
+ _ZN6QuaZip15setCommentCodecEP10QTextCodec@Base 0.4.4
+ _ZN6QuaZip15setCommentCodecEPKc@Base 0.4.4
+ _ZN6QuaZip16setFileNameCodecEP10QTextCodec@Base 0.4.4
+ _ZN6QuaZip16setFileNameCodecEPKc@Base 0.4.4
+ _ZN6QuaZip31setDataDescriptorWritingEnabledEb@Base 0.4.4
+ _ZN6QuaZip4openENS_4ModeEP19zlib_filefunc_def_s@Base 0.4.4
+ _ZN6QuaZip5closeEv@Base 0.4.4
+ _ZN6QuaZipC1EP9QIODevice@Base 0.4.4
+ _ZN6QuaZipC1ERK7QString@Base 0.4.4
+ _ZN6QuaZipC1Ev@Base 0.4.4
+ _ZN6QuaZipC2EP9QIODevice@Base 0.4.4
+ _ZN6QuaZipC2ERK7QString@Base 0.4.4
+ _ZN6QuaZipC2Ev@Base 0.4.4
+ _ZN6QuaZipD1Ev@Base 0.4.4
+ _ZN6QuaZipD2Ev@Base 0.4.4
+ _ZN7QStringD1Ev@Base 0.4.4
+ _ZN7QStringD2Ev@Base 0.4.4
+ _ZN8QuaCrc325resetEv@Base 0.4.4
+ _ZN8QuaCrc325valueEv@Base 0.4.4
+ _ZN8QuaCrc326updateERK10QByteArray@Base 0.4.4
+ _ZN8QuaCrc329calculateERK10QByteArray@Base 0.4.4
+ _ZN8QuaCrc32C1Ev@Base 0.4.4
+ _ZN8QuaCrc32C2Ev@Base 0.4.4
+ _ZNK10QuaZipFile10getZipNameEv@Base 0.4.4
+ _ZNK10QuaZipFile10metaObjectEv@Base 0.4.4
+ _ZNK10QuaZipFile11getFileNameEv@Base 0.4.4
+ _ZNK10QuaZipFile11getZipErrorEv@Base 0.4.4
+ _ZNK10QuaZipFile12isSequentialEv@Base 0.4.4
+ _ZNK10QuaZipFile14bytesAvailableEv@Base 0.4.4
+ _ZNK10QuaZipFile17getActualFileNameEv@Base 0.4.4
+ _ZNK10QuaZipFile18getCaseSensitivityEv@Base 0.4.4
+ _ZNK10QuaZipFile3posEv@Base 0.4.4
+ _ZNK10QuaZipFile4sizeEv@Base 0.4.4
+ _ZNK10QuaZipFile5atEndEv@Base 0.4.4
+ _ZNK10QuaZipFile5csizeEv@Base 0.4.4
+ _ZNK10QuaZipFile5isRawEv@Base 0.4.4
+ _ZNK10QuaZipFile5usizeEv@Base 0.4.4
+ _ZNK10QuaZipFile6getZipEv@Base 0.4.4
+ _ZNK6QuaZip10getCommentEv@Base 0.4.4
+ _ZNK6QuaZip10getZipNameEv@Base 0.4.4
+ _ZNK6QuaZip11getIoDeviceEv@Base 0.4.4
+ _ZNK6QuaZip11getZipErrorEv@Base 0.4.4
+ _ZNK6QuaZip14hasCurrentFileEv@Base 0.4.4
+ _ZNK6QuaZip15getCommentCodecEv@Base 0.4.4
+ _ZNK6QuaZip15getEntriesCountEv@Base 0.4.4
+ _ZNK6QuaZip15getFileInfoListEv@Base 0.4.4
+ _ZNK6QuaZip15getFileNameListEv@Base 0.4.4
+ _ZNK6QuaZip16getFileNameCodecEv@Base 0.4.4
+ _ZNK6QuaZip18getCurrentFileInfoEP14QuaZipFileInfo@Base 0.4.4
+ _ZNK6QuaZip18getCurrentFileNameEv@Base 0.4.4
+ _ZNK6QuaZip30isDataDescriptorWritingEnabledEv@Base 0.4.4
+ _ZNK6QuaZip6isOpenEv@Base 0.4.4
+ _ZNK6QuaZip7getModeEv@Base 0.4.4
+ _ZTI10QuaAdler32@Base 0.4.4
+ _ZTI10QuaZipFile@Base 0.4.4
+ _ZTI13QuaChecksum32@Base 0.4.4
+ _ZTI8QuaCrc32@Base 0.4.4
+ _ZTS10QuaAdler32@Base 0.4.4
+ _ZTS10QuaZipFile@Base 0.4.4
+ _ZTS13QuaChecksum32@Base 0.4.4
+ _ZTS8QuaCrc32@Base 0.4.4
+ _ZTV10QuaAdler32@Base 0.4.4
+ _ZTV10QuaZipFile@Base 0.4.4
+ _ZTV13QuaChecksum32@Base 0.4.4
+ _ZTV8QuaCrc32@Base 0.4.4
+ fill_qiodevice_filefunc@Base 0.4.4
+ unzClose@Base 0.4.4
+ unzCloseCurrentFile@Base 0.4.4
+ unzGetCurrentFileInfo@Base 0.4.4
+ unzGetFilePos@Base 0.4.4
+ unzGetGlobalComment@Base 0.4.4
+ unzGetGlobalInfo@Base 0.4.4
+ unzGetLocalExtrafield@Base 0.4.4
+ unzGetOffset@Base 0.4.4
+ unzGoToFilePos@Base 0.4.4
+ unzGoToFirstFile@Base 0.4.4
+ unzGoToNextFile@Base 0.4.4
+ unzLocateFile@Base 0.4.4
+ unzOpen2@Base 0.4.4
+ unzOpen@Base 0.4.4
+ unzOpenCurrentFile2@Base 0.4.4
+ unzOpenCurrentFile3@Base 0.4.4
+ unzOpenCurrentFile@Base 0.4.4
+ unzOpenCurrentFilePassword@Base 0.4.4
+ unzReadCurrentFile@Base 0.4.4
+ unzSetOffset@Base 0.4.4
+ unzStringFileNameCompare@Base 0.4.4
+ unz_copyright@Base 0.4.4
+ unzeof@Base 0.4.4
+ unztell@Base 0.4.4
+ zipClearFlags@Base 0.4.4
+ zipClose@Base 0.4.4
+ zipCloseFileInZip@Base 0.4.4
+ zipCloseFileInZipRaw@Base 0.4.4
+ zipOpen2@Base 0.4.4
+ zipOpen@Base 0.4.4
+ zipOpenNewFileInZip2@Base 0.4.4
+ zipOpenNewFileInZip3@Base 0.4.4
+ zipOpenNewFileInZip@Base 0.4.4
+ zipSetFlags@Base 0.4.4
+ zipWriteInFileInZip@Base 0.4.4
+ zip_copyright@Base 0.4.4

Modified: trunk/packages/libquazip/trunk/debian/libquazip1.lintian-overrides
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1.lintian-overrides  
2014-07-14 15:08:21 UTC (rev 17460)
+++ trunk/packages/libquazip/trunk/debian/libquazip1.lintian-overrides  
2014-07-14 21:19:00 UTC (rev 17461)
@@ -1 +1 @@
-libquazip1: hardening-no-fortify-functions usr/lib/*/libquazip.so*
+#libquazip1: hardening-no-fortify-functions usr/lib/*/libquazip.so*

Modified: 
trunk/packages/libquazip/trunk/debian/libquazip1.symbols_fixed_revision
===================================================================
--- trunk/packages/libquazip/trunk/debian/libquazip1.symbols_fixed_revision     
2014-07-14 15:08:21 UTC (rev 17460)
+++ trunk/packages/libquazip/trunk/debian/libquazip1.symbols_fixed_revision     
2014-07-14 21:19:00 UTC (rev 17461)
@@ -1,4 +1,4 @@
-libquazip.so.0 libquazip0 #MINVER#
+libquazip.so.1 libquazip1 #MINVER#
  _Z24qiodevice_open_file_funcPvS_i@Base 0.4.4
  _Z24qiodevice_read_file_funcPvS_S_m@Base 0.4.4
  _Z24qiodevice_seek_file_funcPvS_mi@Base 0.4.4

Modified: trunk/packages/libquazip/trunk/debian/rules
===================================================================
--- trunk/packages/libquazip/trunk/debian/rules 2014-07-14 15:08:21 UTC (rev 
17460)
+++ trunk/packages/libquazip/trunk/debian/rules 2014-07-14 21:19:00 UTC (rev 
17461)
@@ -6,57 +6,104 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Extract the current version number and package name
-DEBIAN  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
-DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
-#VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
-name := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-
+# 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_STATIC := CONFIG+=staticlib
+QT4_SO_PATH = build/qt4/so
+QT5_SO_PATH = build/qt5/so
+QT4_STATIC_PATH = build/qt4/static
+QT5_STATIC_PATH = build/qt5/static
+PATH_TO_SOURCE = ../../..
 
-QMAKE_GENERIC := \
-               LIBS+=-lz \
-               LIB_ARCH="$(DEB_HOST_MULTIARCH)"
-#              VERSION=$(VERSION) \
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+export NO_DOCS := no
+export QMAKE_LIBDIR=/usr/lib
 
-QMAKE_STATIC := CONFIG+=staticlib -o Makefile.Static
-
 %:
-       dh $@ --buildsystem=qmake_qt4 --parallel --dbg-package=libquazip1-dbg
-       
+       dh $@ --buildsystem=qmake --parallel #--with migrations
 
 override_dh_auto_configure:
-       dh_auto_configure -- $(QMAKE_GENERIC) $(extra_configure_opts)
-       dh_auto_configure -- $(QMAKE_GENERIC) $(QMAKE_STATIC) 
$(extra_configure_opts)
+       mkdir -p $(QT4_SO_PATH) $(QT5_SO_PATH) $(QT4_STATIC_PATH) 
$(QT5_STATIC_PATH)
+
+       # Qt4 builds - qmake (dynamic and static)
+       QT_SELECT=qt4 \
+       dh_auto_configure -B$(QT4_SO_PATH) -- $(QMAKE_GENERIC) \
+               BUILD_DIR=$(QT4_SO_PATH) \
+               "QMAKE_CXXFLAGS=$(CFLAGS)" \
+               $(extra_configure_opts) \
+               $(PATH_TO_SOURCE)/quazip.pro
+       QT_SELECT=qt4 \
+       dh_auto_configure -B$(QT4_STATIC_PATH) -- $(QMAKE_GENERIC) 
$(QMAKE_STATIC) \
+               BUILD_DIR=$(QT4_STATIC_PATH) \
+               "QMAKE_CXXFLAGS=$(CFLAGS)" \
+               $(extra_configure_opts) \
+               $(PATH_TO_SOURCE)/quazip.pro
+
+       # Qt5 builds - qmake (dynamic and static)
+       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
+
        cp NEWS.txt NEWS
 
+override_dh_auto_build:
+       # Qt4 builds - make (dynamic and static)
+       QT_SELECT=qt4 dh_auto_build -B$(QT4_SO_PATH)
+       QT_SELECT=qt4 dh_auto_build -B$(QT4_STATIC_PATH)
+
+       # Qt5 builds - make (dynamic and static)
+       QT_SELECT=qt5 dh_auto_build -B$(QT5_SO_PATH)
+       QT_SELECT=qt5 dh_auto_build -B$(QT5_STATIC_PATH)
+
 override_dh_auto_clean:
-       rm -Rf quazip/.obj
-       rm -Rf quazip/.moc
-       rm -Rf quazip/libquazip.so.*
-       rm -Rf quazip/libquazip.so
-       rm -Rf quazip/libquazip.a
-       find . -name Makefile -delete
-       rm -Rf Makefile.Static quazip/Makefile.Static
+       dh_auto_clean -B$(QT4_SO_PATH)
+       dh_auto_clean -B$(QT4_STATIC_PATH)
+       dh_auto_clean -B$(QT5_SO_PATH)
+       dh_auto_clean -B$(QT5_STATIC_PATH)
        rm -Rf NEWS
-       dh_auto_clean
 
-override_dh_auto_build:
-       # Build the static lib
-       dh_auto_build -Smakefile -- -f Makefile.Static
-       rm -Rf quazip/.obj
-       rm -Rf quazip/.moc
-       # Build the dynamic lib
-       dh_auto_build -Smakefile
-
 override_dh_auto_install:
-       dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
-       cp -a quazip/libquazip.a 
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+       # Install static builds
+       mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+       cp -a $(QT4_STATIC_PATH)/quazip/libquazip.a 
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+       cp -a $(QT5_STATIC_PATH)/quazip/libquazip-qt5.a 
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+       
+       # Install Qt4 packages
+       dh_auto_install -B$(QT4_SO_PATH) -plibquazip1
+       dh_auto_install -B$(QT4_SO_PATH) -plibquazip1-dev
 
+       # Install Qt5 packages
+       dh_auto_install -B$(QT5_SO_PATH) -plibquazip1-qt5
+       dh_auto_install -B$(QT5_SO_PATH) -plibquazip1-qt5-dev
+
 override_dh_installchangelogs:
        dh_installchangelogs -plibquazip1 NEWS upstream
        dh_installchangelogs -plibquazip1-dev NEWS upstream
-       dh_installchangelogs -plibquazip1-dbg NEWS upstream
+       #dh_installchangelogs -plibquazip1-dbg NEWS upstream
+       dh_installchangelogs -plibquazip1-qt5 NEWS upstream
+       dh_installchangelogs -plibquazip1-qt5-dev NEWS upstream
+       #dh_installchangelogs -plibquazip1-qt5-dbg NEWS upstream
        #dh_installchangelogs -plibquazip1-headers NEWS upstream
        dh_installchangelogs
-       
+
+#override_dh_strip:
+#      dh_strip --dbg-package=giblib1-dbg
+#      dh_strip -pfoo --dbg-package=foo-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

Reply via email to