Skip to content

Commit eb462f6

Browse files
author
Mirko Brombin
authored
Merge pull request #3 from Vanilla-OS/dev
Merge de
2 parents 13f1c5d + dbb03c9 commit eb462f6

File tree

197 files changed

+908
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+908
-0
lines changed

.github/workflows/main.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-22.04
10+
container:
11+
image: ghcr.io/vanilla-os/pico:main
12+
volumes:
13+
- /proc:/proc
14+
- /:/run/host
15+
options: --privileged -it
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
20+
- name: De-bloat stock image
21+
run: |
22+
rm -r /run/host/usr/share/dotnet
23+
rm -r /run/host${{ runner.tool_cache }}
24+
25+
- name: Install needed packages
26+
run: apt update && apt install dpkg-dev build-essential debhelper inkscape librsvg2-bin optipng -y
27+
28+
- name: Build debian package
29+
run: |
30+
dpkg-buildpackage --no-sign
31+
mv ../*.deb ../desktop-base.deb
32+
33+
- uses: softprops/action-gh-release@v1
34+
with:
35+
token: "${{ secrets.GITHUB_TOKEN }}"
36+
tag_name: "continuous"
37+
prerelease: true
38+
name: "Continuous Build"
39+
files: |
40+
/__w/desktop-base/desktop-base.deb

Makefile

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
PIXMAPS=$(wildcard pixmaps/*.png)
2+
3+
.PHONY: all clean install install-local
4+
all: build-emblems build-logos
5+
clean: clean-emblems clean-logos
6+
7+
.PHONY: build-emblems clean-emblems install-emblems
8+
build-emblems clean-emblems install-emblems:
9+
@target=`echo $@ | sed s/-emblems//`; \
10+
$(MAKE) $$target -C emblems-vanilla || exit 1;
11+
12+
.PHONY: build-logos clean-logos install-logos
13+
build-logos clean-logos install-logos:
14+
@target=`echo $@ | sed s/-logos//`; \
15+
$(MAKE) $$target -C vanilla-logos || exit 1;
16+
17+
18+
install: install-emblems install-logos install-local
19+
20+
install-local:
21+
# vanilla logo in circle as default user face icon
22+
install -d $(DESTDIR)/etc/skel
23+
$(INSTALL_DATA) defaults/common/etc/skel/.face $(DESTDIR)/etc/skel
24+
cd $(DESTDIR)/etc/skel && ln -s .face .face.icon
25+
26+
# pixmaps files
27+
mkdir -p $(DESTDIR)/usr/share/pixmaps
28+
$(INSTALL_DATA) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/
29+
30+
include Makefile.inc

Makefile.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
INSTALL=install
2+
INSTALL_PROGRAM=$(INSTALL)
3+
# Don't use $(INSTALL) for data as debhelper >= 11 injects
4+
# --strip-program=true which is specific to non-data files
5+
#INSTALL_DATA=$(INSTALL) -m 644
6+
INSTALL_DATA=install -m 644
7+

debian/.debhelper/generated/desktop-base/installed-by-dh_installdocs

Whitespace-only changes.

debian/changelog

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
desktop-base (100.1) unstable; urgency=medium
2+
3+
* Create /usr/share/images/vendor-logos is not existent
4+
5+
-- Mateus Melchiades <matbme@duck.com> Thu, 09 Aug 2023 11:52:00 -0300
6+
7+
desktop-base (100.0) unstable; urgency=medium
8+
9+
* First version of the Vanilla OS desktop-base package
10+
11+
-- Mirko Brombin <send@mirko.pm> Thu, 09 Aug 2023 14:32:00 +0300

debian/compat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
13

debian/control

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Source: desktop-base
2+
Section: x11
3+
Priority: optional
4+
Maintainer: Vanilla OS Contributors <info@vanillaos.org>
5+
Build-Depends: debhelper (>= 13),
6+
inkscape,
7+
librsvg2-bin,
8+
optipng
9+
10+
Rules-Requires-Root: no
11+
Standards-Version: 4.6.2
12+
Homepage: https://github.com/Vanilla-OS/desktop-base
13+
Vcs-Browser: https://github.com/Vanilla-OS/desktop-base
14+
Vcs-Git: https://github.com/Vanilla-OS/desktop-base.git
15+
Package: desktop-base
16+
Architecture: all
17+
Depends: librsvg2-common
18+
Suggests: gnome
19+
Description: common files for the Vanilla OS GNOME

debian/copyright

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
License: GPL-3+ or CC-BY-SA-3.0

debian/debhelper-build-stamp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
desktop-base
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# The following folders are created in order to point alternatives to them.
2+
# They filled by update-alternatives in postinst during installation.
3+
desktop-base binary: package-contains-empty-directory [usr/share/icons/vendor/128x128/emblems/]
4+
desktop-base binary: package-contains-empty-directory [usr/share/icons/vendor/256x256/emblems/]
5+
desktop-base binary: package-contains-empty-directory [usr/share/icons/vendor/64x64/emblems/]
6+
desktop-base binary: package-contains-empty-directory [usr/share/icons/vendor/scalable/emblems/]
7+
8+
# We do want the debian in circle logo to be copied for newly created users
9+
desktop-base: package-contains-file-in-etc-skel [etc/skel/.face.icon]
10+
desktop-base: package-contains-file-in-etc-skel [etc/skel/.face]
11+
12+
# to make lintian/ftp-master happy :-/
13+
desktop-base: package-contains-file-in-etc-skel etc/skel/.face.icon
14+
desktop-base: package-contains-file-in-etc-skel etc/skel/.face

0 commit comments

Comments
 (0)