Source: tupi
Version: 0.2+git05-3
Severity: important
Tags: patch

Dear Maintainer,

libquazip (0.7.1-1) was uploaded to unstable recently, and it has
renamed the qt5 library to libquazip5 (#805087).

The -dev package has also been renamed to libquazip5-dev for which the
marble build dependencies need to be updated.

The attached debdiff updates the libquazip build dependency, and
quazip.patch to link quazip5 instead of quazip-qt5.

Kind Regards,

Bas
diff -Nru tupi-0.2+git05/debian/changelog tupi-0.2+git05/debian/changelog
--- tupi-0.2+git05/debian/changelog	2015-05-21 06:55:03.000000000 +0200
+++ tupi-0.2+git05/debian/changelog	2016-01-10 13:18:29.000000000 +0100
@@ -1,3 +1,10 @@
+tupi (0.2+git05-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use the new libquazip5 instead the old libquazip-qt5.
+
+ -- Bas Couwenberg <[email protected]>  Sun, 10 Jan 2016 13:18:08 +0100
+
 tupi (0.2+git05-3) unstable; urgency=medium
 
   * Upload to unstable (Closes: #786337).
diff -Nru tupi-0.2+git05/debian/control tupi-0.2+git05/debian/control
--- tupi-0.2+git05/debian/control	2015-05-21 06:54:38.000000000 +0200
+++ tupi-0.2+git05/debian/control	2016-01-10 13:18:07.000000000 +0100
@@ -13,7 +13,7 @@
  ,qtmultimedia5-dev
  ,libqt5opengl5-dev
  ,libqt5svg5-dev
- ,libquazip-qt5-dev
+ ,libquazip5-dev
  ,libtheora-dev
  ,zlib1g-dev
 Standards-Version: 3.9.6
diff -Nru tupi-0.2+git05/debian/patches/quazip.patch tupi-0.2+git05/debian/patches/quazip.patch
--- tupi-0.2+git05/debian/patches/quazip.patch	2015-01-01 22:42:21.000000000 +0100
+++ tupi-0.2+git05/debian/patches/quazip.patch	2016-01-10 13:18:01.000000000 +0100
@@ -5,8 +5,7 @@
 
 --- a/qonf/test.rb
 +++ b/qonf/test.rb
-@@ -102,13 +102,9 @@
-                          extraInclude = quazipDir + "/include"
+@@ -103,11 +103,7 @@ class Test
                           qmakeLine = "'LIBS += #{extraLib}'"
                           qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
                        else
@@ -15,13 +14,11 @@
 -                         else
 -                            extraLib = "-lquazip"
 -                         end
-+                         extraLib = "-lquazip-qt5"
++                         extraLib = "-lquazip5"
                           qmakeLine = "'LIBS += #{extraLib}'"
                        end
                     else
-                       if File.dirname(@rules).end_with?("theora")
-@@ -176,13 +172,9 @@
-         parser.libs.each { |lib|
+@@ -177,11 +173,7 @@ class Test
              config.addLib(lib)
          }
  
@@ -30,8 +27,7 @@
 -        else
 -           config.addLib("-lquazip")
 -        end
-+        config.addLib("-lquazip-qt5")
++        config.addLib("-lquazip5")
          
          parser.defines.each { |define|
              config.addDefine(define)
-         }

Reply via email to