[debian-edu-commits] debian-edu/ 08/09: Adjust Makefile.am and configure.ac.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch schweer/softwaves
in repository debian-edu-artwork.

commit 159fb969b78cec7252dc6f9d7c144abf8b2c50dc
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Oct 28 16:40:46 2016 +0200

    Adjust Makefile.am and configure.ac.
---
 Makefile.am  |  5 ++---
 configure.ac | 51 +++++++++++----------------------------------------
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ee199b2..2aa355c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 SUBDIRS = art-common \
-          art-joy \
-          art-spacefun \
-          art-lines
+          art-lines \
+          art-softwaves
 
 EXTRA_DIST = COPYING
diff --git a/configure.ac b/configure.ac
index 6793887..f8d1b19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-AC_INIT(Debian Edu Artwork, 0.46.0, http://bugs.debian.org/debian-edu-artwork)
+AC_INIT(Debian Edu Artwork, 0.46.1, http://bugs.debian.org/debian-edu-artwork)
 AC_PREREQ(2.52)
 
 MAJOR_VERSION=0
 MINOR_VERSION=46
-MICRO_VERSION=0
+MICRO_VERSION=1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 AM_INIT_AUTOMAKE(debian-edu-artwork, $VERSION)
@@ -24,50 +24,21 @@ AC_PROG_INSTALL
 AC_OUTPUT([
 Makefile
 art-common/Makefile
+art-common/x11/Makefile
 art-common/mate/Makefile
-art-common/kde/Makefile
 art-common/gdm-theme/Makefile
-art-common/kdm-theme/Makefile
-art-joy/Makefile
-art-joy/g-i/Makefile
-art-joy/gnome-shell/Makefile
-art-joy/kde/Makefile
-art-joy/kdm-theme/Makefile
-art-joy/ksplash-bg_1024x768/Makefile
-art-joy/ksplash-bg_1280x800/Makefile
-art-joy/ksplash-bg_1280x1024/Makefile
-art-joy/ksplash-bg_1366x768/Makefile
-art-joy/ksplash-bg_1920x1080/Makefile
-art-joy/ksplash-bg_1920x1200/Makefile
-art-joy/ldm/Makefile
-art-joy/ksplash-theme/Makefile
-art-joy/splash/Makefile
 art-lines/Makefile
 art-lines/g-i/Makefile
 art-lines/gnome-shell/Makefile
-art-lines/kde/Makefile
-art-lines/kdm-theme/Makefile
-art-lines/ksplash-bg_1280x1024/Makefile
-art-lines/ksplash-bg_1920x1080/Makefile
-art-lines/ksplash-bg_1920x1200/Makefile
-art-lines/ksplash-bg_2560x1080/Makefile
+art-lines/desktop-base/Makefile
 art-lines/ldm/Makefile
-art-lines/ksplash-theme/Makefile
-art-lines/splash/Makefile
-art-spacefun/Makefile
-art-spacefun/g-i/Makefile
-art-spacefun/gnome-shell/Makefile
-art-spacefun/kde/Makefile
-art-spacefun/kdm-theme/Makefile
-art-spacefun/ksplash-bg_1024x768/Makefile
-art-spacefun/ksplash-bg_1366x768/Makefile
-art-spacefun/ksplash-bg_1280x800/Makefile
-art-spacefun/ksplash-bg_1280x1024/Makefile
-art-spacefun/ksplash-bg_1920x1080/Makefile
-art-spacefun/ksplash-bg_1920x1200/Makefile
-art-spacefun/ksplash-theme/Makefile
-art-spacefun/ldm/Makefile
-art-spacefun/splash/Makefile
+art-lines/plymouth/Makefile
+art-softwaves/Makefile
+art-softwaves/g-i/Makefile
+art-softwaves/gnome-shell/Makefile
+art-softwaves/desktop-base/Makefile
+art-softwaves/ldm/Makefile
+art-softwaves/plymouth/Makefile
 ])
 
 echo "

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git