On 19/09/18 18:29, Sebastiaan Couwenberg wrote: > On 9/19/18 5:58 PM, Alec Leamas wrote: >> On 18/09/18 08:09, Alec Leamas wrote: >> >>> So I'll try to revert the repacking. >>> >>> >>> Stay tuned, >> >> As I feared, running into trouble. Have you any hint? > > Hack the patch to use CRLF, or run unix2dos on the files to be patched > first, apply the patch, run dos2unix on the patched files and refresh > the patch.
Doesn't work, at least not for me... attaching my two patches on top of current master in case you have a chance to test. Cheers! --alec
>From a0e647901068cacf38791a466ca949c2b4775c28 Mon Sep 17 00:00:00 2001 From: Alec Leamas <[email protected]> Date: Wed, 19 Sep 2018 01:10:45 -0400 Subject: [PATCH 1/2] debian: Revert crlf repacking. --- debian/changelog | 2 +- debian/watch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5eeb063..bb2c504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -unarr (0~20150801.d1be8c4+ds-1) unstable; urgency=medium +unarr (0~20150801.d1be8c4-1) unstable; urgency=medium * Initial release (Closes: #907070) diff --git a/debian/watch b/debian/watch index a7675a6..49d318e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,6 @@ version=4 -opts="mode=git,pretty=0~%cd.%h,dversionmangle=s/\+ds$//" \ +opts="mode=git,pretty=0~%cd.%h" \ https://github.com/zeniko/unarr.git HEAD # Issue asking for release tags: -- 2.19.0
From 53a023ce8fcc0d161c9589aa6751fb94e2f14ace Mon Sep 17 00:00:00 2001 From: Alec Leamas <[email protected]> Date: Wed, 19 Sep 2018 01:21:31 -0400 Subject: [PATCH 2/2] debian: Convert patches to crlf. --- .../patches/0001-Build-Add-a-.gitignore.patch | 21 +++++----- ...files-from-https-github.com-selmf-un.patch | 38 ++++++++----------- .../0003-Build-fix-as-needed-madness.patch | 20 +++++----- ...04-unarr.h-Mark-functions-as-visible.patch | 20 +++++----- 4 files changed, 43 insertions(+), 56 deletions(-) diff --git a/debian/patches/0001-Build-Add-a-.gitignore.patch b/debian/patches/0001-Build-Add-a-.gitignore.patch index b213c13..b277ac8 100644 --- a/debian/patches/0001-Build-Add-a-.gitignore.patch +++ b/debian/patches/0001-Build-Add-a-.gitignore.patch @@ -1,15 +1,12 @@ -From: Alec Leamas <[email protected]> -Date: Sun, 2 Sep 2018 06:20:25 -0400 -Subject: Build: Add a .gitignore. - ---- - .gitignore | 5 +++++ - 1 file changed, 5 insertions(+) - create mode 100644 .gitignore - -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..f505019 +From: Alec Leamas <[email protected]> +Date: Sun, 2 Sep 2018 06:20:25 -0400 +Subject: Build: Add a .gitignore. + +--- + .gitignore | 5 +++++ + 1 file changed, 5 insertions(+) + create mode 100644 .gitignore + --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ diff --git a/debian/patches/0002-build-Add-Cmake-files-from-https-github.com-selmf-un.patch b/debian/patches/0002-build-Add-Cmake-files-from-https-github.com-selmf-un.patch index 14836f5..91fd691 100644 --- a/debian/patches/0002-build-Add-Cmake-files-from-https-github.com-selmf-un.patch +++ b/debian/patches/0002-build-Add-Cmake-files-from-https-github.com-selmf-un.patch @@ -1,22 +1,19 @@ -From: Alec Leamas <[email protected]> -Date: Wed, 22 Aug 2018 09:22:01 -0400 -Subject: build: Add Cmake files from https://github.com/selmf/unarr. - -Origin: https://github.com/selmf/unarr - -Add a CMakelists.txt and pkg-config .pc file from said upstream, a more -elaborated version of the original sources. Submitted to upstream as -https://github.com/zeniko/unarr/issues/9. ---- - CMakeLists.txt | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - pkg-config.pc.cmake | 11 ++++ - 2 files changed, 189 insertions(+) - create mode 100644 CMakeLists.txt - create mode 100644 pkg-config.pc.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..f4babfe +From: Alec Leamas <[email protected]> +Date: Wed, 22 Aug 2018 09:22:01 -0400 +Subject: build: Add Cmake files from https://github.com/selmf/unarr. + +Origin: https://github.com/selmf/unarr + +Add a CMakelists.txt and pkg-config .pc file from said upstream, a more +elaborated version of the original sources. Submitted to upstream as +https://github.com/zeniko/unarr/issues/9. +--- + CMakeLists.txt | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + pkg-config.pc.cmake | 11 ++++ + 2 files changed, 189 insertions(+) + create mode 100644 CMakeLists.txt + create mode 100644 pkg-config.pc.cmake + --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,178 @@ @@ -198,9 +195,6 @@ index 0000000..f4babfe +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${PROJECT_NAME}.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/pkg-config.pc.cmake b/pkg-config.pc.cmake -new file mode 100644 -index 0000000..ada86f1 --- /dev/null +++ b/pkg-config.pc.cmake @@ -0,0 +1,11 @@ diff --git a/debian/patches/0003-Build-fix-as-needed-madness.patch b/debian/patches/0003-Build-fix-as-needed-madness.patch index 4b89dd8..53a40a3 100644 --- a/debian/patches/0003-Build-fix-as-needed-madness.patch +++ b/debian/patches/0003-Build-fix-as-needed-madness.patch @@ -1,16 +1,14 @@ -From: Alec Leamas <[email protected]> -Date: Sun, 2 Sep 2018 10:40:02 -0400 -Subject: Build: fix as-needed madness. - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4babfe..f76b642 100644 +From: Alec Leamas <[email protected]> +Date: Sun, 2 Sep 2018 10:40:02 -0400 +Subject: Build: fix as-needed madness. + +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -150,9 +150,9 @@ if(UNIX OR MINGW OR MSYS) +@@ -150,9 +150,9 @@ elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") set_target_properties(unarr PROPERTIES LINK_FLAGS "-Wl,-undefined,error -flto") diff --git a/debian/patches/0004-unarr.h-Mark-functions-as-visible.patch b/debian/patches/0004-unarr.h-Mark-functions-as-visible.patch index 3c72538..13797bb 100644 --- a/debian/patches/0004-unarr.h-Mark-functions-as-visible.patch +++ b/debian/patches/0004-unarr.h-Mark-functions-as-visible.patch @@ -1,13 +1,11 @@ -From: Alec Leamas <[email protected]> -Date: Fri, 7 Sep 2018 16:02:20 -0400 -Subject: unarr.h: Mark functions as visible. - ---- - unarr.h | 42 ++++++++++++++++++++++-------------------- - 1 file changed, 22 insertions(+), 20 deletions(-) - -diff --git a/unarr.h b/unarr.h -index 5ef7447..2555017 100644 +From: Alec Leamas <[email protected]> +Date: Fri, 7 Sep 2018 16:02:20 -0400 +Subject: unarr.h: Mark functions as visible. + +--- + unarr.h | 42 ++++++++++++++++++++++-------------------- + 1 file changed, 22 insertions(+), 20 deletions(-) + --- a/unarr.h +++ b/unarr.h @@ -4,6 +4,8 @@ @@ -19,7 +17,7 @@ index 5ef7447..2555017 100644 #include <stddef.h> #include <stdint.h> #include <stdbool.h> -@@ -30,65 +32,65 @@ ar_stream *ar_open_istream(IStream *stream); +@@ -30,65 +32,65 @@ #endif /* closes the stream and releases underlying resources */ -- 2.19.0
