From: Vasudev Kamath <vasudev@bhairava.copyninja.info>
Date: Tue, 9 Jan 2018 15:28:18 +0000 (+0530)
Subject: Refresh 2001 for new version of libgit2-sys.
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~106
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b2cf54aead9a2f82e3dedbc97cabb157c536690;p=cargo.git

Refresh 2001 for new version of libgit2-sys.
---

diff --git a/debian/patches/2001_use-system-libgit2.patch b/debian/patches/2001_use-system-libgit2.patch
index 47ba46a37..74fe82324 100644
--- a/debian/patches/2001_use-system-libgit2.patch
+++ b/debian/patches/2001_use-system-libgit2.patch
@@ -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 @@
-     }
-     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() {
-+
-+    if pkg_config::find_library("libgit2").is_ok() {
-             return
--        }
-     }
- 
-     if !Path::new("libgit2/.git").exists() {
+--- 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();