Skip to content

Commit 0e0fa6f

Browse files
aganzhaaganzha
authored
Merge pull request #47 from aganzha/rc-0.1.22
Rc 0.1.22
2 parents 41353ae + d2cde7d commit 0e0fa6f

File tree

21 files changed

+525
-243
lines changed

21 files changed

+525
-243
lines changed

‎.cargo-checksum.json‎

Whitespace-only changes.

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
.flatpak-builder/
33
cargo-sources.json
44
flatpak_target/
5-
*~
5+
*~
6+
debian/
7+
.pc/
8+
src/gresources.compiled

‎Cargo.lock‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,21 @@ authors = ["Aleksey Ganzha <aganzha@yandex.ru>"]
1010
[dependencies]
1111
gtk4 = { version = "0.9.6", features = ["gnome_47", "v4_18"] }
1212
libadwaita = { version = "0.7.2", features = ["v1_6"] }
13-
git2 = "0.20.1"
13+
git2 = "0.20.0"
1414
regex = "1.10.2"
1515
log = "0.4.20"
16-
env_logger = "0.11.8"
16+
env_logger = "0.11.6"
1717
async-channel = "2.2.0"
1818
chrono = "0.4.35"
1919
html-escape = "0.2.13"
2020
similar = "2.7.0"
21-
anyhow = "1.0.97"
22-
gtk4-sys = "0.9.6"
23-
tree-sitter = "0.25.3"
24-
tree-sitter-python = "0.23.6"
25-
tree-sitter-rust = "0.23.2"
26-
tree-sitter-typescript = "0.23.2"
21+
anyhow = "1.0.95"
22+
tree-sitter = {version="0.25.3", optional=true}
23+
tree-sitter-python = {version="0.23.6", optional=true}
24+
tree-sitter-rust = {version="0.23.2", optional=true}
25+
tree-sitter-typescript = {version="0.23.2", optional=true}
2726
palette = "0.7.5"
27+
28+
[features]
29+
default=["syntax"]
30+
syntax = ["dep:tree-sitter", "dep:tree-sitter-rust", "dep:tree-sitter-python", "dep:tree-sitter-typescript"]

