From 6f82d314605b7cba62b401765cfe6dd698e1e024 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Mon, 2 Sep 2024 18:57:27 -0700 Subject: [PATCH 1/2] ubuntu/debian_craftos-pc: migrate to new make install --- ubuntu/debian_craftos-pc/rules | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/ubuntu/debian_craftos-pc/rules b/ubuntu/debian_craftos-pc/rules index fa2a24e..eb31972 100644 --- a/ubuntu/debian_craftos-pc/rules +++ b/ubuntu/debian_craftos-pc/rules @@ -8,25 +8,9 @@ override_dh_auto_build: make linux-plugin override_dh_auto_install: - install -D -m 0755 craftos $$(pwd)/debian/craftos-pc/usr/bin/craftos - install -D -m 0755 craftos2-lua/src/liblua.so $$(pwd)/debian/craftos-pc/usr/lib/libcraftos2-lua.so - install -D -m 0755 ccemux.so $$(pwd)/debian/craftos-pc-ccemux/usr/share/craftos/plugins/ccemux.so - patchelf --replace-needed craftos2-lua/src/liblua.so libcraftos2-lua.so $$(pwd)/debian/craftos-pc/usr/bin/craftos - patchelf --replace-needed craftos2-lua/src/liblua.so libcraftos2-lua.so $$(pwd)/debian/craftos-pc-ccemux/usr/share/craftos/plugins/ccemux.so - mkdir icons - unzip resources/linux-icons.zip -d icons - install -D -m 0644 icons/CraftOS-PC.desktop $$(pwd)/debian/craftos-pc/usr/share/applications/CraftOSPC.desktop - install -D -m 0644 icons/16.png $$(pwd)/debian/craftos-pc/usr/share/icons/hicolor/16x16/apps/craftos.png - install -D -m 0644 icons/24.png $$(pwd)/debian/craftos-pc/usr/share/icons/hicolor/24x24/apps/craftos.png - install -D -m 0644 icons/32.png $$(pwd)/debian/craftos-pc/usr/share/icons/hicolor/32x32/apps/craftos.png - install -D -m 0644 icons/48.png $$(pwd)/debian/craftos-pc/usr/share/icons/hicolor/48x48/apps/craftos.png - install -D -m 0644 icons/64.png $$(pwd)/debian/craftos-pc/usr/share/icons/hicolor/64x64/apps/craftos.png - install -D -m 0644 icons/96.png $$(pwd)/debian/craftos-pc/usr/share/icons/hicolor/96x96/apps/craftos.png + make install extra-install-linux-plugin install -D -m 0644 apport_hook.py $$(pwd)/debian/craftos-pc/usr/share/apport/package-hooks/craftos-pc.py install -D -m 0644 apport_hook.py $$(pwd)/debian/craftos-pc/usr/share/apport/package-hooks/source_craftos-pc.py install -D -m 0644 apport_crashdb.conf $$(pwd)/debian/craftos-pc/etc/apport/crashdb.conf.d/craftos_pc-crashdb.conf - mkdir -p $$(pwd)/debian/craftos-pc-dev/usr/include/CraftOS-PC - find api -type f -exec bash -c 'N=$${1#*/}; echo install -D -m 0644 $$N $$2/$$N' - {} $$(pwd)/debian/craftos-pc-dev/usr/include/CraftOS-PC \; - install -D -m 0644 craftos2-lua/include/* $$(pwd)/debian/craftos-pc-dev/usr/include/CraftOS-PC override_dh_auto_test: From 1b0d7115588b6be0f497d25bdc18153cf8248b4e Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 3 Sep 2024 00:16:35 -0700 Subject: [PATCH 2/2] ubuntu/debian_craftos-pc: move Apport config upstream --- ubuntu/debian_craftos-pc/patches/apport | 34 ------------------------- ubuntu/debian_craftos-pc/patches/series | 1 - ubuntu/debian_craftos-pc/rules | 5 +--- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 ubuntu/debian_craftos-pc/patches/apport diff --git a/ubuntu/debian_craftos-pc/patches/apport b/ubuntu/debian_craftos-pc/patches/apport deleted file mode 100644 index 8420227..0000000 --- a/ubuntu/debian_craftos-pc/patches/apport +++ /dev/null @@ -1,34 +0,0 @@ -Description: Apport support - This adds support for automatic Apport bug reporting. -Author: JackMacWindows - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-12-14 - ---- /dev/null -+++ craftos-pc-2.4.5/apport_crashdb.conf -@@ -0,0 +1,5 @@ -+craftos_pc = { -+ 'impl': 'launchpad', -+ 'project': 'craftos-pc', -+ 'bug_pattern_base': None, -+} ---- /dev/null -+++ craftos-pc-2.4.5/apport_hook.py -@@ -0,0 +1,6 @@ -+from apport.hookutils import * -+import apport.packaging -+ -+def add_info(report, ui): -+ if not apport.packaging.is_distro_package(report['Package'].split()[0]): -+ report['CrashDB'] = 'craftos_pc' diff --git a/ubuntu/debian_craftos-pc/patches/series b/ubuntu/debian_craftos-pc/patches/series index 82d3f37..e69de29 100644 --- a/ubuntu/debian_craftos-pc/patches/series +++ b/ubuntu/debian_craftos-pc/patches/series @@ -1 +0,0 @@ -apport diff --git a/ubuntu/debian_craftos-pc/rules b/ubuntu/debian_craftos-pc/rules index eb31972..ac9cf78 100644 --- a/ubuntu/debian_craftos-pc/rules +++ b/ubuntu/debian_craftos-pc/rules @@ -8,9 +8,6 @@ override_dh_auto_build: make linux-plugin override_dh_auto_install: - make install extra-install-linux-plugin - install -D -m 0644 apport_hook.py $$(pwd)/debian/craftos-pc/usr/share/apport/package-hooks/craftos-pc.py - install -D -m 0644 apport_hook.py $$(pwd)/debian/craftos-pc/usr/share/apport/package-hooks/source_craftos-pc.py - install -D -m 0644 apport_crashdb.conf $$(pwd)/debian/craftos-pc/etc/apport/crashdb.conf.d/craftos_pc-crashdb.conf + make install extra-install-linux-plugin extra-install-apport override_dh_auto_test: