Refresh 2001 for new version of libgit2-sys.
authorVasudev Kamath <vasudev@bhairava.copyninja.info>
Tue, 9 Jan 2018 15:28:18 +0000 (20:58 +0530)
committerVasudev Kamath <vasudev@bhairava.copyninja.info>
Tue, 9 Jan 2018 15:28:18 +0000 (20:58 +0530)
debian/patches/2001_use-system-libgit2.patch

index 47ba46a37639272e4ad7a19f0ca2f60f600e1b05..74fe823243b1abe8d21291455eb944bd4993d68b 100644 (file)
@@ -3,18 +3,21 @@ Author: Ximin Luo <infinity0@debian.org>
 Forwarded: not-needed
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/vendor/libgit2-sys-0.6.16/build.rs
-+++ b/vendor/libgit2-sys-0.6.16/build.rs
-@@ -31,10 +31,9 @@
-     }\r
-     let has_pkgconfig = Command::new("pkg-config").output().is_ok();\r
\r
--    if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() {\r
--        if pkg_config::find_library("libgit2").is_ok() {\r
-+\r
-+    if pkg_config::find_library("libgit2").is_ok() {\r
-             return\r
--        }\r
-     }\r
\r
-     if !Path::new("libgit2/.git").exists() {\r
+--- a/vendor/libgit2-sys-0.6.19/build.rs
++++ b/vendor/libgit2-sys-0.6.19/build.rs
+@@ -31,12 +31,11 @@
+     }
+     let has_pkgconfig = Command::new("pkg-config").output().is_ok();
+-    if env::var("LIBGIT2_SYS_USE_PKG_CONFIG").is_ok() {
+-        if pkg_config::find_library("libgit2").is_ok() {
+-            return
+-        }
++    if pkg_config::find_library("libgit2").is_ok() {
++        return
+     }
++
+     if !Path::new("libgit2/.git").exists() {
+         let _ = Command::new("git").args(&["submodule", "update", "--init"])
+                                    .status();