Version 2.6.0

README.md

@@ -37,7 +37,7 @@ Theme used for the screenshots is available [here](https://github.com/luigifab/h
 
 It require **GTK 2.24+** or **GTK 3.0+** *(including 3.24)* or **GTK 4.0+**, and *GLIB 2.28+*.
 
-* Debian and Ubuntu: `sudo apt install awf-gtk2 awf-gtk3 awf-gtk4` (coming soon or via [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages))
+* Debian and Ubuntu: `sudo apt install awf-gtk2 awf-gtk3 awf-gtk4` (or via [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages))
 
 * Fedora: `sudo dnf install awf-gtk2 awf-gtk3 awf-gtk4`
 
@@ -60,12 +60,12 @@ sudo apt update
 sudo apt install awf-gtk2 awf-gtk3 awf-gtk4
 # or
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys FFE5BD439356DF7D
-echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish main" | sudo tee -a /etc/apt/sources.list
+echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list
 sudo apt update
 sudo apt install awf-gtk2 awf-gtk3 awf-gtk4
 # or
 sudo wget -O /etc/apt/trusted.gpg.d/luigifab.gpg https://www.luigifab.fr/apt.gpg
-echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish main" | sudo tee -a /etc/apt/sources.list
+echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list
 sudo apt update
 sudo apt install awf-gtk2 awf-gtk3 awf-gtk4
 ```
@@ -88,25 +88,20 @@ ls ~/.themes/yourtheme/gtk-3*/*.css | entr killall -s SIGHUP awf-gtk3
 
 ## Copyright
 
-- Current version: 2.5.0 (07/07/2021)
+- Current version: 2.6.0 (09/09/2021)
 - Compatibility: GTK 2.24 / 3.0 / 3.2 / 3.4 / 3.6 / 3.8 / 3.10 / 3.12 / 3.14 / 3.16 / 3.18 / 3.20 / 3.22 / 3.24 / 4.0 / 4.2
 - Translations: English (en), French (fr)
 - Links: [luigifab.fr](https://www.luigifab.fr/gtk/awf-extended) - [github.com](https://github.com/luigifab/awf-extended)\
-[Debian awf-gtk2.deb](https://tracker.debian.org/pkg/awf-gtk2)
-  *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959434),
-   [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959897))*
-; [Debian awf-gtk3.deb](https://tracker.debian.org/pkg/awf-gtk3)
-  *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959436),
-   [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959892))*
-; [Debian awf-gtk4.deb](https://tracker.debian.org/pkg/awf-gtk4)
-  *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959433),
-   [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986360))*\
+[Debian awf-gtk3.deb](https://packages.debian.org/awf-gtk)
+; [Debian awf-gtk4.deb](https://packages.debian.org/awf-gtk)\
 [Fedora awf-gtk2.rpm](https://src.fedoraproject.org/rpms/awf-gtk2)
 ; [Fedora awf-gtk3.rpm](https://src.fedoraproject.org/rpms/awf-gtk3)
 ; [Fedora awf-gtk4.rpm](https://src.fedoraproject.org/rpms/awf-gtk4)\
 [openSUSE awf-gtk2.rpm](https://software.opensuse.org/package/awf-gtk2)
 ; [openSUSE awf-gtk3.rpm](https://software.opensuse.org/package/awf-gtk3)
 ; [openSUSE awf-gtk4.rpm](https://software.opensuse.org/package/awf-gtk4)\
+[Ubuntu awf-gtk3.deb](https://packages.ubuntu.com/pkg/awf-gtk)
+; [Ubuntu awf-gtk4.deb](https://packages.ubuntu.com/pkg/awf-gtk)\
 [Ubuntu PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
 
 This program is provided under the terms of the **GNU GPLv3+** license.\

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([A widget factory], [2.5.0])
+AC_INIT([A widget factory], [2.6.0])
 AC_CONFIG_SRCDIR([src/awf.c])
 
 AM_INIT_AUTOMAKE

debian-gtk/awf-gtk2.install

@@ -0,0 +1,4 @@
+applications/awf-gtk2.desktop usr/share/applications
+icons-gtk2/*                  usr/share/icons/hicolor
+locale-awf-gtk2/*             usr/share/locale
+usr/bin/awf-gtk2              usr/bin

debian-gtk/awf-gtk3.install

@@ -0,0 +1,4 @@
+applications/awf-gtk3.desktop usr/share/applications
+icons-gtk3/*                  usr/share/icons/hicolor
+locale-awf-gtk3/*             usr/share/locale
+usr/bin/awf-gtk3              usr/bin

debian-gtk/awf-gtk4.install

@@ -0,0 +1,4 @@
+applications/awf-gtk4.desktop usr/share/applications
+icons-gtk4/*                  usr/share/icons/hicolor
+locale-awf-gtk4/*             usr/share/locale
+usr/bin/awf-gtk4              usr/bin

debian-gtk/changelog

@@ -0,0 +1,11 @@
+awf-gtk (2.6.0-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Thu, 09 Sep 2021 20:00:00 +0000
+
+awf-gtk (2.5.0-5) experimental; urgency=low
+
+  * Initial debian package release (Closes: #959434)
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Wed, 07 Jul 2021 20:00:00 +0000

debian-gtk/control

@@ -0,0 +1,40 @@
+Source: awf-gtk
+Section: x11
+Priority: optional
+Maintainer: Fabrice Creuzot <code@luigifab.fr>
+Build-Depends: debhelper-compat (= 13), libgtk2.0-dev, libgtk-3-dev, libgtk-4-dev
+Rules-Requires-Root: no
+Standards-Version: 4.5.1
+Homepage: https://github.com/luigifab/awf-extended
+Vcs-Browser: https://github.com/luigifab/awf-extended
+Vcs-Git: https://github.com/luigifab/awf-extended.git
+
+Package: awf-gtk2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: theme preview application for GTK 2
+ A widget factory is a theme preview application for GTK. It displays the
+ various widget types provided by GTK in a single window allowing to see
+ the visual effect of the applied theme.
+ .
+ This package provides the GTK 2 version.
+
+Package: awf-gtk3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: theme preview application for GTK 3
+ A widget factory is a theme preview application for GTK. It displays the
+ various widget types provided by GTK in a single window allowing to see
+ the visual effect of the applied theme.
+ .
+ This package provides the GTK 3 version.
+
+Package: awf-gtk4
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: theme preview application for GTK 4
+ A widget factory is a theme preview application for GTK. It displays the
+ various widget types provided by GTK in a single window allowing to see
+ the visual effect of the applied theme.
+ .
+ This package provides the GTK 4 version.

debian-gtk/copyright

@@ -0,0 +1,26 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/luigifab/awf-extended
+Upstream-Contact: Fabrice Creuzot <code@luigifab.fr>
+
+Files: *
+Copyright:
+ 2011-2016 Valère Monseur (valr) <valere.monseur@ymail.com>
+ 2020-2021 Fabrice Creuzot (luigifab) <code@luigifab.fr>
+License: GPL-3+
+
+License: GPL-3+
+ This program 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 3 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 <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

debian-gtk/deb.sh

@@ -0,0 +1,104 @@
+#!/bin/bash
+# debian: sudo apt install dpkg-dev devscripts build-essential dh-make dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev
+
+
+cd "$(dirname "$0")"
+version="2.6.0"
+
+
+rm -rf builder/
+mkdir builder
+
+# copy to a tmp directory
+if [ true ]; then
+	cd builder
+	wget https://github.com/luigifab/awf-extended/archive/v$version/awf-extended-$version.tar.gz
+	tar xzf awf-extended-$version.tar.gz
+	cd ..
+else
+	temp=awf-extended-$version
+	mkdir /tmp/$temp
+	cp -r ../* /tmp/$temp/
+	rm -rf /tmp/$temp/*/builder/
+
+	mv /tmp/$temp builder/
+	cp /usr/share/common-licenses/GPL-3 builder/$temp/LICENSE
+
+	cd builder/
+	tar czf $temp.tar.gz $temp
+	cd ..
+fi
+rm builder/awf-extended-$version/debian
+
+# create packages for debian and ubuntu
+for serie in experimental; do
+
+	if [ $serie = "experimental" ]; then
+		# for ubuntu
+		cp -a builder/awf-extended-$version/ builder/awf-extended-$version+src/
+		# debian only
+		cd builder/awf-extended-$version/
+	else
+		# ubuntu only
+		cp -a builder/awf-extended-$version+src/ builder/awf-extended-$version+$serie/
+		cd builder/awf-extended-$version+$serie/
+	fi
+
+	dh_make -s -y -f ../awf-extended-$version.tar.gz -p awf-gtk
+
+	rm -f debian/*ex debian/*EX debian/README* debian/*doc* debian/deb.sh
+	mkdir debian/upstream
+	cp debian-gtk/* debian/
+	mv debian/metadata debian/upstream/metadata
+
+
+
+	if [ $serie = "experimental" ]; then
+		dpkg-buildpackage -us -uc
+	else
+		# debhelper: experimental:13 hirsute:13 focal:12 bionic:9 xenial:9 trusty:9
+		if [ $serie = "focal" ]; then
+			sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 12)/g' debian/control
+		fi
+		if [ $serie = "bionic" ]; then
+			sed -i 's/dh $@/dh $@ --with autoreconf/g' debian/rules
+			sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 9), dh-autoreconf/g' debian/control
+		fi
+		if [ $serie = "xenial" ]; then
+			sed -i 's/dh $@/dh $@ --with autoreconf/g' debian/rules
+			sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), dh-autoreconf/g' debian/control
+			sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control
+			echo 9 > debian/compat
+		fi
+		if [ $serie = "trusty" ]; then
+			sed -i 's/dh $@/dh $@ --with autotools_dev,autoreconf/g' debian/rules
+			sed -i 's/override_dh_update_autotools_config/override_dh_autotools-dev_updateconfig/g' debian/rules
+			sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), autotools-dev, dh-autoreconf/g' debian/control
+			sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control
+			echo 9 > debian/compat
+		fi
+		sed -i 's/experimental/'$serie'/g' debian/changelog
+		sed -i 's/-1) /-1+'$serie') /' debian/changelog
+		dpkg-buildpackage -us -uc -ui -d -S
+	fi
+	echo "==========================="
+	cd ..
+
+	if [ $serie = "experimental" ]; then
+		# debian only
+		debsign awf-gtk_$version-*.changes
+		echo "==========================="
+		lintian -EviIL +pedantic awf-gtk_$version-*.deb
+	else
+		# ubuntu only
+		debsign awf-gtk_$version*+$serie*source.changes
+	fi
+	echo "==========================="
+	cd ..
+done
+
+ls -dltrh builder/*.deb builder/*.changes
+echo "==========================="
+
+# cleanup
+rm -rf builder/*/

debian-gtk/metadata

@@ -0,0 +1,6 @@
+Bug-Database: https://github.com/luigifab/awf-extended/issues/
+Bug-Submit: https://github.com/luigifab/awf-extended/issues/new
+Documentation: https://github.com/luigifab/awf-extended
+Repository: https://github.com/luigifab/awf-extended.git
+Repository-Browse: https://github.com/luigifab/awf-extended
+Screenshots: https://raw.githubusercontent.com/luigifab/awf-extended/levelup/images/gtk3.png

debian-gtk/rules

@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@
+
+override_dh_update_autotools_config:
+	#sed -i 's/ -eq 2/ -eq -1/g' configure.ac
+	touch NEWS
+	touch AUTHORS
+	touch README
+	touch ChangeLog
+	mv LICENSE COPYING
+	#for gtk in "gtk3" "gtk4"; do \
+	for gtk in "gtk2" "gtk3" "gtk4"; do \
+		cp -ar icons/ icons-$$gtk/; \
+		for file in icons-$$gtk/*/*/awf.png; do mv $$file `dirname $$file`/awf-$$gtk.png; done; \
+		for file in icons-$$gtk/*/*/awf.svg; do mv $$file `dirname $$file`/awf-$$gtk.svg; done; \
+		for file in src/po/*.po; do \
+			code=`basename "$$file" .po`; \
+			mkdir -p locale-awf-$$gtk/$$code/LC_MESSAGES/; \
+			msgfmt src/po/$$code.po -o locale-awf-$$gtk/$$code/LC_MESSAGES/awf-$$gtk.mo; \
+		done; \
+	done

debian-gtk/watch

@@ -0,0 +1,2 @@
+version=4
+https://github.com/luigifab/awf-extended/releases .*awf-([0-9.]+)\.tar\.gz

debian-gtk2/changelog

@@ -1,4 +1,10 @@
-awf-gtk2 (2.5.0-1) unstable; urgency=low
+awf-gtk2 (2.6.0-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Thu, 09 Sep 2021 20:00:00 +0000
+
+awf-gtk2 (2.5.0-1) experimental; urgency=low
 
   * Initial debian package release (Closes: #959434)
 

debian-gtk2/control

@@ -12,9 +12,9 @@ Vcs-Git: https://github.com/luigifab/awf-extended.git
 Package: awf-gtk2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Theme preview application for GTK
+Description: theme preview application for GTK 2
  A widget factory is a theme preview application for GTK. It displays the
  various widget types provided by GTK in a single window allowing to see
  the visual effect of the applied theme.
  .
- This package provides the gtk2 version.
+ This package provides the GTK 2 version.