Adding debian version 1.72.1+dfsg1-1.debian/1.72.1+dfsg1-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 15 insertions, 15 deletions

diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
index 9e49580b1..4cdf7fbbb 100644
--- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
+++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
@@ -8,7 +8,7 @@ Subject: d-0001-pkg-config-no-special-snowflake
  2 files changed, 10 insertions(+), 17 deletions(-)
 
 diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs
-index e9395be..2f6819c 100644
+index 3653032..7b82fa5 100644
 --- a/vendor/pkg-config/src/lib.rs
 +++ b/vendor/pkg-config/src/lib.rs
 @@ -117,11 +117,8 @@ pub enum Error {
@@ -49,7 +49,7 @@ index e9395be..2f6819c 100644
          }
      }
  }
-@@ -418,6 +407,8 @@ impl Config {
+@@ -420,6 +409,8 @@ impl Config {
          if host == target {
              return true;
          }
@@ -59,23 +59,23 @@ index e9395be..2f6819c 100644
          // pkg-config may not be aware of cross-compilation, and require
          // a wrapper script that sets up platform-specific prefixes.
 @@ -477,7 +468,11 @@ impl Config {
-     fn command(&self, name: &str, args: &[&str]) -> Command {
-         let exe = self
-             .targetted_env_var("PKG_CONFIG")
--            .unwrap_or_else(|| OsString::from("pkg-config"));
-+            .unwrap_or_else(|| {
+     }
+ 
+     fn run(&self, name: &str, args: &[&str]) -> Result<Vec<u8>, Error> {
+-        let pkg_config_exe = self.targetted_env_var("PKG_CONFIG");
++        let pkg_config_exe = self.targetted_env_var("PKG_CONFIG")
++            .or_else(|| {
 +                self.env_var_os("DEB_HOST_GNU_TYPE")
-+                    .map(|mut t| { t.push(OsString::from("-pkg-config")); t })
-+                    .unwrap_or_else(|| OsString::from("pkg-config"))
++                    .map(|mut t| { t.push(OsString::from("-pkgconf")); t })
 +            });
-         let mut cmd = Command::new(exe);
-         if self.is_static(name) {
-             cmd.arg("--static");
+         let fallback_exe = if pkg_config_exe.is_none() {
+             Some(OsString::from("pkgconf"))
+         } else {
 diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs
-index 4e04ac0..f884e46 100644
+index 0f37c72..f70e8b7 100644
 --- a/vendor/pkg-config/tests/test.rs
 +++ b/vendor/pkg-config/tests/test.rs
-@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> {
+@@ -31,7 +31,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> {
      pkg_config::probe_library(name)
  }
  
@@ -83,7 +83,7 @@ index 4e04ac0..f884e46 100644
  fn cross_disabled() {
      let _g = LOCK.lock();
      reset();
-@@ -46,7 +45,6 @@ fn cross_disabled() {
+@@ -43,7 +42,6 @@ fn cross_disabled() {
      }
  }