forked from QubesOS/qubes-desktop-linux-xfce4
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- clean Makefile and add 'install' target - refactor spec according to Makefile QubesOS/qubes-issues#4186
- Loading branch information
Showing
18 changed files
with
161 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,4 @@ | ||
| sudo: required | ||
| dist: bionic | ||
| language: generic | ||
| install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder | ||
| script: ~/qubes-builder/scripts/travis-build | ||
| env: | ||
| - DIST_DOM0=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 | ||
| - DISTS_VM=fc30 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 | ||
| - DISTS_VM=fc31 USE_QUBES_REPO_VERSION=4.1 USE_QUBES_REPO_TESTING=1 | ||
|
|
||
| # don't build tags which are meant for code signing only | ||
| branches: | ||
| except: | ||
| - /.*_.*/ | ||
| - build | ||
| import: | ||
| - source: QubesOS/qubes-continuous-integration:R4.1/travis-base-r4.1.yml | ||
| - source: QubesOS/qubes-continuous-integration:R4.1/travis-dom0-r4.1.yml | ||
| - source: QubesOS/qubes-continuous-integration:R4.1/travis-vms-r4.1.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,14 @@ | ||
| SPECFILE := xfce4-settings-qubes.spec | ||
| include Makefile.common | ||
|
|
||
| install: | ||
| install -m 644 -D xfce4-panel-qubes-default.xml $(DESTDIR)/etc/xdg/xfce4/panel/default.xml.qubes | ||
| install -m 644 -D xsettings.xml $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.qubes | ||
| install -m 644 -D xfwm4.xml $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml | ||
| install -m 644 -D xfce4-desktop.xml $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml | ||
| install -m 644 -D xfce4-session.xml $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml.qubes | ||
| install -m 644 -D xfce4-power-manager.xml $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml.qubes | ||
| install -m 644 -D xfce4-keyboard-shortcuts.xml $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml.qubes | ||
| ln -s ../../panel/default.xml $(DESTDIR)/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml | ||
| install -m 644 -D xfce4-xss-lock.desktop $(DESTDIR)/etc/xdg/autostart/xfce4-xss-lock.desktop | ||
| install -m 644 -D qubes-update-xfce-config.desktop $(DESTDIR)/etc/xdg/autostart/qubes-update-xfce-config.desktop | ||
| install -m 755 -D update-xfce-config $(DESTDIR)/usr/lib/qubes/update-xfce-config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| RPM_SPEC_FILES := xfce4-settings-qubes.spec | ||
| DEBIAN_BUILD_DIRS := debian |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| xfce4-settings-qubes (4.0.3-2) unstable; urgency=medium | ||
|
|
||
| Initial commit | ||
|
|
||
| -- Frédéric Pierret (fepitre) <[email protected]> Sun, 14 Jun 2020 10:00:00 +0200 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| Source: xfce4-settings-qubes | ||
| Section: xfce | ||
| Priority: extra | ||
| Maintainer: Frédéric Pierret (fepitre) <[email protected]> | ||
| Build-Depends: | ||
| debhelper (>= 9~) | ||
| Standards-Version: 3.9.5 | ||
| Homepage: http://www.qubes-os.org | ||
|
|
||
| Package: xfce4-settings-qubes | ||
| Section: xfce | ||
| Architecture: amd64 | ||
| Depends: qubes-artwork, xfce4-panel, xss-lock, ${shlibs:Depends}, ${misc:Depends} | ||
| Description: Default Xfce4 panel settings for Qubes. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ | ||
| Upstream-Name: desktop-linux-xfce4 | ||
| Source: <http://www.qubes-os.org/> | ||
|
|
||
| Files: debian/* | ||
| Copyright: 2020 Frédéric Pierret (fepitre) <[email protected]> License: GPL-2+ | ||
| License: GPL-2+ | ||
| This package is free software; you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation; either version 2 of the License, or | ||
| (at your option) any later version. | ||
| . | ||
| This package is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| . | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/> | ||
| . | ||
| On Debian systems, the complete text of the GNU General | ||
| Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| etc/xdg/xfce4/panel/default.xml.qubes | ||
| etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.qubes | ||
| etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml | ||
| etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml | ||
| etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml | ||
| etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml.qubes | ||
| etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml.qubes | ||
| etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml.qubes | ||
| etc/xdg/autostart/xfce4-xss-lock.desktop | ||
| etc/xdg/autostart/qubes-update-xfce-config.desktop | ||
| usr/lib/qubes/update-xfce-config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -e | ||
|
|
||
| settings_replace() { | ||
| origfile="$1" | ||
| qubesfile="${1}.qubes" | ||
| backupfile=${origfile}.xfce4 | ||
| if [ -r "$origfile" ] && [ ! -r "$backupfile" ]; then | ||
| mv -f "$origfile" "$backupfile" | ||
| fi | ||
| cp -f "$qubesfile" "$origfile" | ||
| } | ||
|
|
||
| if [ "$1" = trigerred ]; then | ||
| for trigger in $2; do | ||
| settings_replace "$trigger" | ||
| done | ||
| fi | ||
|
|
||
| #DEBHELPER# | ||
|
|
||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -e | ||
|
|
||
| # remove alternatives links | ||
|
|
||
| if [ "$1" = "remove" ]; then | ||
| REPLACEFILE="${REPLACEFILE} /etc/xdg/xfce4/panel/default.xml.qubes" | ||
| REPLACEFILE="${REPLACEFILE} /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.qubes" | ||
| REPLACEFILE="${REPLACEFILE} /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml.qubes" | ||
| REPLACEFILE="${REPLACEFILE} /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml.qubes" | ||
| REPLACEFILE="${REPLACEFILE} /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml.qubes" | ||
| if [ $1 -lt 1 ]; then | ||
| for file in ${REPLACEFILE}; do | ||
| origfile=${file%.qubes} | ||
| backupfile=${origfile}.xfce4 | ||
| mv -f "$backupfile" "$origfile" | ||
| done | ||
| fi | ||
| fi | ||
|
|
||
| #DEBHELPER# | ||
|
|
||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #!/usr/bin/make -f | ||
|
|
||
| include /usr/share/dpkg/default.mk | ||
| export DESTDIR=$(shell pwd)/debian/tmp | ||
|
|
||
| %: | ||
| dh $@ | ||
|
|
||
| override_dh_auto_install: | ||
| make install | ||
|
|
||
| override_dh_install: | ||
| dh_install --fail-missing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 3.0 (quilt) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| extend-diff-ignore = "(^|/)(.git/.*)$" | ||
| extend-diff-ignore = "(^|/)(deb/.*)$" | ||
| extend-diff-ignore = "(^|/)(pkgs/.*)$" | ||
| extend-diff-ignore = "(^|/)(rpm/.*)$" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| interest-noawait /etc/xdg/xfce4/panel/default.xml | ||
| interest-noawait /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml | ||
| interest-noawait /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml | ||
| interest-noawait /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml | ||
| interest-noawait /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 4.0.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters