Version 2.1.0

FUNDING.yml

@@ -1 +1 @@
-custom: https://paypal.me/luigifab
+custom: ["https://www.paypal.me/luigifab", "https://gandi.link/f/4b904048"]

src/Makefile.am

@@ -1,22 +1 @@
-bin_PROGRAMS =
-
-if GTK4
-bin_PROGRAMS += awf-gtk@GTK4_SUFFIX@
-awf_gtk@GTK4_SUFFIX@_SOURCES = awf.c
-awf_gtk@GTK4_SUFFIX@_CPPFLAGS = $(GTK4_CFLAGS) -I/usr/include/gtk-4.0/unix-print
-awf_gtk@GTK4_SUFFIX@_LDADD = $(GTK4_LIBS)
-endif
-
-if GTK3
-bin_PROGRAMS += awf-gtk@GTK3_SUFFIX@
-awf_gtk@GTK3_SUFFIX@_SOURCES = awf.c
-awf_gtk@GTK3_SUFFIX@_CPPFLAGS = $(GTK3_CFLAGS) -I/usr/include/gtk-3.0/unix-print
-awf_gtk@GTK3_SUFFIX@_LDADD = $(GTK3_LIBS)
-endif
-
-if GTK2
-bin_PROGRAMS += awf-gtk@GTK2_SUFFIX@
-awf_gtk@GTK2_SUFFIX@_SOURCES = awf.c
-awf_gtk@GTK2_SUFFIX@_CPPFLAGS = $(GTK2_CFLAGS) -I/usr/include/gtk-unix-print-2.0
-awf_gtk@GTK2_SUFFIX@_LDADD = $(GTK2_LIBS)
-endif
+SUBDIRS = src

build.sh → src/build.sh

@@ -10,7 +10,7 @@ touch builder/ChangeLog
 touch builder/NEWS
 touch builder/AUTHORS
 touch builder/README
-cp LICENSE         builder/COPYING
+cp /usr/share/common-licenses/GPL-3 builder/COPYING
 cp configure.ac    builder/
 cp Makefile.am     builder/
 cp src/Makefile.am builder/src/

configure.ac → src/configure.ac

@@ -1,11 +1,10 @@
-AC_INIT([A widget factory], [2.0.0])
+AC_INIT([A widget factory], [2.1.0])
 AC_CONFIG_SRCDIR([src/awf.c])
 
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-#AC_PROG_INSTALL
 
 PKG_CHECK_MODULES(GTK4, gtk4, GTK4_SUFFIX=4, GTK4_SUFFIX=0)
 AM_CONDITIONAL([GTK4], [test "$GTK4_SUFFIX" -eq 4])

src/debian-gtk2/changelog

@@ -0,0 +1,12 @@
+awf-gtk2 (2.1.0-1) unstable; urgency=low
+
+  * New upstream version
+  * Allow to change menu items keyboard shortcuts on hover (from gtk2.24 to gtk3.24)
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Tue, 07 Jul 2020 12:00:00 +0000
+
+awf-gtk2 (2.0.0-3) unstable; urgency=low
+
+  * Initial debian package release (Closes: #959434)
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Sat, 02 May 2020 10:33:59 +0000

debian-gtk2/control → src/debian-gtk2/control

@@ -12,6 +12,8 @@ Vcs-Git: https://github.com/luigifab/awf-extended.git
 Package: awf-gtk2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A widget factory is a theme preview application for gtk2,
+Description: 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 include the gtk2 version.

debian-gtk2/deb.sh → src/debian-gtk2/deb.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 gtk="gtk2"
-version="2.0.0"
+version="2.1.0"
 cd debian-${gtk}/
 rm -rf builder/
 
@@ -17,15 +17,14 @@ cp -r ../src                builder/awf-${gtk}-${version}/
 cp awf-${gtk}.desktop       builder/awf-${gtk}-${version}/
 cp ../Makefile.am           builder/awf-${gtk}-${version}/
 cp ../configure.ac          builder/awf-${gtk}-${version}/
-cp ../LICENSE               builder/awf-${gtk}-${version}/COPYING
+cp /usr/share/common-licenses/GPL-3 builder/awf-${gtk}-${version}/COPYING
 sed -i 's/ -eq 3/ -eq -1/g' builder/awf-${gtk}-${version}/configure.ac
 sed -i 's/ -eq 4/ -eq -1/g' builder/awf-${gtk}-${version}/configure.ac
 for file in builder/awf-${gtk}-${version}/icons/*/*/*; do mv $file ${file/\/awf./\/awf-${gtk}.}; done
-for file in builder/awf-${gtk}-${version}/src/*.po; do
+for file in builder/awf-${gtk}-${version}/src/po/*.po; do
 	lang=$(basename "$file" .po)
-	lang=${lang/trad-/}
 	mkdir -p builder/awf-${gtk}-${version}/locale/${lang}/LC_MESSAGES
-	msgfmt   builder/awf-${gtk}-${version}/src/trad-${lang}.po -o builder/awf-${gtk}-${version}/locale/${lang}/LC_MESSAGES/awf-${gtk}.mo
+	msgfmt   builder/awf-${gtk}-${version}/src/po/${lang}.po -o builder/awf-${gtk}-${version}/locale/${lang}/LC_MESSAGES/awf-${gtk}.mo
 done
 
 cd builder/

src/debian-gtk3/changelog

@@ -0,0 +1,12 @@
+awf-gtk3 (2.1.0-1) unstable; urgency=low
+
+  * New upstream version
+  * Allow to change menu items keyboard shortcuts on hover (from gtk2.24 to gtk3.24)
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Tue, 07 Jul 2020 12:00:00 +0000
+
+awf-gtk3 (2.0.0-3) unstable; urgency=low
+
+  * Initial debian package release (Closes: #959436)
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Sat, 02 May 2020 10:33:59 +0000

debian-gtk3/control → src/debian-gtk3/control

@@ -12,6 +12,8 @@ Vcs-Git: https://github.com/luigifab/awf-extended.git
 Package: awf-gtk3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A widget factory is a theme preview application for gtk3,
+Description: 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 include the gtk3 version.

debian-gtk3/deb.sh → src/debian-gtk3/deb.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 gtk="gtk3"
-version="2.0.0"
+version="2.1.0"
 cd debian-${gtk}/
 rm -rf builder/
 
@@ -17,15 +17,14 @@ cp -r ../src                builder/awf-${gtk}-${version}/
 cp awf-${gtk}.desktop       builder/awf-${gtk}-${version}/
 cp ../Makefile.am           builder/awf-${gtk}-${version}/
 cp ../configure.ac          builder/awf-${gtk}-${version}/
-cp ../LICENSE               builder/awf-${gtk}-${version}/COPYING
+cp /usr/share/common-licenses/GPL-3 builder/awf-${gtk}-${version}/COPYING
 sed -i 's/ -eq 2/ -eq -1/g' builder/awf-${gtk}-${version}/configure.ac
 sed -i 's/ -eq 4/ -eq -1/g' builder/awf-${gtk}-${version}/configure.ac
 for file in builder/awf-${gtk}-${version}/icons/*/*/*; do mv $file ${file/\/awf./\/awf-${gtk}.}; done
-for file in builder/awf-${gtk}-${version}/src/*.po; do
+for file in builder/awf-${gtk}-${version}/src/po/*.po; do
 	lang=$(basename "$file" .po)
-	lang=${lang/trad-/}
 	mkdir -p builder/awf-${gtk}-${version}/locale/${lang}/LC_MESSAGES
-	msgfmt   builder/awf-${gtk}-${version}/src/trad-${lang}.po -o builder/awf-${gtk}-${version}/locale/${lang}/LC_MESSAGES/awf-${gtk}.mo
+	msgfmt   builder/awf-${gtk}-${version}/src/po/${lang}.po -o builder/awf-${gtk}-${version}/locale/${lang}/LC_MESSAGES/awf-${gtk}.mo
 done
 
 cd builder/

src/debian-gtk4/changelog

@@ -0,0 +1,12 @@
+awf-gtk4 (2.1.0-1) experimental; urgency=low
+
+  * New upstream version
+  * Allow to change menu items keyboard shortcuts on hover (from gtk2.24 to gtk3.24)
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Tue, 07 Jul 2020 12:00:00 +0000
+
+awf-gtk4 (2.0.0-3) experimental; urgency=low
+
+  * Initial debian package release (Closes: #959433)
+
+ -- Fabrice Creuzot <code@luigifab.fr>  Sat, 02 May 2020 10:33:59 +0000