Bug#844956: libproxy: diff for NMU version 0.4.13-1.1

[Andrey Rahmatullin]

Control: forwarded -1 https://github.com/libproxy/libproxy/pull/46

On Sun, Nov 20, 2016 at 02:14:13PM +0100, Michael Biebl wrote:
> Would you mind sending it upstream?
> I assume this build failure is triggered by a change in cmake, so will
> affect upstream as well.
This indeed is triggered by an invisible change in cmake, namely a default
variable "t" now existing in all projects, because of
/usr/share/cmake-3.7/Modules/CMakeCommonLanguageInclude.cmake:13.

-- 
WBR, wRAR


signature.asc
Description: PGP signature

Bug#844956: libproxy: diff for NMU version 0.4.13-1.1

[Michael Biebl]

Am 20.11.2016 um 10:23 schrieb Andrey Rahmatullin:
> Control: tags 844956 + patch
> Control: tags 844956 + pending
> 
> Dear maintainer,
> 
> I've prepared an NMU for libproxy (versioned as 0.4.13-1.1) and
> uploaded it to DELAYED/10. Please feel free to tell me if I
> should delay it longer.

Thanks for the patch.
Would you mind sending it upstream?
I assume this build failure is triggered by a change in cmake, so will
affect upstream as well.

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?



signature.asc
Description: OpenPGP digital signature

Bug#844956: libproxy: diff for NMU version 0.4.13-1.1

[Andrey Rahmatullin]

Control: tags 844956 + patch
Control: tags 844956 + pending

Dear maintainer,

I've prepared an NMU for libproxy (versioned as 0.4.13-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
WBR, wRAR
diff -Nru libproxy-0.4.13/debian/changelog libproxy-0.4.13/debian/changelog
--- libproxy-0.4.13/debian/changelog	2016-11-10 17:58:29.0 +0500
+++ libproxy-0.4.13/debian/changelog	2016-11-20 14:16:37.0 +0500
@@ -1,3 +1,10 @@
+libproxy (0.4.13-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS (Closes: #844956).
+
+ -- Andrey Rahmatullin   Sun, 20 Nov 2016 14:16:37 +0500
+
 libproxy (0.4.13-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru libproxy-0.4.13/debian/patches/cmake-set-cmp0054.patch libproxy-0.4.13/debian/patches/cmake-set-cmp0054.patch
--- libproxy-0.4.13/debian/patches/cmake-set-cmp0054.patch	1970-01-01 05:00:00.0 +0500
+++ libproxy-0.4.13/debian/patches/cmake-set-cmp0054.patch	2016-11-20 14:13:28.0 +0500
@@ -0,0 +1,20 @@
+Description: Fix CMake-related build problem
+ With the old CMP0054 behavior "t" in cmake/CMakeCSharpInformation.cmake:311
+ is expanded to the value of the t variable and the elseif clause behaves
+ incorrectly.
+Author: Andrey Rahmatullin 
+Bug-Debian: https://bugs.debian.org/844956
+Last-Update: 2016-11-20
+
+--- libproxy-0.4.13.orig/CMakeLists.txt
 libproxy-0.4.13/CMakeLists.txt
+@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.6)
+ if(POLICY CMP0011)
+cmake_policy(SET CMP0011 NEW)
+ endif(POLICY CMP0011)
++if(POLICY CMP0054)
++   cmake_policy(SET CMP0054 NEW)
++endif(POLICY CMP0054)
+ 
+ # Make sure we look in our cmake folder for additional definitions
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
diff -Nru libproxy-0.4.13/debian/patches/series libproxy-0.4.13/debian/patches/series
--- libproxy-0.4.13/debian/patches/series	2016-05-23 08:26:23.0 +0500
+++ libproxy-0.4.13/debian/patches/series	2016-11-20 14:16:37.0 +0500
@@ -1 +1,2 @@
 disable-pac-test.patch
+cmake-set-cmp0054.patch


signature.asc
Description: PGP signature