|
 |
3645672 |
From a6f50db0e183fd2a88cd211159a2168905f83cd8 Mon Sep 17 00:00:00 2001
|
|
|
3645672 |
From: =?UTF-8?q?St=C3=A9phane=20Gimenez?= <gimenez@pps.jussieu.fr>
|
|
|
3645672 |
Date: Mon, 1 Dec 2014 14:10:42 +0100
|
|
|
3645672 |
Subject: [PATCH 02/11] Packaging Metadata
|
|
|
3645672 |
|
|
|
3645672 |
Based on the following commits
|
|
|
3645672 |
|
|
|
3645672 |
commit 023f2dc386164ed5bfd43a26fd65433ab2f49cca
|
|
|
3645672 |
Author: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
3645672 |
Date: Wed Nov 19 11:00:34 2014 +0300
|
|
|
3645672 |
|
|
|
3645672 |
implement appdata to show laby in Software Centers
|
|
|
3645672 |
|
|
|
3645672 |
Reference: https://github.com/sgimenez/laby/issues/31
|
|
|
3645672 |
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
3645672 |
|
|
|
3645672 |
commit cae6ecc53f777940dbe5f4dd4b3cde992241a9b3
|
|
|
3645672 |
Author: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
3645672 |
Date: Wed Nov 19 10:53:41 2014 +0300
|
|
|
3645672 |
|
|
|
3645672 |
improve desktop-file
|
|
|
3645672 |
|
|
|
3645672 |
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
|
|
3645672 |
---
|
|
|
3645672 |
Makefile | 19 ++++++++++++++++++-
|
|
|
3645672 |
build | 4 ++--
|
|
|
3645672 |
packaging/laby.appdata.xml | 31 +++++++++++++++++++++++++++++++
|
|
|
3645672 |
packaging/laby.desktop | 10 ++++++++++
|
|
|
3645672 |
src/config.sh | 4 ++--
|
|
|
3645672 |
5 files changed, 63 insertions(+), 5 deletions(-)
|
|
|
3645672 |
create mode 100644 packaging/laby.appdata.xml
|
|
|
3645672 |
create mode 100644 packaging/laby.desktop
|
|
|
3645672 |
|
|
|
3645672 |
diff --git a/Makefile b/Makefile
|
|
|
3645672 |
index ca18c1e..b30577d 100644
|
|
|
3645672 |
--- a/Makefile
|
|
|
3645672 |
+++ b/Makefile
|
|
|
3645672 |
@@ -3,6 +3,11 @@
|
|
|
3645672 |
include project.conf
|
|
|
3645672 |
PROJECT_ARCHIVE=$(PROJECT_NAME)-$(PROJECT_VERSION)
|
|
|
3645672 |
|
|
|
3645672 |
+DESTDIR ?=
|
|
|
3645672 |
+PREFIX ?= /usr
|
|
|
3645672 |
+BINDIR ?= ${PREFIX}/bin
|
|
|
3645672 |
+DATADIR ?= ${PREFIX}/share
|
|
|
3645672 |
+
|
|
|
3645672 |
default: all
|
|
|
3645672 |
|
|
|
3645672 |
all:
|
|
|
3645672 |
@@ -14,8 +19,20 @@ clean:
|
|
|
3645672 |
byte native byte-debug native-profile:
|
|
|
3645672 |
@./build --$@
|
|
|
3645672 |
|
|
|
3645672 |
+install:
|
|
|
3645672 |
+ install -Dp --mode=0755 laby \
|
|
|
3645672 |
+ "${DESTDIR}${BINDIR}/laby"
|
|
|
3645672 |
+ install -d "${DESTDIR}${DATADIR}/laby/"
|
|
|
3645672 |
+ cp -pr data/* "${DESTDIR}${DATADIR}/laby/"
|
|
|
3645672 |
+ install -Dp --mode=0644 data/tiles/ant-e.svg \
|
|
|
3645672 |
+ "${DESTDIR}${DATADIR}/icons/hicolor/scalable/apps/laby.svg"
|
|
|
3645672 |
+ desktop-file-install packaging/laby.desktop \
|
|
|
3645672 |
+ --dir="${DESTDIR}${DATADIR}/applications"
|
|
|
3645672 |
+ install -Dp --mode=0644 packaging/laby.appdata.xml \
|
|
|
3645672 |
+ "${DESTDIR}${DATADIR}/appdata/laby.appdata.xml"
|
|
|
3645672 |
+
|
|
|
3645672 |
dist:
|
|
|
3645672 |
@mkdir _dist
|
|
|
3645672 |
@git archive --prefix="$(PROJECT_ARCHIVE)/" HEAD \
|
|
|
3645672 |
- | gzip >_dist/"$(PROJECT_ARCHIVE)".tar.gz
|
|
|
3645672 |
+ | gzip >"_dist/$(PROJECT_ARCHIVE).tar.gz"
|
|
|
3645672 |
@echo archive stored in "_dist/$(PROJECT_ARCHIVE).tar.gz"
|
|
|
3645672 |
diff --git a/build b/build
|
|
|
3645672 |
index 6ff36ff..8787694 100755
|
|
|
3645672 |
--- a/build
|
|
|
3645672 |
+++ b/build
|
|
|
3645672 |
@@ -6,8 +6,8 @@ cd $(dirname $0)
|
|
|
3645672 |
source build.conf || exit 1
|
|
|
3645672 |
|
|
|
3645672 |
export PREFIX=${PREFIX-/usr}
|
|
|
3645672 |
-export SYSDATADIR=${SYSDATADIR-${PREFIX}/share}
|
|
|
3645672 |
-export SYSTMPDIR=${SYSTMPDIR-/tmp}
|
|
|
3645672 |
+export DATADIR=${DATADIR-${PREFIX}/share}
|
|
|
3645672 |
+export TMPDIR=${TMPDIR-/tmp}
|
|
|
3645672 |
|
|
|
3645672 |
export PROJECT_NAME=${PROJECT_NAME-unknown}
|
|
|
3645672 |
export PROJECT_VERSION=${PROJECT_VERSION-unknown}
|
|
|
3645672 |
diff --git a/packaging/laby.appdata.xml b/packaging/laby.appdata.xml
|
|
|
3645672 |
new file mode 100644
|
|
|
3645672 |
index 0000000..691fe28
|
|
|
3645672 |
--- /dev/null
|
|
|
3645672 |
+++ b/packaging/laby.appdata.xml
|
|
|
3645672 |
@@ -0,0 +1,31 @@
|
|
|
3645672 |
+
|
|
|
3645672 |
+
|
|
|
3645672 |
+<component type="desktop">
|
|
|
3645672 |
+ <id>laby.desktop</id>
|
|
|
3645672 |
+ <metadata_license>CC0-1.0</metadata_license>
|
|
|
3645672 |
+ <project_license>GPL-3.0+</project_license>
|
|
|
3645672 |
+ <name>Laby</name>
|
|
|
3645672 |
+ <summary>Learn programming, playing with ants and spider webs</summary>
|
|
|
3645672 |
+ <description>
|
|
|
3645672 |
+
|
|
|
3645672 |
+ Laby is a small program to learn how to program with ants and spider webs.
|
|
|
3645672 |
+ You have to move an ant out of a labyrinth, avoid spider webs, move rocks, etc.
|
|
|
3645672 |
+
|
|
|
3645672 |
+ </description>
|
|
|
3645672 |
+ <screenshots>
|
|
|
3645672 |
+ <screenshot type="default">
|
|
|
3645672 |
+ <image>https://sgimenez.github.io/laby/laby.png</image>
|
|
|
3645672 |
+ <caption>The main window showing the application in action</caption>
|
|
|
3645672 |
+ </screenshot>
|
|
|
3645672 |
+ </screenshots>
|
|
|
3645672 |
+ <url type="homepage">https://sgimenez.github.io/laby/</url>
|
|
|
3645672 |
+ <releases>
|
|
|
3645672 |
+ <release version="0.6.4" timestamp="1417079209" />
|
|
|
3645672 |
+ <release version="0.6.3" timestamp="1305222180" />
|
|
|
3645672 |
+ <release version="0.6.2" timestamp="1283520256" />
|
|
|
3645672 |
+ </releases>
|
|
|
3645672 |
+ <provides>
|
|
|
3645672 |
+ <binary>laby</binary>
|
|
|
3645672 |
+ </provides>
|
|
|
3645672 |
+ <updatecontact>i.gnatenko.brain@gmail.com</updatecontact>
|
|
|
3645672 |
+</component>
|
|
|
3645672 |
diff --git a/packaging/laby.desktop b/packaging/laby.desktop
|
|
|
3645672 |
new file mode 100644
|
|
|
3645672 |
index 0000000..aebc46f
|
|
|
3645672 |
--- /dev/null
|
|
|
3645672 |
+++ b/packaging/laby.desktop
|
|
|
3645672 |
@@ -0,0 +1,10 @@
|
|
|
3645672 |
+[Desktop Entry]
|
|
|
3645672 |
+Name=Laby
|
|
|
3645672 |
+Comment=Learn how to program with ants and spider webs
|
|
|
3645672 |
+Comment[fr]=Apprendre à programmer avec des fourmis
|
|
|
3645672 |
+Exec=laby
|
|
|
3645672 |
+Icon=laby
|
|
|
3645672 |
+Terminal=false
|
|
|
3645672 |
+Type=Application
|
|
|
3645672 |
+Categories=GNOME;GTK;Game;LogicGame;
|
|
|
3645672 |
+StartupNotify=true
|
|
|
3645672 |
diff --git a/src/config.sh b/src/config.sh
|
|
|
3645672 |
index b90e7fd..1474907 100644
|
|
|
3645672 |
--- a/src/config.sh
|
|
|
3645672 |
+++ b/src/config.sh
|
|
|
3645672 |
@@ -26,6 +26,6 @@ let build_system = "${OCAML_SYSTEM}"
|
|
|
3645672 |
let build_arch = "${OCAML_ARCH}"
|
|
|
3645672 |
let build_ocaml = "${OCAML_VERSION}"
|
|
|
3645672 |
let build_lablgtk = "${BUILD_LABLGTK}"
|
|
|
3645672 |
-let _ = Res.sys_data_dir := "${SYSDATADIR}"
|
|
|
3645672 |
-let _ = Res.sys_tmp_dir := "${SYSTMPDIR}"
|
|
|
3645672 |
+let _ = Res.sys_data_dir := "${DATADIR}"
|
|
|
3645672 |
+let _ = Res.sys_tmp_dir := "${TMPDIR}"
|
|
|
3645672 |
EOF
|
|
|
3645672 |
--
|
|
|
3645672 |
2.9.4
|
|
|
3645672 |
|