From b0913b91193bc8378ef53b167a9f8165c2fecc2e Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 29 Jun 2020 09:08:07 -0400 Subject: WIP: improve packaging Still need to modify the Plus scripts to work with all the changed asset locations. --- debian/changelog | 4 +++- debian/chicago95-startup.desktop | 8 -------- debian/chicago95-theme-cursors.install | 12 ++++++------ debian/chicago95-theme-greeter.install | 1 - debian/chicago95-theme-greeter.lintian-overrides | 2 -- debian/chicago95-theme-login-sound.install | 5 ++--- debian/chicago95-theme-plus.install | 10 ++++++++++ debian/chicago95-theme-plus.lintian-overrides | 3 +++ debian/chicago95-theme-sounds.install | 2 ++ debian/chicago95-theme-sounds.lintian-overrides | 1 + debian/control | 23 ++++++++++------------- debian/rules | 5 ++++- 12 files changed, 41 insertions(+), 35 deletions(-) delete mode 100644 debian/chicago95-startup.desktop delete mode 100644 debian/chicago95-theme-greeter.install delete mode 100644 debian/chicago95-theme-greeter.lintian-overrides create mode 100644 debian/chicago95-theme-plus.lintian-overrides create mode 100644 debian/chicago95-theme-sounds.install create mode 100644 debian/chicago95-theme-sounds.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 527613d..c83f4bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ chicago95 (0.0.2-1) obs; urgency=low * New upstream release * Remove distro name from version, because this package is now built for multiple platforms from the same source. + * Remove greeter theme (depended on obsolete webkit2-based greeter) + * Add chicago95-theme-sounds and chicago95-theme-plus - -- Ben Stack Thu, 14 May 2020 11:38:57 -0400 + -- B Stack Mon, 29 Jun 2020 08:56:27 -0400 chicago95 (0.0.1-1+devuan) obs; urgency=low diff --git a/debian/chicago95-startup.desktop b/debian/chicago95-startup.desktop deleted file mode 100644 index 2253c2b..0000000 --- a/debian/chicago95-startup.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Chicago95 startup sound -Exec=play /usr/share/sounds/Chicago95/startup.ogg -NoDisplay=true -Terminal=false -Categories= -GenericName=startup sound diff --git a/debian/chicago95-theme-cursors.install b/debian/chicago95-theme-cursors.install index 9a5e7d1..5535185 100644 --- a/debian/chicago95-theme-cursors.install +++ b/debian/chicago95-theme-cursors.install @@ -4,9 +4,9 @@ /usr/share/icons/Chicago95_Cursor_White/index.theme /usr/share/icons/Chicago95_Emerald/cursors /usr/share/icons/Chicago95_Emerald/index.theme -/usr/share/icons/Chicago95\ Animated\ Hourglass\ Cursors/cursors -/usr/share/icons/Chicago95\ Animated\ Hourglass\ Cursors/index.theme -/usr/share/icons/Chicago95\ Standard\ Cursors/cursors -/usr/share/icons/Chicago95\ Standard\ Cursors/index.theme -/usr/share/icons/Chicago95\ Standard\ Black\ Cursors/cursors -/usr/share/icons/Chicago95\ Standard\ Black\ Cursors/index.theme +/usr/share/icons/Chicago95_Animated_Hourglass_Cursors/cursors +/usr/share/icons/Chicago95_Animated_Hourglass_Cursors/index.theme +/usr/share/icons/Chicago95_Standard_Cursors/cursors +/usr/share/icons/Chicago95_Standard_Cursors/index.theme +/usr/share/icons/Chicago95_Standard_Cursors_Black/cursors +/usr/share/icons/Chicago95_Standard_Cursors_Black/index.theme diff --git a/debian/chicago95-theme-greeter.install b/debian/chicago95-theme-greeter.install deleted file mode 100644 index e2abc3f..0000000 --- a/debian/chicago95-theme-greeter.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/lightdm-webkit/themes/Chicago95 diff --git a/debian/chicago95-theme-greeter.lintian-overrides b/debian/chicago95-theme-greeter.lintian-overrides deleted file mode 100644 index 0166b46..0000000 --- a/debian/chicago95-theme-greeter.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -copyright-has-url-from-dh_make-boilerplate -embedded-javascript-library diff --git a/debian/chicago95-theme-login-sound.install b/debian/chicago95-theme-login-sound.install index 1f9339d..d47040b 100644 --- a/debian/chicago95-theme-login-sound.install +++ b/debian/chicago95-theme-login-sound.install @@ -1,3 +1,2 @@ -/usr/share/sounds/Chicago95/startup.ogg -# waiting to be added in upstream -#/etc/xdg/autostart/chicago95-startup.desktop +usr/share/sounds/Chicago95/startup.ogg +/etc/xdg/autostart/chicago95-startup.desktop diff --git a/debian/chicago95-theme-plus.install b/debian/chicago95-theme-plus.install index e69de29..bd4e4ea 100644 --- a/debian/chicago95-theme-plus.install +++ b/debian/chicago95-theme-plus.install @@ -0,0 +1,10 @@ +/usr/share/icons/Chicago95_Cursor_Black/src +/usr/share/icons/Chicago95_Cursor_White/src +/usr/share/icons/Chicago95_Emerald/src +/usr/share/icons/Chicago95_Animated_Hourglass_Cursors/build +/usr/share/icons/Chicago95_Standard_Cursors/build +/usr/share/icons/Chicago95_Standard_Cursors_Black/build +/usr/bin/ChicagoPlus +/usr/bin/PlusGUI +/usr/libexec/chicago95-theme-plus +/usr/share/chicago95-theme-plus diff --git a/debian/chicago95-theme-plus.lintian-overrides b/debian/chicago95-theme-plus.lintian-overrides new file mode 100644 index 0000000..fca6c01 --- /dev/null +++ b/debian/chicago95-theme-plus.lintian-overrides @@ -0,0 +1,3 @@ +copyright-has-url-from-dh_make-boilerplate +script-not-executable usr/share/icons/*/src/Build.sh +script-not-executable usr/libexec/chicago95-theme-plus/pluslib.py diff --git a/debian/chicago95-theme-sounds.install b/debian/chicago95-theme-sounds.install new file mode 100644 index 0000000..794c7ad --- /dev/null +++ b/debian/chicago95-theme-sounds.install @@ -0,0 +1,2 @@ +usr/share/sounds/Chicago95/stereo +usr/share/sounds/Chicago95/index.theme diff --git a/debian/chicago95-theme-sounds.lintian-overrides b/debian/chicago95-theme-sounds.lintian-overrides new file mode 100644 index 0000000..4276455 --- /dev/null +++ b/debian/chicago95-theme-sounds.lintian-overrides @@ -0,0 +1 @@ +copyright-has-url-from-dh_make-boilerplate diff --git a/debian/control b/debian/control index b220ea3..4472db0 100644 --- a/debian/control +++ b/debian/control @@ -13,10 +13,10 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, chicago95-theme-cursors, chicago95-theme-doc, chicago95-theme-fonts, - chicago95-theme-greeter, chicago95-theme-gtk, chicago95-theme-icons, chicago95-theme-plymouth, + chicago95-theme-sounds, chicago95-theme-login-sound, chicago95-theme-plus Description: XFCE Windows 95 Total Conversion @@ -49,17 +49,6 @@ Description: Fonts for Chicago95 Overall system fonts are proprietary but described in the documentation for the theme. -Package: chicago95-theme-greeter -Architecture: all -Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, - lightdm-webkit2-greeter, -Description: Lightdm webkit greeter for Chicago95 - Currently broken because no debian derivative yet - packages lightdm-webkit2-greeter. - WORKHERE - https://build.opensuse.org/package/show/home:antergos/lightdm-webkit2-greeter - Package: chicago95-theme-gtk Architecture: all Multi-Arch: foreign @@ -84,6 +73,13 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Plymouth theme for Chicago95 Currently broken because Devuan does not package plymouth. +Package: chicago95-theme-sounds +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends}, +Description: Sounds for Chicago95 + UI sounds for Chicago95 theme. + Package: chicago95-theme-login-sound Architecture: all Multi-Arch: foreign @@ -95,8 +91,9 @@ Description: Login sound for Chicago95 Package: chicago95-theme-plus Architecture: all Multi-Arch: foreign -Depends: +Depends: ${misc:Depends}, ${shlibs:Depends}, inkscape, + python3, python3-fonttools, python3-numpy, python3-svgwrite diff --git a/debian/rules b/debian/rules index 1835fff..2d1d47a 100755 --- a/debian/rules +++ b/debian/rules @@ -10,12 +10,15 @@ export buildroot="${debuilddir}/${appname}" export _datadir="/usr/share" export _bindir="/usr/bin" +# if dhcompat=13 then the .install file can use ${Space} but we are at dhcompat=9 +# so we have to use underscores for the make install. +export use_underscores=YES + %: dh $@ override_dh_auto_install: dh_auto_install - install -m0755 -d ${buildroot}${_datadir}/sounds/Chicago95 install -m0644 "Extras/Microsoft Windows 95 Startup Sound.ogg" ${buildroot}${_datadir}/sounds/Chicago95/startup.ogg -- cgit