Merge branch 'rpm' into 'master'HEADmaster

before 3.0.1

See merge request chicago95-packaging/chicago95-packages!2

20 files changed, 149 insertions, 46 deletions

diff --git a/debian/changelog b/debian/changelog
index 527613d..c04fa3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-chicago95 (0.0.2-1) obs; urgency=low
+chicago95 (2.0.1-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 <bgstack15@gmail.com>  Thu, 14 May 2020 11:38:57 -0400
+ -- B Stack <bgstack15@gmail.com>  Mon, 29 Jun 2020 15:03:44 -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-backgrounds.install b/debian/chicago95-theme-backgrounds.install
new file mode 100644
index 0000000..f24a783
--- /dev/null
+++ b/debian/chicago95-theme-backgrounds.install
@@ -0,0 +1 @@
+/usr/share/backgrounds/Chicago95
diff --git a/debian/chicago95-theme-greeter.lintian-overrides b/debian/chicago95-theme-backgrounds.lintian-overrides
index 0166b46..4276455 100644
--- a/debian/chicago95-theme-greeter.lintian-overrides
+++ b/debian/chicago95-theme-backgrounds.lintian-overrides
@@ -1,2 +1 @@
 copyright-has-url-from-dh_make-boilerplate
-embedded-javascript-library
diff --git a/debian/chicago95-theme-cursors.install b/debian/chicago95-theme-cursors.install
index de99df1..5535185 100644
--- a/debian/chicago95-theme-cursors.install
+++ b/debian/chicago95-theme-cursors.install
@@ -1,3 +1,12 @@
-/usr/share/icons/Chicago95_Cursor_Black
-/usr/share/icons/Chicago95_Cursor_White
-/usr/share/icons/Chicago95_Emerald
+/usr/share/icons/Chicago95_Cursor_Black/cursors
+/usr/share/icons/Chicago95_Cursor_Black/index.theme
+/usr/share/icons/Chicago95_Cursor_White/cursors
+/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_Cursors_Black/cursors
+/usr/share/icons/Chicago95_Standard_Cursors_Black/index.theme
diff --git a/debian/chicago95-theme-doc.install b/debian/chicago95-theme-doc.install
new file mode 100644
index 0000000..31d13ad
--- /dev/null
+++ b/debian/chicago95-theme-doc.install
@@ -0,0 +1 @@
+usr/share/doc/chicago95/* usr/share/doc/chicago95-theme-doc
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-gtk.install b/debian/chicago95-theme-gtk.install
index c4413fa..1804693 100644
--- a/debian/chicago95-theme-gtk.install
+++ b/debian/chicago95-theme-gtk.install
@@ -1,2 +1,3 @@
 /usr/share/xfce4/terminal/colorschemes/Chicago95.theme
 /usr/share/themes/Chicago95
+/usr/share/xfce4-panel-profiles/layouts/Chicago95*
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
new file mode 100644
index 0000000..aa4419b
--- /dev/null
+++ b/debian/chicago95-theme-plus.install
@@ -0,0 +1,12 @@
+/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/applications/PlusGUI.desktop
+/usr/share/chicago95-theme-plus
+/usr/share/mime/packages/*.xml
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-plus.manpages b/debian/chicago95-theme-plus.manpages
new file mode 100644
index 0000000..4796ede
--- /dev/null
+++ b/debian/chicago95-theme-plus.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/ChicagoPlus.1.gz
+debian/tmp/usr/share/man/man1/PlusGUI.1.gz
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/chicago95.dsc b/debian/chicago95.dsc
index 6fccb62..755152f 100644
--- a/debian/chicago95.dsc
+++ b/debian/chicago95.dsc
@@ -1,22 +1,25 @@
 Format: 3.0 (quilt)
 Source: chicago95
-Binary: chicago95-theme-all, chicago95-theme-cursors, chicago95-theme-doc, chicago95-theme-fonts, chicago95-theme-greeter, chicago95-theme-gtk, chicago95-theme-icons, chicago95-theme-plymouth, chicago95-theme-login-sound
+Binary: chicago95-theme-all, chicago95-theme-cursors, chicago95-theme-doc, chicago95-theme-fonts, chicago95-theme-gtk, chicago95-theme-icons, chicago95-theme-plymouth, chicago95-theme-sounds, chicago95-theme-login-sound, chicago95-theme-plus, chicago95-theme-backgrounds
 Architecture: all
-Version: 0.0.2-1
+Version: 2.0.1-1
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://github.com/grassmunk/Chicago95
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 9~)
+Build-Depends: debhelper (>= 9~), txt2man
 Package-List:
  chicago95-theme-all deb misc optional arch=all
+ chicago95-theme-backgrounds deb misc optional arch=all
  chicago95-theme-cursors deb misc optional arch=all
  chicago95-theme-doc deb misc optional arch=all
  chicago95-theme-fonts deb misc optional arch=all
- chicago95-theme-greeter deb misc optional arch=all
  chicago95-theme-gtk deb misc optional arch=all
  chicago95-theme-icons deb misc optional arch=all
  chicago95-theme-login-sound deb misc optional arch=all
+ chicago95-theme-plus deb misc optional arch=all
  chicago95-theme-plymouth deb misc optional arch=all
+ chicago95-theme-sounds deb misc optional arch=all
 Files:
- 00000000000000000000000000000000 1 chicago95.orig.tar.gz
- 00000000000000000000000000000000 1 chicago95.debian.tar.xz
+ 00000000000000000000000000000000 0 chicago95.orig.tar.gz
+ 00000000000000000000000000000000 0 chicago95.debian.tar.xz
+
diff --git a/debian/control b/debian/control
index 1b802de..76b5433 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: chicago95
 Section: misc
 Priority: optional
 Maintainer: B Stack <bgstack15@gmail.com>
-Build-Depends: debhelper (>=9~)
+Build-Depends: debhelper (>=9~),
+   txt2man
 Standards-Version: 4.1.4
 Homepage: https://github.com/grassmunk/Chicago95
 
@@ -10,14 +11,16 @@ Package: chicago95-theme-all
 Architecture: all
 Multi-Arch: foreign
 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-login-sound,
+   chicago95-theme-backgrounds (= ${binary:Version}),
+   chicago95-theme-cursors (= ${binary:Version}),
+   chicago95-theme-doc (= ${binary:Version}),
+   chicago95-theme-fonts (= ${binary:Version}),
+   chicago95-theme-gtk (= ${binary:Version}),
+   chicago95-theme-icons (= ${binary:Version}),
+   chicago95-theme-login-sound (= ${binary:Version}),
+   chicago95-theme-plus (= ${binary:Version}),
+   chicago95-theme-plymouth (= ${binary:Version}),
+   chicago95-theme-sounds (= ${binary:Version})
 Description: XFCE Windows 95 Total Conversion
  Assets to allow customization of Xfce to look as
  close to Microsoft Windows 95 as possible. This
@@ -48,22 +51,12 @@ 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
 Depends: ${misc:Depends}, ${shlibs:Depends},
 Suggests: qt5-style-plugins
+Breaks: chicago95-theme-greeter (<< ${binary:Version})
 Description: GTK and WM themes for Chicago95
  Themes for GTK2, GTK3, Metacity, and more, for the
  Chicago95 theme suite.
@@ -83,6 +76,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
@@ -90,3 +90,23 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
    sox
 Description: Login sound for Chicago95
  XDG autostart and sound file for Chicago95 theme suite.
+
+Package: chicago95-theme-plus
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends},
+   inkscape,
+   python3,
+   python3-fonttools,
+   python3-numpy,
+   python3-svgwrite
+Description: Windows Plus! Theme Conversion for XFCE/Chicago95
+ Translate Windows 95 Plus! themes to Gtk-compatible themes.
+
+Package: chicago95-theme-backgrounds
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends},
+Description: Backgrounds for Chicago95
+ Backgrounds that resemble some of the classic Windows 95
+ wallpapers. This is part of the chicago95 theme suite.
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
new file mode 100644
index 0000000..782c25c
--- /dev/null
+++ b/debian/patches/paths.patch
@@ -0,0 +1,49 @@
+Name: paths.patch
+Author: bgstack15@gmail.com
+Date: 2020-06-29 19:47
+Message: Use the system paths for the template themes.
+diff -x .git -x '.*.swp' -x '*.orig' -Naur Chicago95/Plus/ChicagoPlus.py Chicago95-dpkg/Plus/ChicagoPlus.py
+--- Chicago95/Plus/ChicagoPlus.py	2020-06-29 16:59:03.699020541 -0400
++++ Chicago95-dpkg/Plus/ChicagoPlus.py	2020-06-29 20:24:29.028121894 -0400
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python3
+ 
+ import sys
++sys.path.append("/usr/libexec/chicago95-theme-plus")
+ from pluslib import ChicagoPlus
+ import argparse
+ import logging
+diff -x .git -x '.*.swp' -x '*.orig' -Naur Chicago95/Plus/PlusGUI.py Chicago95-dpkg/Plus/PlusGUI.py
+--- Chicago95/Plus/PlusGUI.py	2020-06-29 16:58:06.138275601 -0400
++++ Chicago95-dpkg/Plus/PlusGUI.py	2020-06-29 20:25:05.264601994 -0400
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python3
+ 
+ import sys
++sys.path.append("/usr/libexec/chicago95-theme-plus")
+ from pluslib import ChicagoPlus
+ import logging
+ from pathlib import Path
+@@ -21,15 +22,15 @@
+ from gi.repository import Gtk, GdkPixbuf, GLib
+ 
+ running_folder = os.path.dirname(os.path.abspath(__file__))
+-share_dir = running_folder
+-libexec_dir = running_folder
+-work_dir = running_folder
++share_dir = "/usr/share/chicago95-theme-plus"
++libexec_dir = "/usr/libexec/chicago95-theme-plus"
++work_dir = os.path.expanduser("~")+"/tmp"
+ if not os.path.exists(work_dir):
+     os.makedirs(work_dir)
+ 
+-c95_packaged_cursor_path=str(Path.home())+"/.icons/Chicago95_Cursor_Black"
+-c95_packaged_theme_path=str(Path.home())+"/.themes/Chicago95"
+-c95_packaged_icons_path=str(Path.home())+"/.icons/Chicago95"
++c95_packaged_cursor_path="/usr/share/icons/Chicago95_Cursor_Black"
++c95_packaged_theme_path="/usr/share/themes/Chicago95"
++c95_packaged_icons_path="/usr/share/icons/Chicago95"
+ 
+ #print("Font List...", end=' ', flush=True)
+ fonts_output = subprocess.check_output(['convert', '-list', 'font'])
+
diff --git a/debian/patches/series b/debian/patches/series
index 4a97dfa..d851e26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# You must remove unused comment lines for the released package.
+paths.patch
diff --git a/debian/rules b/debian/rules
index bc6662c..2d1d47a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,22 @@ 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
 
 override_dh_auto_clean:
 	rm -f ${buildroot}${_datadir}/sounds/Chicago95/startup.ogg
 	dh_auto_clean
+
+override_dh_fixperms:
+	dh_fixperms || :
+	chmod 0755 ${buildroot}${_datadir}/themes/Chicago95/gtk-3.0 || :
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 2da37ed..4ba953e 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,3 @@
 file-without-copyright-information
 missing-license-paragraph-in-dep5-copyright
+package-uses-deprecated-debhelper-compat-version