Package: git-delta
Version: 0.17.0-1
I hope to update rust-itertools to 0.12 soon. I was able to succesfully
build git-delta with the new version of
The new version of rust-itertools is availilable in experimental, and
the debdiff I used for the test build is attatched.
diff -Nru git-delta-0.17.0/debian/changelog git-delta-0.17.0/debian/changelog
--- git-delta-0.17.0/debian/changelog 2024-04-02 09:12:49.000000000 +0000
+++ git-delta-0.17.0/debian/changelog 2024-05-31 02:36:38.000000000 +0000
@@ -1,3 +1,10 @@
+git-delta (0.17.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump itertools dependency to 0.12.
+
+ -- Peter Michael Green <[email protected]> Fri, 31 May 2024 02:36:38 +0000
+
git-delta (0.17.0-1) unstable; urgency=medium
[ upstream ]
diff -Nru git-delta-0.17.0/debian/control git-delta-0.17.0/debian/control
--- git-delta-0.17.0/debian/control 2024-04-02 09:12:49.000000000 +0000
+++ git-delta-0.17.0/debian/control 2024-05-31 02:36:32.000000000 +0000
@@ -32,7 +32,7 @@
librust-dirs-5+default-dev,
librust-git2-0.18-dev,
librust-grep-cli-0.1+default-dev,
- librust-itertools-0.10+default-dev,
+ librust-itertools-0.12+default-dev,
librust-lazy-static-1+default-dev,
librust-palette-0.7+default-dev,
librust-pathdiff-0.2+default-dev,
diff -Nru git-delta-0.17.0/debian/patches/1001_itertools.patch
git-delta-0.17.0/debian/patches/1001_itertools.patch
--- git-delta-0.17.0/debian/patches/1001_itertools.patch 1970-01-01
00:00:00.000000000 +0000
+++ git-delta-0.17.0/debian/patches/1001_itertools.patch 2024-05-31
02:36:38.000000000 +0000
@@ -0,0 +1,13 @@
+Index: git-delta-0.17.0/Cargo.toml
+===================================================================
+--- git-delta-0.17.0.orig/Cargo.toml
++++ git-delta-0.17.0/Cargo.toml
+@@ -40,7 +40,7 @@ console = "0.15.0"
+ ctrlc = "3.2.5"
+ dirs = "5.0.1"
+ grep-cli = "0.1.8"
+-itertools = "0.10.5"
++itertools = "0.12"
+ lazy_static = "1.4"
+ palette = "0.7.2"
+ pathdiff = "0.2.1"
diff -Nru git-delta-0.17.0/debian/patches/2002_terminal-colorsaurus.patch
git-delta-0.17.0/debian/patches/2002_terminal-colorsaurus.patch
--- git-delta-0.17.0/debian/patches/2002_terminal-colorsaurus.patch
2024-04-02 09:12:49.000000000 +0000
+++ git-delta-0.17.0/debian/patches/2002_terminal-colorsaurus.patch
2024-05-31 02:36:38.000000000 +0000
@@ -5,9 +5,11 @@
Last-Update: 2024-04-02
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -54,7 +54,6 @@
+Index: git-delta-0.17.0/Cargo.toml
+===================================================================
+--- git-delta-0.17.0.orig/Cargo.toml
++++ git-delta-0.17.0/Cargo.toml
+@@ -54,7 +54,6 @@ unicode-segmentation = "1.10.1"
unicode-width = "0.1.10"
xdg = "2.4.1"
clap_complete = "4.4.4"
@@ -15,9 +17,11 @@
[dependencies.git2]
version = "0.18.1"
---- a/src/cli.rs
-+++ b/src/cli.rs
-@@ -3,7 +3,7 @@
+Index: git-delta-0.17.0/src/cli.rs
+===================================================================
+--- git-delta-0.17.0.orig/src/cli.rs
++++ git-delta-0.17.0/src/cli.rs
+@@ -3,7 +3,7 @@ use std::ffi::OsString;
use std::path::{Path, PathBuf};
use bat::assets::HighlightingAssets;
@@ -26,7 +30,7 @@
use clap_complete::Shell;
use lazy_static::lazy_static;
use syntect::highlighting::Theme as SyntaxTheme;
-@@ -294,29 +294,6 @@
+@@ -294,29 +294,6 @@ pub struct Opt {
/// set this in per-repository git config (.git/config)
pub default_language: Option<String>,
@@ -56,7 +60,7 @@
#[arg(long = "diff-highlight")]
/// Emulate diff-highlight.
///
-@@ -1147,17 +1124,6 @@
+@@ -1147,17 +1124,6 @@ pub enum InspectRawLines {
False,
}
@@ -74,9 +78,11 @@
impl Opt {
pub fn from_args_and_git_config(
env: DeltaEnv,
---- a/src/features/side_by_side.rs
-+++ b/src/features/side_by_side.rs
-@@ -592,7 +592,6 @@
+Index: git-delta-0.17.0/src/features/side_by_side.rs
+===================================================================
+--- git-delta-0.17.0.orig/src/features/side_by_side.rs
++++ git-delta-0.17.0/src/features/side_by_side.rs
+@@ -592,7 +592,6 @@ pub mod ansifill {
pub mod tests {
use crate::ansi::strip_ansi_codes;
use crate::features::line_numbers::tests::*;
@@ -84,7 +90,7 @@
use crate::tests::integration_test_utils::{make_config_from_args,
run_delta, DeltaTest};
#[test]
-@@ -643,7 +642,6 @@
+@@ -643,7 +642,6 @@ pub mod tests {
#[test]
fn test_two_plus_lines_spaces_and_ansi() {
@@ -92,9 +98,11 @@
DeltaTest::with_args(&[
"--side-by-side",
"--width",
---- a/src/options/set.rs
-+++ b/src/options/set.rs
-@@ -43,7 +43,6 @@
+Index: git-delta-0.17.0/src/options/set.rs
+===================================================================
+--- git-delta-0.17.0.orig/src/options/set.rs
++++ git-delta-0.17.0/src/options/set.rs
+@@ -43,7 +43,6 @@ macro_rules! set_options {
"24-bit-color",
"diff-highlight", // Does not exist as a flag on config
"diff-so-fancy", // Does not exist as a flag on config
@@ -102,15 +110,17 @@
"features", // Processed differently
// Set prior to the rest
"no-gitconfig",
---- a/src/options/theme.rs
-+++ b/src/options/theme.rs
+Index: git-delta-0.17.0/src/options/theme.rs
+===================================================================
+--- git-delta-0.17.0.orig/src/options/theme.rs
++++ git-delta-0.17.0/src/options/theme.rs
@@ -1,5 +1,3 @@
-use std::io::{stdout, IsTerminal};
-
/// Delta doesn't have a formal concept of a "theme". What it has is
/// (a) the choice of syntax-highlighting theme
/// (b) the choice of light-background-mode vs dark-background-mode, which
determine certain
-@@ -11,7 +9,7 @@
+@@ -11,7 +9,7 @@ use std::io::{stdout, IsTerminal};
use bat;
use bat::assets::HighlightingAssets;
@@ -119,7 +129,7 @@
#[allow(non_snake_case)]
pub fn set__is_light_mode__syntax_theme__syntax_set(
-@@ -22,7 +20,7 @@
+@@ -22,7 +20,7 @@ pub fn set__is_light_mode__syntax_theme_
let (is_light_mode, syntax_theme_name) =
get_is_light_mode_and_syntax_theme_name(
opt.syntax_theme.as_ref(),
syntax_theme_name_from_bat_theme.as_ref(),
@@ -128,7 +138,7 @@
);
opt.computed.is_light_mode = is_light_mode;
-@@ -86,9 +84,9 @@
+@@ -86,9 +84,9 @@ fn is_no_syntax_highlighting_syntax_them
fn get_is_light_mode_and_syntax_theme_name(
theme_arg: Option<&String>,
bat_theme_env_var: Option<&String>,
@@ -140,7 +150,7 @@
(None, None, false) => (false, DEFAULT_DARK_SYNTAX_THEME.to_string()),
(Some(theme_name), _, false) => (is_light_syntax_theme(theme_name),
theme_name.to_string()),
(None, Some(theme_name), false) => {
-@@ -100,72 +98,8 @@
+@@ -100,72 +98,8 @@ fn get_is_light_mode_and_syntax_theme_na
}
}
@@ -213,7 +223,7 @@
use super::*;
use crate::color;
use crate::tests::integration_test_utils;
-@@ -173,8 +107,6 @@
+@@ -173,8 +107,6 @@ mod tests {
// TODO: Test influence of BAT_THEME env var. E.g. see
utils::process::tests::FakeParentArgs.
#[test]
fn test_syntax_theme_selection() {
diff -Nru git-delta-0.17.0/debian/patches/series
git-delta-0.17.0/debian/patches/series
--- git-delta-0.17.0/debian/patches/series 2024-04-02 09:12:49.000000000
+0000
+++ git-delta-0.17.0/debian/patches/series 2024-05-31 02:36:38.000000000
+0000
@@ -5,3 +5,4 @@
2002_bytelines.patch
2002_sysinfo.patch
2002_terminal-colorsaurus.patch
+1001_itertools.patch
