From 635b3ffc0961b1597c50725bf660f75422fe2852 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 14 Sep 2023 23:34:19 -0400 Subject: [PATCH 1/2] remove debian directory --- debian/changelog | 5 ----- debian/control | 25 ------------------------- debian/copyright | 7 ------- debian/install | 2 -- debian/rules | 23 ----------------------- debian/source/format | 1 - debian/source/options | 5 ----- 7 files changed, 68 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/install delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 308c9a687cc..00000000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -libcosmic (0.1.0) jammy; urgency=medium - - * Initial release. - - -- Michael Aaron Murphy Tue, 12 Sep 2023 08:53:33 +0200 diff --git a/debian/control b/debian/control deleted file mode 100644 index 8cc57fc3d9b..00000000000 --- a/debian/control +++ /dev/null @@ -1,25 +0,0 @@ -Source: libcosmic -Section: utils -Priority: optional -Maintainer: Michael Aaron Murphy -Build-Depends: - cargo, - clang, - cmake, - debhelper-compat (=13), - just (>= 1.13.0), - libexpat1-dev, - libfontconfig-dev, - libfreetype-dev, - libxkbcommon-dev, - mold, - pkg-config, - rustc, -Standards-Version: 4.6.2 -Homepage: https://github.com/pop-os/libcosmic - -Package: cosmic-design-demo -Architecture: amd64 arm64 -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: libcosmic demo displaying its design elements and capabilities - libcosmic demo displaying its design elements and capabilities diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index e85c38696dd..00000000000 --- a/debian/copyright +++ /dev/null @@ -1,7 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: cosmic-design-demo -Upstream-Contact: Michael Murphy -Source: https://github.com/pop-os/libcosmic -Files: * -Copyright: System76 -License: MPL-2.0 \ No newline at end of file diff --git a/debian/install b/debian/install deleted file mode 100644 index 3207a550fa3..00000000000 --- a/debian/install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin/cosmic-design-demo -/usr/share/applications/com.system76.CosmicDesignDemo.desktop \ No newline at end of file diff --git a/debian/rules b/debian/rules deleted file mode 100755 index a6e4927e0bc..00000000000 --- a/debian/rules +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/make -f - -export DESTDIR = debian/tmp -export VENDOR ?= 1 - -%: - dh $@ - -override_dh_auto_clean: - if ! ischroot && test "${VENDOR}" = "1"; then \ - rm -rf .cargo vendor vendor.tar; \ - mkdir -p .cargo; \ - cargo vendor --sync examples/design-demo/Cargo.toml | head -n -1 > .cargo/config; \ - echo 'directory = "vendor"' >> .cargo/config; \ - tar pcf vendor.tar vendor; \ - rm -rf vendor; \ - fi - -override_dh_auto_build: - just --unstable --working-directory . --justfile examples/design-demo/justfile build-vendored - -override_dh_auto_install: - just --unstable --working-directory . --justfile examples/design-demo/justfile rootdir=$(DESTDIR) install diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 9f6742789cd..00000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) \ No newline at end of file diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index 7aebc3f1728..00000000000 --- a/debian/source/options +++ /dev/null @@ -1,5 +0,0 @@ -tar-ignore=.github -tar-ignore=.vscode -tar-ignore=result -tar-ignore=target -tar-ignore=vendor \ No newline at end of file From bc1c0397bbfdc870c7d7a3746fe9a94d3de7583b Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Fri, 15 Sep 2023 11:36:23 -0400 Subject: [PATCH 2/2] cleanup: remove packaging just files and reference to debian in .gitignore --- .gitignore | 7 ------- just/packaging.just | 9 --------- just/rust.just | 39 --------------------------------------- 3 files changed, 55 deletions(-) delete mode 100644 just/packaging.just delete mode 100644 just/rust.just diff --git a/.gitignore b/.gitignore index b24970f0e19..bc8d445b714 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ -debian/* -!debian/changelog -!debian/control -!debian/copyright -!debian/install -!debian/rules -!debian/source .cargo .idea Cargo.lock diff --git a/just/packaging.just b/just/packaging.just deleted file mode 100644 index 3c911e6b97b..00000000000 --- a/just/packaging.just +++ /dev/null @@ -1,9 +0,0 @@ -[private] -install-cmd options src dest: - install {{options}} {{src}} {{dest}} - -[private] -install-bin src dest: (install-cmd '-Dm0755' src dest) - -[private] -install-file src dest: (install-cmd '-Dm0644' src dest) diff --git a/just/rust.just b/just/rust.just deleted file mode 100644 index b80031a0741..00000000000 --- a/just/rust.just +++ /dev/null @@ -1,39 +0,0 @@ -# Use mold linker if clang and mold exists. -clang-path := `which clang || true` -mold-path := `which mold || true` - -linker-arg := if clang-path != '' { - if mold-path != '' { - '-C linker=' + clang-path + ' -C link-arg=--ld-path=' + mold-path + ' ' - } else { - '' - } -} else { - '' -} - -export RUSTFLAGS := linker-arg + env_var_or_default('RUSTFLAGS', '') - -[private] -default: build-release - -# Compile with release profile -build-release *args: (build '--release' args) - -# Compile with a vendored tarball -build-vendored *args: vendor-extract (build-release '--offline --locked' args) - -# Vendor Cargo dependencies locally -vendor *args: - rm -rf .cargo vendor vendor.tar - mkdir -p .cargo - cargo vendor {{args}} | head -n -1 > .cargo/config - echo 'directory = "vendor"' >> .cargo/config - tar pcf vendor.tar vendor - rm -rf vendor - -# Extracts vendored dependencies -[private] -vendor-extract: - rm -rf vendor - tar pxf vendor.tar