Rename clean-cargo-deps.patch to follow patch naming guidelines

Adjust make_orig_multi.sh to use new patch name.

diff --git a/debian/make_orig_multi.sh b/debian/make_orig_multi.sh
index 785bdc1e60a7e3ef497b520eabd24d43aac2eabe..aff3b33414355de3b6d86c553886266661292388 100755 (executable)
--- a/debian/make_orig_multi.sh
+++ b/debian/make_orig_multi.sh
@@ -38,8 +38,8 @@ cd cargo
 
 # Trim the list of dependencies
 echo ""
-echo "Applying clean-cargo-deps.patch... If this fails, remember to refresh the patch first!"
-patch -p1 < ${WORKDIR}/debian/patches/clean-cargo-deps.patch
+echo "Applying 2004_clean-cargo-deps.patch... If this fails, remember to refresh the patch first!"
+patch -p1 < ${WORKDIR}/debian/patches/2004_clean-cargo-deps.patch
 
 # Download build-deps via cargo-vendor
 export GIT_AUTHOR_NAME="deb-build"

diff --git a/debian/patches/2004_clean-cargo-deps.patch b/debian/patches/2004_clean-cargo-deps.patch
new file mode 100644 (file)
index 0000000..9afe8fb
--- /dev/null
+++ b/debian/patches/2004_clean-cargo-deps.patch
@@ -0,0 +1,32 @@
+Description: Remove stage1 extra dependencies (cargo 0.17)
+ Fetching extra dev-dependencies is not yet supported by bootstrap.py
+ and they are not need to build. However, cargo will try to download
+ them before building stage1.
+ .
+ For patches for earlier versions of cargo, see the git history for this file.
+From: Luca Bruno <lucab@debian.org>
+From: Ximin Luo <infinity0@debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -51,12 +51,12 @@
+ [target.'cfg(unix)'.dependencies]
+ openssl = "0.9"
+ 
+-[target.'cfg(windows)'.dependencies]
+-advapi32-sys = "0.2"
+-kernel32-sys = "0.2"
+-miow = "0.2"
+-psapi-sys = "0.1"
+-winapi = "0.2"
++#[target.'cfg(windows)'.dependencies]
++#advapi32-sys = "0.2"
++#kernel32-sys = "0.2"
++#miow = "0.2"
++#psapi-sys = "0.1"
++#winapi = "0.2"
+ 
+ [dev-dependencies]
+ bufstream = "0.1"

diff --git a/debian/patches/clean-cargo-deps.patch b/debian/patches/clean-cargo-deps.patch
deleted file mode 100644 (file)
index 82b2fb3..0000000
--- a/debian/patches/clean-cargo-deps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Luca Bruno <lucab@debian.org>
-From: Ximin Luo <infinity0@debian.org>
-Description: Remove stage1 extra dependencies (cargo 0.17)
- Fetching extra dev-dependencies is not yet supported by bootstrap.py
- and they are not need to build. However, cargo will try to download
- them before building stage1.
- .
- For patches for earlier versions of cargo, see the git history for this file.
-Forwarded: not-needed
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -51,12 +51,12 @@
- [target.'cfg(unix)'.dependencies]
- openssl = "0.9"
- 
--[target.'cfg(windows)'.dependencies]
--advapi32-sys = "0.2"
--kernel32-sys = "0.2"
--miow = "0.2"
--psapi-sys = "0.1"
--winapi = "0.2"
-+#[target.'cfg(windows)'.dependencies]
-+#advapi32-sys = "0.2"
-+#kernel32-sys = "0.2"
-+#miow = "0.2"
-+#psapi-sys = "0.1"
-+#winapi = "0.2"
- 
- [dev-dependencies]
- bufstream = "0.1"

diff --git a/debian/patches/series b/debian/patches/series
index fe7ec6547c2e94d4071e1ba5c0a585c9f9d6ab11..b28424fb67a1e582d419c338f1c652d81807bc2c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-clean-cargo-deps.patch
+2004_clean-cargo-deps.patch
 2003_local-jquery.patch
 2001_use-system-libgit2.patch
 2002_disable-net-tests.patch