‎debbuild.sh‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#!/bin/bash
2+
# mv ~/.cargo ~/cargo.orig
3+
# toolbox enter u2504_debbuild
4+
# sudo apt-get update
5+
# sudo apt-get install devscripts
6+
# thats for building: sudo apt-get install dh-cargo debhelper cargo devscripts
7+
# touch debian/cargo-checksum.json
8+
# rm -rf debian/cargo_registry/
9+
# rm -rf debian/cargo_home/
10+
# git checkout Cargo.toml
11+
# git checkout io.github.aganzha.Stage.desktop
12+
# ./debbuild.sh with exit after mv $tar_name ..
13+
# dpkg-buildpackage -us -uc - will be error about dependencies.
14+
# copy em all and install via apt-get
15+
# dpkg-buildpackage -us -uc again
16+
# put proper version in debian/changelog (e.g. -2)
17+
# https://askubuntu.com/questions/862778/how-to-overwrite-a-previously-uploaded-malformed-upstream-tarball-in-launchpads
18+
# dh_clean
19+
# rm debian/cargo_home/.global-cache
20+
# git checkout Cargo.toml
21+
# git checkout io.github.aganzha.Stage.desktop
22+
# ./debbuild.sh with exit after mv $tar_name ..
23+
# debuild -S -kD721B759479BF5233A2FAC54196584E65F8849A1
24+
# cd ..
25+
# dput -d ppa:aganzha/stage stage-git-gui_0.1.21-1_source.changes
26+
#
27+
original_name="stage"
28+
name="stage-git-gui"
29+
version="0.1.21"
30+
release=+ds5
31+
# release=
32+
full_id="io.github.aganzha.Stage"
33+
tar_name="$name"_"$version""$release".orig.tar.xz
34+
rm ../stage-git-gui_*
35+
sed -i "s/name = \"$original_name\"/name = \"$name\"/" Cargo.toml
36+
sed -i "s|Exec=$original_name|Exec=$name|g" $full_id.desktop
37+
tar cJvf $tar_name --exclude-vcs --exclude=target --exclude='*.sh' --exclude=target --exclude='.pc' --exclude='debian' --exclude='*~' --exclude='#*#' --exclude=$tar_name .
38+
mv $tar_name ../
39+
debuild -S -kD721B759479BF5233A2FAC54196584E65F8849A1
40+
git checkout Cargo.toml
41+
git checkout io.github.aganzha.Stage.desktop
42+
#git checkout Cargo.toml
43+
#git checkout $full_id.desktop
44+
# dput -d ppa:aganzha/stage stage-git-gui_0.1.21-1_source.changes
45+
46+
47+
# debuild -S
48+
# debuild -S -kD721B759479BF5233A2FAC54196584E65F8849A1
49+
# dpkg-buildpackage -us -uc
50+
51+
# cd ../
52+
# changes_name="$name"_"$version"_amd64.changes
53+
# debsign -k D721B759479BF5233A2FAC54196584E65F8849A1 $changes_name
54+
# dput -d stage-git-gui_0.1.21-1_amd64.changes
55+
56+
# ooooooooooooooooooooold --------------------------
57+
# apt-get install dh-cargo debhelper cargo
58+
# changes to Cargo.toml - put in rules.
59+
# put proper info in debian/changelog
60+
# dh_make -s --createorig
61+
# dh_clean
62+
# dpkg-buildpackage -us -uc
63+
# debsign -k D721B759479BF5233A2FAC54196584E65F8849A1 stage-git-gui_0.1.21-1_amd64.changes
64+
# dput stage stage-git-gui_0.1.21-1_amd64.changes

‎debian/changelog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
stage-git-gui (0.1.21+ds5-1) plucky; urgency=medium
2+
3+
* Initial release
4+
5+
-- Aleksey Ganzha <aganzha@yandex.ru> Thu, 14 Jun 2025 00:52:30 +0200

‎debian/control‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
Source: stage-git-gui
2+
Section: utils
3+
Priority: optional
4+
Maintainer: Aleksey Ganzha <aganzha@yandex.ru>
5+
Rules-Requires-Root: no
6+
Build-Depends:
7+
dh-cargo (>= 0.7),
8+
debhelper-compat (= 13),
9+
desktop-file-utils,
10+
xvfb,
11+
librust-gtk4-dev,
12+
librust-git2-dev,
13+
librust-openssl-probe-dev,
14+
librust-libadwaita-dev,
15+
librust-regex-dev,
16+
librust-env-logger-dev,
17+
librust-async-channel-dev,
18+
librust-chrono-dev,
19+
librust-html-escape-dev,
20+
librust-similar-dev,
21+
librust-anyhow-dev,
22+
librust-palette-dev
23+
Standards-Version: 4.7.2
24+
Homepage: https://github.com/aganzha/stage
25+
Vcs-Browser: https://github.com/aganzha/stage
26+
Vcs-Git: https://github.com/aganzha/stage.git
27+
28+
Package: stage-git-gui
29+
Architecture: any
30+
Depends: ${shlibs:Depends},
31+
${misc:Depends},
32+
desktop-file-utils
33+
Description: Git GUI client inspired by Magit

‎debian/postinst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
update-desktop-database &> /dev/null
3+
if [ -x /usr/bin/gtk-update-icon-cache ]; then
4+
gtk-update-icon-cache --quiet /usr/share/icons/hicolor/ || :
5+
fi

