VesperOS/desktop-base
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate to debhelper 11, fix usage of install in Makefiles thanks to lintian

Browse Source
This commit is contained in:
Aurélien COUDERC
2018-02-26 12:43:44 +01:00
parent 2da2c89a9a
commit cb94f0ee12
9 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
Makefile
View File

@@ -31,10 +31,10 @@ install-local:
cd $(DESTDIR)/usr/share/images/desktop-base && ln -s $(DEFAULT_BACKGROUND) default
# desktop files
mkdir -p $(DESTDIR)/usr/share/desktop-base
$(INSTALL) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/
$(INSTALL_DATA) $(DESKTOPFILES) $(DESTDIR)/usr/share/desktop-base/
# pixmaps files
mkdir -p $(DESTDIR)/usr/share/pixmaps
$(INSTALL) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/
$(INSTALL_DATA) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/
# Create a 'debian-theme' symlink in plymouth themes folder, pointing at the
# plymouth theme for the currently active 'desktop-theme' alternative.
@@ -43,11 +43,11 @@ install-local:
# Set Plasma 5/KDE default wallpaper
install -d $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates
$(INSTALL) defaults/plasma5/desktop-base.js $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
$(INSTALL_DATA) defaults/plasma5/desktop-base.js $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
# Xfce 4.6
mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
$(INSTALL) $(wildcard profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
$(INSTALL_DATA) $(wildcard profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
# GNOME background descriptors
mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
@@ -56,18 +56,18 @@ install-local:
# Space Fun theme (Squeeze’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/spacefun
$(INSTALL) $(wildcard spacefun-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/spacefun
$(INSTALL_DATA) $(wildcard spacefun-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/spacefun
cd $(DESTDIR)/usr/share/desktop-base/spacefun-theme && ln -s /usr/share/plymouth/themes/spacefun plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/spacefun-theme/login
$(INSTALL) $(wildcard spacefun-theme/login/*) $(DESTDIR)/usr/share/desktop-base/spacefun-theme/login
$(INSTALL_DATA) $(wildcard spacefun-theme/login/*) $(DESTDIR)/usr/share/desktop-base/spacefun-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper/contents/images
$(INSTALL) spacefun-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper
$(INSTALL) spacefun-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper
$(INSTALL) $(wildcard spacefun-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper/contents/images/
$(INSTALL) spacefun-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-spacefun.xml
$(INSTALL_DATA) spacefun-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper
$(INSTALL_DATA) spacefun-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper
$(INSTALL_DATA) $(wildcard spacefun-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper/contents/images/
$(INSTALL_DATA) spacefun-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-spacefun.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/spacefun-theme/wallpaper SpaceFun
@@ -79,27 +79,27 @@ install-local:
# Joy theme (Wheezy’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/joy
$(INSTALL) $(wildcard joy-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/joy
$(INSTALL_DATA) $(wildcard joy-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/joy
cd $(DESTDIR)/usr/share/desktop-base/joy-theme && ln -s /usr/share/plymouth/themes/joy plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/joy-theme/login
$(INSTALL) $(wildcard joy-theme/login/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/login
$(INSTALL_DATA) $(wildcard joy-theme/login/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper/contents/images
$(INSTALL) joy-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper
$(INSTALL) joy-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper
$(INSTALL) $(wildcard joy-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper/contents/images/
$(INSTALL) joy-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-joy.xml
$(INSTALL_DATA) joy-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper
$(INSTALL_DATA) joy-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper
$(INSTALL_DATA) $(wildcard joy-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/wallpaper/contents/images/
$(INSTALL_DATA) joy-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-joy.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/joy-theme/wallpaper Joy
### Lockscreen
install -d $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen/contents/images
$(INSTALL) joy-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen
$(INSTALL) joy-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen
$(INSTALL) $(wildcard joy-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen/contents/images/
$(INSTALL_DATA) joy-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen
$(INSTALL_DATA) joy-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen
$(INSTALL_DATA) $(wildcard joy-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/lockscreen/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/joy-theme/lockscreen JoyLockScreen
@@ -113,10 +113,10 @@ install-local:
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper/contents/images
$(INSTALL) joy-inksplat-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper
$(INSTALL) joy-inksplat-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper
$(INSTALL) $(wildcard joy-inksplat-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper/contents/images/
$(INSTALL) joy-inksplat-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-joy-inksplat.xml
$(INSTALL_DATA) joy-inksplat-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper
$(INSTALL_DATA) joy-inksplat-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper
$(INSTALL_DATA) $(wildcard joy-inksplat-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper/contents/images/
$(INSTALL_DATA) joy-inksplat-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-joy-inksplat.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/joy-inksplat-theme/wallpaper JoyInksplat
@@ -127,27 +127,27 @@ install-local:
# Lines theme (Jessie’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/lines
$(INSTALL) $(wildcard lines-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/lines
$(INSTALL_DATA) $(wildcard lines-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/lines
cd $(DESTDIR)/usr/share/desktop-base/lines-theme && ln -s /usr/share/plymouth/themes/lines plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/login
$(INSTALL) $(wildcard lines-theme/login/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/login
$(INSTALL_DATA) $(wildcard lines-theme/login/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper/contents/images
$(INSTALL) lines-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper
$(INSTALL) lines-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper
$(INSTALL) $(wildcard lines-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper/contents/images/
$(INSTALL) lines-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-lines.xml
$(INSTALL_DATA) lines-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper
$(INSTALL_DATA) lines-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper
$(INSTALL_DATA) $(wildcard lines-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/wallpaper/contents/images/
$(INSTALL_DATA) lines-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-lines.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/lines-theme/wallpaper Lines
### Lockscreen
install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen/contents/images
$(INSTALL) lines-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen
$(INSTALL) lines-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen
$(INSTALL) $(wildcard lines-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen/contents/images/
$(INSTALL_DATA) lines-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen
$(INSTALL_DATA) lines-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen
$(INSTALL_DATA) $(wildcard lines-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/lockscreen/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/lines-theme/lockscreen LinesLockScreen
@@ -156,27 +156,27 @@ install-local:
# Soft waves theme (Stretch’s default)
### Plymouth theme
install -d $(DESTDIR)/usr/share/plymouth/themes/softwaves
$(INSTALL) $(wildcard softwaves-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/softwaves
$(INSTALL_DATA) $(wildcard softwaves-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/softwaves
cd $(DESTDIR)/usr/share/desktop-base/softwaves-theme && ln -s /usr/share/plymouth/themes/softwaves plymouth
### Login background
install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login
$(INSTALL) $(wildcard softwaves-theme/login/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login
$(INSTALL_DATA) $(wildcard softwaves-theme/login/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images
$(INSTALL) softwaves-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper
$(INSTALL) softwaves-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper
$(INSTALL) $(wildcard softwaves-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/
$(INSTALL) softwaves-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml
$(INSTALL_DATA) softwaves-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper
$(INSTALL_DATA) softwaves-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper
$(INSTALL_DATA) $(wildcard softwaves-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/
$(INSTALL_DATA) softwaves-theme/gnome-wp-list.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml
# Wallpaper symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/wallpaper SoftWaves
### Lockscreen
install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images
$(INSTALL) softwaves-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen
$(INSTALL) softwaves-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen
$(INSTALL) $(wildcard softwaves-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/
$(INSTALL_DATA) softwaves-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen
$(INSTALL_DATA) softwaves-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen
$(INSTALL_DATA) $(wildcard softwaves-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/
# Lock screen symlink for KDE
install -d $(DESTDIR)/usr/share/wallpapers
cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/lockscreen SoftWavesLockScreen

5
Makefile.inc
View File

@@ -1 +1,4 @@
INSTALL=install -m 0644
INSTALL=install
INSTALL_PROGRAM=$(INSTALL)
INSTALL_DATA=$(INSTALL) -m 644

2
debian/compat vendored
View File

@@ -1 +1 @@
10
11

2
debian/control vendored
View File

@@ -6,7 +6,7 @@ Uploaders: Yves-Alexis Perez <corsac@debian.org>,
Josselin Mouette <joss@debian.org>,
Paul Tagliamonte <paultag@debian.org>,
Aurélien COUDERC <zecoucou@free.fr>
Build-Depends: debhelper (>= 10), librsvg2-bin
Build-Depends: debhelper (>= 11), librsvg2-bin
Rules-Requires-Root: no
Standards-Version: 4.1.3
Homepage: https://www.debian.org/devel/debian-desktop/

8
emblems-debian/Makefile
View File

@@ -34,16 +34,16 @@ install:
EMBLEMS_DIR=$${RES_DIR}/emblems ; \
install -d $${EMBLEMS_DIR} ; \
PNG_SOURCE=$${EMBLEM}-$${RES}x$${RES}.png ; \
$(INSTALL) $${PNG_SOURCE} $${EMBLEMS_DIR}/$${EMBLEM}.png ; \
$(INSTALL) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \
$(INSTALL_DATA) $${PNG_SOURCE} $${EMBLEMS_DIR}/$${EMBLEM}.png ; \
$(INSTALL_DATA) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \
done ; \
done
# Install SVG emblems in the scalable emblems dir.
for EMBLEM in $(EMBLEMS) ; do \
EMBLEMS_DIR=$(DESTDIR)/$(scal_emblems_dir) ; \
install -d $${EMBLEMS_DIR} ; \
$(INSTALL) $${EMBLEM}.svg $${EMBLEMS_DIR}/ ; \
$(INSTALL) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \
$(INSTALL_DATA) $${EMBLEM}.svg $${EMBLEMS_DIR}/ ; \
$(INSTALL_DATA) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \
done
include ../Makefile.inc

2
joy-theme/grub/Makefile
View File

@@ -13,7 +13,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
$(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@

2
lines-theme/grub/Makefile
View File

@@ -13,7 +13,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
$(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@

2
softwaves-theme/grub/Makefile
View File

@@ -13,7 +13,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
$(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@

2
spacefun-theme/grub/Makefile
View File

@@ -13,7 +13,7 @@ clean:
install:
install -d $(DESTDIR)/$(dir)
$(INSTALL) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
$(INSTALL_DATA) $(wildcard *.png *.sh) $(DESTDIR)/$(dir)
grub-4x3.png: grub-4x3.svg
rsvg-convert $< > $@