From ccbb71911874084108954d62c689ea6ebba53958 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 25 Nov 2022 18:40:42 -0500 Subject: [PATCH] Various deb packaging settings/conveniences --- .bashrc | 3 ++- .config/git/config | 15 +++++++++++++++ .config/git/config.canonical | 2 ++ .config/git/config.sfl | 2 ++ .config/profiles/chaman | 2 ++ .config/profiles/darrud | 2 ++ .config/profiles/darya | 6 ++++++ .config/profiles/langa | 2 ++ .config/quilt/quiltrc-dpkg | 7 +++++++ 9 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 .config/git/config.canonical create mode 100644 .config/git/config.sfl create mode 100644 .config/profiles/darya create mode 100644 .config/quilt/quiltrc-dpkg diff --git a/.bashrc b/.bashrc index b0cbd85..4bc8787 100644 --- a/.bashrc +++ b/.bashrc @@ -129,7 +129,8 @@ alias s="startx" alias da='change-theme dark' alias li='change-theme light' -alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg" +alias dquilt="quilt --quiltrc=${XDG_CONFIG_HOME}/quilt/quiltrc-dpkg" +. /usr/share/bash-completion/completions/quilt complete -F _quilt_completion -o filenames dquilt function t { diff --git a/.config/git/config b/.config/git/config index fd440a6..ac28a35 100644 --- a/.config/git/config +++ b/.config/git/config @@ -73,3 +73,18 @@ [init] defaultBranch = main + +[url "bandali@git.launchpad.net:"] + insteadof = lp: +[url "git@salsa.debian.org:gnome-team/"] + insteadof = pkg-gnome: +[url "git@salsa.debian.org:bandali/"] + insteadof = salsa-bandali: +[merge "dpkg-mergechangelogs"] + name = debian/changelog merge driver + driver = dpkg-mergechangelogs -m %O %A %B %A + +[includeIf "gitdir:~/s/canonical/"] + path = ~/.config/git/config.canonical +[includeIf "gitdir:~/s/sfl/"] + path = ~/.config/git/config.sfl diff --git a/.config/git/config.canonical b/.config/git/config.canonical new file mode 100644 index 0000000..d88fe03 --- /dev/null +++ b/.config/git/config.canonical @@ -0,0 +1,2 @@ +[user] + email = amin.bandali@canonical.com diff --git a/.config/git/config.sfl b/.config/git/config.sfl new file mode 100644 index 0000000..34fb7f8 --- /dev/null +++ b/.config/git/config.sfl @@ -0,0 +1,2 @@ +[user] + email = amin.bandali@savoirfairelinux.com diff --git a/.config/profiles/chaman b/.config/profiles/chaman index addb53a..1c68d03 100644 --- a/.config/profiles/chaman +++ b/.config/profiles/chaman @@ -1,3 +1,5 @@ +# -*- mode: sh; sh-shell: sh -*- + if [ $DISPLAY ]; then if [ -x "$(command -v xinput)" ]; then xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Natural Scrolling Enabled' 1 diff --git a/.config/profiles/darrud b/.config/profiles/darrud index 4fa6735..a6902ec 100644 --- a/.config/profiles/darrud +++ b/.config/profiles/darrud @@ -1,2 +1,4 @@ +# -*- mode: sh; sh-shell: sh -*- + # export IS_GUIX_SYSTEM=true export INFOPATH="$HOME/usr/local/share/info${INFOPATH:+:}$INFOPATH" diff --git a/.config/profiles/darya b/.config/profiles/darya new file mode 100644 index 0000000..84135a6 --- /dev/null +++ b/.config/profiles/darya @@ -0,0 +1,6 @@ +# -*- mode: sh; sh-shell: sh -*- + +export DEBFULLNAME="Amin Bandali" +export DEBEMAIL="amin.bandali@canonical.com" +export UBUMAIL="Amin Bandali " +export UBUNTUTOOLS_BUILDER=sbuild diff --git a/.config/profiles/langa b/.config/profiles/langa index 8f28ffb..632e2a8 100644 --- a/.config/profiles/langa +++ b/.config/profiles/langa @@ -1,3 +1,5 @@ +# -*- mode: sh; sh-shell: sh -*- + # export XDG_DATA_DIRS="/usr/share/mate:/usr/local/share/:/usr/share/" if [ $DISPLAY ]; then diff --git a/.config/quilt/quiltrc-dpkg b/.config/quilt/quiltrc-dpkg new file mode 100644 index 0000000..a6381d3 --- /dev/null +++ b/.config/quilt/quiltrc-dpkg @@ -0,0 +1,7 @@ +QUILT_PATCHES=debian/patches +QUILT_NO_DIFF_INDEX=1 +QUILT_NO_DIFF_TIMESTAMPS=1 +QUILT_REFRESH_ARGS="-p ab" +QUILT_DIFF_ARGS="-p ab --color=auto" # If you want some color when using `quilt diff`. +QUILT_PATCH_OPTS="--reject-format=unified" +QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33" -- 2.20.1