|
diff -Nru asusctl-6.0.12/debian/changelog asusctl-6.0.12+ds/debian/changelog |
|
--- asusctl-6.0.12/debian/changelog 2025-01-24 22:33:00.000000000 +0100 |
|
+++ asusctl-6.0.12+ds/debian/changelog 2025-03-19 16:20:00.000000000 +0100 |
|
@@ -1,3 +1,15 @@ |
|
+asusctl (6.0.12+ds-0ubuntu1) UNRELEASED; urgency=medium |
|
+ |
|
+ * Regenerate vendor tarball with cargo-vendor-filterer in debian/rules; |
|
+ instead of using upstream supplied tarball |
|
+ * Drop modify-cargo-toml-to-ensure-local-builds.patch which breaks the |
|
+ vendoring. |
|
+ * Remove spurious manual extraction of vendor tarball. |
|
+ * Move vendor to vendor.bak while cleaning as upstream Makefile otherwise |
|
+ removes it. |
|
+ |
|
+ -- Julian Andres Klode <[email protected]> Wed, 19 Mar 2025 16:20:00 +0100 |
|
+ |
|
asusctl (6.0.12-11) plucky; urgency=medium |
|
|
|
* Initial version upload. (LP: #2094129) |
|
diff -Nru asusctl-6.0.12/debian/control asusctl-6.0.12+ds/debian/control |
|
--- asusctl-6.0.12/debian/control 2025-01-24 22:33:00.000000000 +0100 |
|
+++ asusctl-6.0.12+ds/debian/control 2025-03-19 16:20:00.000000000 +0100 |
|
@@ -1,7 +1,8 @@ |
|
Source: asusctl |
|
Section: utils |
|
Priority: optional |
|
-Maintainer: Mitchell Augustin <[email protected]> |
|
+Maintainer: Ubuntu Developers <[email protected]> |
|
+XSBC-Original-Maintainer: Mitchell Augustin <[email protected]> |
|
Uploaders: Frank Heimes <[email protected]> |
|
Build-Depends: |
|
cargo, |
|
@@ -23,7 +24,7 @@ |
|
Homepage: https://gitlab.com/asus-linux/asusctl |
|
Rules-Requires-Root: no |
|
XS-Build-Indep-Architecture: amd64 |
|
-XS-Vendored-Sources-Rust: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]+11769913, [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]+wasi-snapshot-preview1, [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected] |
|
+XS-Vendored-Sources-Rust: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected] |
|
# asusctl, asusd, rog-control-center |
|
|
|
Package: asusctl |
|
diff -Nru asusctl-6.0.12/debian/patches/make-vendoring-work.patch asusctl-6.0.12+ds/debian/patches/make-vendoring-work.patch |
|
--- asusctl-6.0.12/debian/patches/make-vendoring-work.patch 1970-01-01 01:00:00.000000000 +0100 |
|
+++ asusctl-6.0.12+ds/debian/patches/make-vendoring-work.patch 2025-03-19 16:20:00.000000000 +0100 |
|
@@ -0,0 +1,30 @@ |
|
+Description: Make vendoring work |
|
+Author: Julian Andres Klode <[email protected]> |
|
+ |
|
+--- asusctl-6.0.12+ds.orig/rog-control-center/Cargo.toml |
|
++++ asusctl-6.0.12+ds/rog-control-center/Cargo.toml |
|
+@@ -29,7 +29,7 @@ rog_dbus = { path = "../rog-dbus" } |
|
+ rog_aura = { path = "../rog-aura" } |
|
+ rog_profiles = { path = "../rog-profiles" } |
|
+ rog_platform = { path = "../rog-platform" } |
|
+-supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", default-features = false } |
|
++supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git", default-features = false, tag = "5.2.4" } |
|
+ dmi_id = { path = "../dmi-id" } |
|
+ |
|
+ gumdrop.workspace = true |
|
+@@ -47,6 +47,7 @@ versions.workspace = true |
|
+ |
|
+ [dependencies.slint] |
|
+ git = "https://github.com/slint-ui/slint.git" |
|
++tag = "v1.8.0" |
|
+ default-features = false |
|
+ features = [ |
|
+ "gettext", |
|
+@@ -59,6 +60,7 @@ features = [ |
|
+ |
|
+ [build-dependencies.slint-build] |
|
+ git = "https://github.com/slint-ui/slint.git" |
|
++tag = "v1.8.0" |
|
+ |
|
+ [dev-dependencies] |
|
+ cargo-husky.workspace = true |
|
diff -Nru asusctl-6.0.12/debian/patches/series asusctl-6.0.12+ds/debian/patches/series |
|
--- asusctl-6.0.12/debian/patches/series 2025-01-17 22:49:04.000000000 +0100 |
|
+++ asusctl-6.0.12+ds/debian/patches/series 2025-03-19 16:20:00.000000000 +0100 |
|
@@ -1,2 +1,3 @@ |
|
+make-vendoring-work.patch |
|
modify-cargo-toml-to-ensure-local-builds.patch |
|
Include-asusctl-man-page-in-makefile |
|
diff -Nru asusctl-6.0.12/debian/rules asusctl-6.0.12+ds/debian/rules |
|
--- asusctl-6.0.12/debian/rules 2025-01-24 22:32:32.000000000 +0100 |
|
+++ asusctl-6.0.12+ds/debian/rules 2025-03-19 16:20:00.000000000 +0100 |
|
@@ -27,29 +27,14 @@ |
|
# to have occurred already. |
|
# If you have to modify the path here, don't forget to change the README.source doc |
|
# as well. |
|
- cargo vendor --manifest-path rust/Cargo.toml $(CARGO_VENDOR_DIR) |
|
+ env -i cargo-vendor-filterer --tier 2 --platform '*-*-linux-gnu' --platform '*-*-linux-gnueabi' $(CARGO_VENDOR_DIR) |
|
# Remove some crates that aren't useful for us and take up a lot of space |
|
rm -r \ |
|
- $(CARGO_VENDOR_DIR)/winapi \ |
|
- $(CARGO_VENDOR_DIR)/winapi-* \ |
|
- $(CARGO_VENDOR_DIR)/windows-* \ |
|
- $(CARGO_VENDOR_DIR)/windows_* \ |
|
- $(CARGO_VENDOR_DIR)/libloading/tests/*.dll \ |
|
- # End of list |
|
- # Remove the C sources from the binding crates, we're using the system libs |
|
- rm -r \ |
|
- $(CARGO_VENDOR_DIR)/libz-sys/src/zlib \ |
|
- $(CARGO_VENDOR_DIR)/libz-sys/src/zlib-ng \ |
|
- $(CARGO_VENDOR_DIR)/curl-sys/curl \ |
|
- # End of list |
|
- # Remove unused and undesirable data files (e.g. test data for vendored crates) |
|
- rm -r \ |
|
- $(CARGO_VENDOR_DIR)/vcpkg/test-data \ |
|
$(CARGO_VENDOR_DIR)/*/tests \ |
|
# End of list |
|
# Remove the checksum files to allow us to patch the crates to remove extraneous dependencies |
|
for crate in $(CARGO_VENDOR_DIR)/*; do \ |
|
- sed -i 's/^{"files":.*"package":"\([a-z0-9]\+\)"}$$/{"files":{},"package":"\1"}/' $$crate/.cargo-checksum.json; \ |
|
+ jq -c '{"files": {}, "package": .package}' $$crate/.cargo-checksum.json | sponge $$crate/.cargo-checksum.json; \ |
|
done |
|
# Cleanup temp files |
|
rm -rf $(CARGO_HOME) |
|
@@ -61,10 +46,8 @@ |
|
dh $@ |
|
|
|
override_dh_auto_configure: |
|
- tar -xvf ../$(VENDOR_TARBALL) -C . |
|
DEB_CARGO_CRATE=asusctl_$(shell dpkg-parsechangelog --show-field Version) \ |
|
$(CARGO) prepare-debian $(CARGO_VENDOR_DIR) |
|
- /usr/share/cargo/bin/dh-cargo-vendored-sources |
|
dh_auto_configure |
|
|
|
override_dh_install: |
|
@@ -78,7 +61,9 @@ |
|
dh_fixperms |
|
|
|
override_dh_auto_clean: |
|
+ mv vendor vendor.bak |
|
dh_auto_clean -- $(options) |
|
+ mv vendor.bak vendor |
|
|
|
override_dh_auto_build: |
|
dh_auto_build -- $(options) |