‎debian/rules‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/make -f
2+
export DH_VERBOSE=1
3+
export CARGO_FEATURE_SYNTAX=0
4+
export OUT_DIR=.
5+
export RUSTFLAGS=-A deprecated -A warnings
6+
include /usr/share/rustc/architecture.mk
7+
export DEBIAN_DIR=debian/stage-git-gui
8+
9+
%:
10+
glib-compile-resources io.github.aganzha.Stage.gresource.xml --target src/gresources.compiled
11+
dh $@ --buildsystem cargo
12+
13+
# override_dh_auto_build:
14+
# dh_auto_build -- build --no-default-features --release
15+
override_dh_auto_test:
16+
dh_auto_test -- build --no-default-features --release
17+
xvfb-run bash -c "dh_auto_test -- test --no-default-features"
18+
override_dh_auto_install:
19+
install -Dm755 target/$(DEB_HOST_RUST_TYPE)/release/stage-git-gui -t $(DEBIAN_DIR)/usr/bin/
20+
install -Dm644 io.github.aganzha.Stage.metainfo.xml -t $(DEBIAN_DIR)/usr/share/metainfo
21+
install -Dm644 io.github.aganzha.Stage.desktop -t $(DEBIAN_DIR)/usr/share/applications
22+
install -Dm644 io.github.aganzha.Stage.gschema.xml -t $(DEBIAN_DIR)/usr/share/glib-2.0/schemas/
23+
install -Dm644 icons/16x16/io.github.aganzha.Stage.png -t $(DEBIAN_DIR)/usr/share/icons/hicolor/16x16/apps
24+
install -Dm644 icons/32x32/io.github.aganzha.Stage.png -t $(DEBIAN_DIR)/usr/share/icons/hicolor/32x32/apps
25+
install -Dm644 icons/48x48/io.github.aganzha.Stage.png -t $(DEBIAN_DIR)/usr/share/icons/hicolor/48x48/apps
26+
install -Dm644 icons/64x64/io.github.aganzha.Stage.png -t $(DEBIAN_DIR)/usr/share/icons/hicolor/64x64/apps
27+
install -Dm644 icons/128x128/io.github.aganzha.Stage.png -t $(DEBIAN_DIR)/usr/share/icons/hicolor/128x128/apps
28+
install -Dm644 icons/256x256/io.github.aganzha.Stage.png -t $(DEBIAN_DIR)/usr/share/icons/hicolor/256x256/apps
29+
install -Dm644 icons/512x512/io.github.aganzha.Stage.png -t $(DEBIAN_DIR)/usr/share/icons/hicolor/512x512/apps
30+
install -Dm644 icons/io.github.aganzha.Stage.svg -t $(DEBIAN_DIR)/usr/share/icons/hicolor/scalable/apps
31+
install -Dm644 icons/io.github.aganzha.Stage-symbolic.svg -t $(DEBIAN_DIR)/usr/share/icons/hicolor/symbolic/apps

‎debian/source/options‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
extend-diff-ignore = "(^|\/)\.git\/.*$"
2+
extend-diff-ignore = "(^|\/).*\.sh$"
3+
extend-diff-ignore = "(^|\/)stage.flatpakrepo$"
4+
extend-diff-ignore = "(^|\/)meson.build$"
5+
extend-diff-ignore = "(^|\/)stage.flatpakref$"
6+
extend-diff-ignore = "(^|\/)gdb.commands.run$"
7+
extend-diff-ignore = "(^|\/)\.global-cache$"
8+
extend-diff-ignore = "(^|\/)target/.*$"
9+
10+
tar-ignore = "(^|\/)\.git\/.*$"
11+
tar-ignore = "(^|\/).*\.sh$"
12+
tar-ignore = "(^|\/)stage.flatpakrepo$"
13+
tar-ignore = "(^|\/)meson.build$"
14+
tar-ignore = "(^|\/)stage.flatpakref$"
15+
tar-ignore = "(^|\/)gdb.commands.run$"
16+
tar-ignore = "(^|\/)\.global-cache$"
17+
tar-ignore = "(^|\/)target/.*$"
18+

0 commit comments

Comments
 (0)