From: Vasudev Kamath Date: Sat, 23 Sep 2017 04:47:49 +0000 (+0530) Subject: Rename patches to follow naming guidelines in patches/README file. X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~146 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7f1f08e499a171831a547e2f6c61d0973a38e67c;p=cargo.git Rename patches to follow naming guidelines in patches/README file. --- diff --git a/debian/patches/2001_use-system-libgit2.patch b/debian/patches/2001_use-system-libgit2.patch new file mode 100644 index 000000000..7169d3f67 --- /dev/null +++ b/debian/patches/2001_use-system-libgit2.patch @@ -0,0 +1,20 @@ +Description: Always use system libgit2 +Author: Ximin Luo +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/vendor/libgit2-sys-0.6.12/build.rs ++++ b/vendor/libgit2-sys-0.6.12/build.rs +@@ -31,10 +31,8 @@ + } + 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() { diff --git a/debian/patches/2002_disable-net-tests.patch b/debian/patches/2002_disable-net-tests.patch new file mode 100644 index 000000000..a2a0497f0 --- /dev/null +++ b/debian/patches/2002_disable-net-tests.patch @@ -0,0 +1,65 @@ +Description: Disable network tests +Author: Ximin Luo +Forwarded: TODO +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/tests/build-auth.rs ++++ b/tests/build-auth.rs +@@ -14,7 +14,7 @@ + use hamcrest::assert_that; + + // Test that HTTP auth is offered from `credential.helper` +-#[test] ++//#[test] + fn http_auth_offered() { + let server = TcpListener::bind("127.0.0.1:0").unwrap(); + let addr = server.local_addr().unwrap(); +@@ -127,7 +127,7 @@ + } + + // Boy, sure would be nice to have a TLS implementation in rust! +-#[test] ++//#[test] + fn https_something_happens() { + let server = TcpListener::bind("127.0.0.1:0").unwrap(); + let addr = server.local_addr().unwrap(); +@@ -177,7 +177,7 @@ + } + + // Boy, sure would be nice to have an SSH implementation in rust! +-#[test] ++//#[test] + fn ssh_something_happens() { + let server = TcpListener::bind("127.0.0.1:0").unwrap(); + let addr = server.local_addr().unwrap(); +--- a/tests/net-config.rs ++++ b/tests/net-config.rs +@@ -4,7 +4,7 @@ + use cargotest::support::{project, execs}; + use hamcrest::assert_that; + +-#[test] ++//#[test] + fn net_retry_loads_from_config() { + let p = project("foo") + .file("Cargo.toml", r#" +@@ -29,7 +29,7 @@ + (1 tries remaining): [..]")); + } + +-#[test] ++//#[test] + fn net_retry_git_outputs_warning() { + let p = project("foo") + .file("Cargo.toml", r#" +--- a/tests/test.rs ++++ b/tests/test.rs +@@ -2194,7 +2194,7 @@ + execs().with_status(0)); + } + +-#[test] ++//#[test] + fn pass_correct_cfgs_flags_to_rustdoc() { + let p = project("foo") + .file("Cargo.toml", r#" diff --git a/debian/patches/2003_local-jquery.patch b/debian/patches/2003_local-jquery.patch new file mode 100644 index 000000000..98990d655 --- /dev/null +++ b/debian/patches/2003_local-jquery.patch @@ -0,0 +1,9 @@ +From: Luca Bruno +Description: Remove remote jquery references +Forwarded: no +--- a/src/doc/html-headers.html ++++ b/src/doc/html-headers.html +@@ -1,2 +1,2 @@ +- ++ + diff --git a/debian/patches/README b/debian/patches/README new file mode 100644 index 000000000..80c158437 --- /dev/null +++ b/debian/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff --git a/debian/patches/disable-net-tests.patch b/debian/patches/disable-net-tests.patch deleted file mode 100644 index a2a0497f0..000000000 --- a/debian/patches/disable-net-tests.patch +++ /dev/null @@ -1,65 +0,0 @@ -Description: Disable network tests -Author: Ximin Luo -Forwarded: TODO ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/tests/build-auth.rs -+++ b/tests/build-auth.rs -@@ -14,7 +14,7 @@ - use hamcrest::assert_that; - - // Test that HTTP auth is offered from `credential.helper` --#[test] -+//#[test] - fn http_auth_offered() { - let server = TcpListener::bind("127.0.0.1:0").unwrap(); - let addr = server.local_addr().unwrap(); -@@ -127,7 +127,7 @@ - } - - // Boy, sure would be nice to have a TLS implementation in rust! --#[test] -+//#[test] - fn https_something_happens() { - let server = TcpListener::bind("127.0.0.1:0").unwrap(); - let addr = server.local_addr().unwrap(); -@@ -177,7 +177,7 @@ - } - - // Boy, sure would be nice to have an SSH implementation in rust! --#[test] -+//#[test] - fn ssh_something_happens() { - let server = TcpListener::bind("127.0.0.1:0").unwrap(); - let addr = server.local_addr().unwrap(); ---- a/tests/net-config.rs -+++ b/tests/net-config.rs -@@ -4,7 +4,7 @@ - use cargotest::support::{project, execs}; - use hamcrest::assert_that; - --#[test] -+//#[test] - fn net_retry_loads_from_config() { - let p = project("foo") - .file("Cargo.toml", r#" -@@ -29,7 +29,7 @@ - (1 tries remaining): [..]")); - } - --#[test] -+//#[test] - fn net_retry_git_outputs_warning() { - let p = project("foo") - .file("Cargo.toml", r#" ---- a/tests/test.rs -+++ b/tests/test.rs -@@ -2194,7 +2194,7 @@ - execs().with_status(0)); - } - --#[test] -+//#[test] - fn pass_correct_cfgs_flags_to_rustdoc() { - let p = project("foo") - .file("Cargo.toml", r#" diff --git a/debian/patches/local-jquery.patch b/debian/patches/local-jquery.patch deleted file mode 100644 index 98990d655..000000000 --- a/debian/patches/local-jquery.patch +++ /dev/null @@ -1,9 +0,0 @@ -From: Luca Bruno -Description: Remove remote jquery references -Forwarded: no ---- a/src/doc/html-headers.html -+++ b/src/doc/html-headers.html -@@ -1,2 +1,2 @@ -- -+ - diff --git a/debian/patches/series b/debian/patches/series index 9a4f8161a..1b6d8d213 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ clean-cargo-deps.patch -local-jquery.patch -use-system-libgit2.patch -disable-net-tests.patch +2003_local-jquery.patch +2001_use-system-libgit2.patch +2002_disable-net-tests.patch diff --git a/debian/patches/use-system-libgit2.patch b/debian/patches/use-system-libgit2.patch deleted file mode 100644 index 7169d3f67..000000000 --- a/debian/patches/use-system-libgit2.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Always use system libgit2 -Author: Ximin Luo -Forwarded: not-needed ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/vendor/libgit2-sys-0.6.12/build.rs -+++ b/vendor/libgit2-sys-0.6.12/build.rs -@@ -31,10 +31,8 @@ - } - 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() {