Author: ericmaeker-guest Date: 2012-12-18 12:21:46 +0000 (Tue, 18 Dec 2012) New Revision: 12671
Added: trunk/packages/libquazip/trunk/debian/patches/multiarch_version.patch Modified: trunk/packages/libquazip/trunk/debian/changelog trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch trunk/packages/libquazip/trunk/debian/patches/series trunk/packages/libquazip/trunk/debian/rules Log: libquazip: update to new upstream 0.5.0 Modified: trunk/packages/libquazip/trunk/debian/changelog =================================================================== --- trunk/packages/libquazip/trunk/debian/changelog 2012-12-18 08:41:56 UTC (rev 12670) +++ trunk/packages/libquazip/trunk/debian/changelog 2012-12-18 12:21:46 UTC (rev 12671) @@ -1,3 +1,12 @@ +libquazip (0.5-1) UNRELEASED; urgency=low + + [ Eric Maeker ] + * New upstream + + [ Andreas Tille ] + + -- Eric Maeker <[email protected]> Tue, 18 Dec 2012 08:34:13 +0100 + libquazip (0.4.4-2) UNRELEASED; urgency=low [ Eric Maeker ] Modified: trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch =================================================================== --- trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch 2012-12-18 08:41:56 UTC (rev 12670) +++ trunk/packages/libquazip/trunk/debian/patches/multiarch_prefix.patch 2012-12-18 12:21:46 UTC (rev 12671) @@ -1,7 +1,7 @@ -Index: libquazip-0.4.4.obsolete.0.470476196686835/quazip/quazip.pro +Index: quazip/quazip.pro =================================================================== ---- libquazip-0.4.4.obsolete.0.470476196686835.orig/quazip/quazip.pro 2011-09-10 11:38:11.000000000 +0200 -+++ libquazip-0.4.4.obsolete.0.470476196686835/quazip/quazip.pro 2012-07-07 11:14:06.423456139 +0200 +--- quazip/quazip.pro 2011-09-10 11:38:11.000000000 +0200 ++++ quazip/quazip.pro 2012-07-07 11:14:06.423456139 +0200 @@ -28,7 +28,7 @@ unix:!symbian { headers.path=$$PREFIX/include/quazip Added: trunk/packages/libquazip/trunk/debian/patches/multiarch_version.patch =================================================================== --- trunk/packages/libquazip/trunk/debian/patches/multiarch_version.patch (rev 0) +++ trunk/packages/libquazip/trunk/debian/patches/multiarch_version.patch 2012-12-18 12:21:46 UTC (rev 12671) @@ -0,0 +1,28 @@ +Author: Eric Maeker <[email protected]> +Description: Correctly define the version and the sublib path + libquazip comes with a default version=1.0.0 and no sublib path (for multi-arch build). +Last-Update: 2012-12-18 +Forwarded: no + +Index: quazip/quazip.pro +=================================================================== +--- a/quazip/quazip.pro 2012-09-05 17:24:35.000000000 +0200 ++++ b/quazip/quazip.pro 2012-12-18 11:58:45.817540640 +0100 +@@ -3,7 +3,7 @@ + QT -= gui + DEPENDPATH += . + INCLUDEPATH += . +-VERSION = 1.0.0 ++#VERSION = 1.0.0 + + DEFINES += QUAZIP_BUILD + CONFIG(staticlib): DEFINES += QUAZIP_STATIC +@@ -32,7 +32,7 @@ + unix:!symbian { + headers.path=$$PREFIX/include/quazip + headers.files=$$HEADERS +- target.path=$$PREFIX/lib ++ target.path=$$PREFIX/lib/$${LIB_ARCH} + INSTALLS += headers target + + OBJECTS_DIR=.obj Modified: trunk/packages/libquazip/trunk/debian/patches/series =================================================================== --- trunk/packages/libquazip/trunk/debian/patches/series 2012-12-18 08:41:56 UTC (rev 12670) +++ trunk/packages/libquazip/trunk/debian/patches/series 2012-12-18 12:21:46 UTC (rev 12671) @@ -1,2 +1,2 @@ -no-test-build.patch -multiarch_prefix.patch +multiarch_version.patch + Modified: trunk/packages/libquazip/trunk/debian/rules =================================================================== --- trunk/packages/libquazip/trunk/debian/rules 2012-12-18 08:41:56 UTC (rev 12670) +++ trunk/packages/libquazip/trunk/debian/rules 2012-12-18 12:21:46 UTC (rev 12671) @@ -24,19 +24,24 @@ override_dh_auto_configure: dh_auto_configure -- $(QMAKE_GENERIC) $(extra_configure_opts) + cp NEWS.txt NEWS override_dh_auto_clean: rm -Rf quazip/.obj rm -Rf quazip/.moc find . -name Makefile -delete + rm -Rf NEWS dh_auto_clean override_dh_auto_install: dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp override_dh_installchangelogs: + pwd +# cp NEWS.txt NEWS dh_installchangelogs -plibquazip0 NEWS upstream dh_installchangelogs -plibquazip0-dev NEWS upstream dh_installchangelogs -plibquazip0-dbg NEWS upstream dh_installchangelogs -plibquazip0-headers NEWS upstream dh_installchangelogs + _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
