[debian-edu-commits] debian-edu/ 253/437: update kdm and gdm theme: the xml-files are now almost identical; regenerate some Makefile.*-files
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:40 UTC 2014
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository debian-edu-artwork.
commit c117aafada3de26df7a67c19bb136c146c2ce640
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Mon Apr 12 13:17:32 2010 +0000
update kdm and gdm theme: the xml-files are now almost identical; regenerate some Makefile.*-files
---
art/gdm-theme/Makefile.am | 7 +-
art/gdm-theme/Makefile.in | 7 +-
art/gdm-theme/caps.png | Bin 0 -> 4854 bytes
art/gdm-theme/debian-edu.xml | 43 +++----
art/gdm-theme/screenshot.png | Bin 0 -> 180874 bytes
art/gdm-theme/slx-small.png | Bin 0 -> 9634 bytes
art/gdm-theme/win-login.png | Bin 0 -> 59164 bytes
art/kdm-theme/Makefile.am | 25 ++--
art/kdm-theme/Makefile.in | 23 ++--
art/kdm-theme/README | 11 +-
art/kdm-theme/debian-edu.xml | 244 ++++++++++++++++++++++++++++------------
art/kdm-theme/icon-language.png | Bin 0 -> 909 bytes
art/kdm-theme/icon-reboot.png | Bin 0 -> 670 bytes
art/kdm-theme/icon-session.png | Bin 0 -> 1236 bytes
art/kdm-theme/icon-shutdown.png | Bin 0 -> 727 bytes
art/kdm-theme/screenshot.png | Bin 177022 -> 180248 bytes
art/splash/Makefile.in | 2 +-
debian/changelog | 7 +-
18 files changed, 242 insertions(+), 127 deletions(-)
diff --git a/art/gdm-theme/Makefile.am b/art/gdm-theme/Makefile.am
index 7764feb..6c3cfaa 100644
--- a/art/gdm-theme/Makefile.am
+++ b/art/gdm-theme/Makefile.am
@@ -1,11 +1,14 @@
GDMTHEME = debian-edu.xml \
GdmGreeterTheme.desktop \
- boundingbox.png \
+ caps.png \
icon-language.png \
icon-reboot.png \
icon-session.png \
icon-shutdown.png \
- userentry.png
+ screenshot.png \
+ slx-small.png \
+ userentry.png \
+ win-login.png
gdmthemedir = $(datadir)/gdm/themes/debian-edu
gdmtheme_DATA = $(GDMTHEME)
diff --git a/art/gdm-theme/Makefile.in b/art/gdm-theme/Makefile.in
index 94d7b23..98de6bb 100644
--- a/art/gdm-theme/Makefile.in
+++ b/art/gdm-theme/Makefile.in
@@ -137,12 +137,15 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
GDMTHEME = debian-edu.xml \
GdmGreeterTheme.desktop \
- boundingbox.png \
+ caps.png \
icon-language.png \
icon-reboot.png \
icon-session.png \
icon-shutdown.png \
- userentry.png
+ screenshot.png \
+ slx-small.png \
+ userentry.png \
+ win-login.png
gdmthemedir = $(datadir)/gdm/themes/debian-edu
gdmtheme_DATA = $(GDMTHEME)
diff --git a/art/gdm-theme/caps.png b/art/gdm-theme/caps.png
new file mode 100644
index 0000000..1d75070
Binary files /dev/null and b/art/gdm-theme/caps.png differ
diff --git a/art/gdm-theme/debian-edu.xml b/art/gdm-theme/debian-edu.xml
index f0f173d..e2c219f 100644
--- a/art/gdm-theme/debian-edu.xml
+++ b/art/gdm-theme/debian-edu.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE greeter SYSTEM "greeter.dtd">
<greeter>
- <!-- background -->
+ <!-- background (use default wallpaper) -->
<item type="pixmap" >
<normal file="/usr/share/wallpapers/debian-edu-wallpaper.png" />
<!-- <normal file="debian-edu-wallpaper.png" /> -->
<!-- <pos width="100%" x="0" y="0" height="100%" /> -->
<pos width="100%" x="0" y="0" height="100%" />
</item>
- <!-- the bounding box in the center -->
<!-- hostname and clock -->
<item type="label" id="clock">
<normal color="#ffffff" font="Sans Bold 11"/>
<pos x="95%" y="97.5%" anchor="e"/>
<text>%h - %c</text>
</item>
- <!-- clock -->
+ <!-- the bounding box in the center -->
<item type="pixmap">
- <normal file="boundingbox.png"/>
- <pos x="50%" y="50%" width="400" height="282" anchor="c"/>
+ <normal file="win-login.png"/>
+ <pos x="50%" y="50%" width="615" height="401" anchor="c"/>
</item>
+ <!-- buttons -->
<item type="rect">
<normal/>
<pos x="0" y="-50" width="100%" height="50"/>
@@ -123,46 +123,51 @@
<item type="rect">
<pos x="50%" y="50%" width="474" height="334" anchor="c"/>
<box orientation="vertical">
+ <!-- skolelinux label -->
+ <item type="pixmap">
+ <normal file="slx-small.png"/>
+ <pos anchor="c" x="50%" y="60%"/>
+ </item>
<!-- welcome -->
- <item type="label" id="welcome-label">
+ <!-- <item type="label" id="welcome-label">
<pos x="50%" y="95" anchor="c"/>
<normal font="Sans Bold 18" color="#000000"/>
<stock type="welcome-label"/>
- </item>
+ </item> -->
<!-- username label -->
<item type="label" id="pam-prompt">
- <pos x="50%" y="120" anchor="c"/>
+ <pos x="50%" y="80" anchor="c"/>
<normal font="Sans Bold 12" color="#000000"/>
<stock type="username-label"/>
</item>
<item type="label" id="pam-message">
- <pos anchor="c" x="50%" y="130"/>
+ <pos anchor="c" x="50%" y="90"/>
<normal color="#000000" font="Sans 11"/>
<text></text>
</item>
<!-- user-pw-entry background pixmap -->
<item type="pixmap">
- <pos x="90" y="135" width="300" height="40"/>
+ <pos x="140" y="105" width="200" height="40"/>
<normal file="userentry.png"/>
</item>
<!-- user-pw-entry -->
<item type="entry" id="user-pw-entry">
- <pos x="100" y="105" width="280" height="20"/>
+ <pos x="150" y="75" width="180" height="20"/>
<normal font="Sans 12" color="#444444"/>
</item>
</box>
</item>
<!-- caps-lock-warning -->
- <item type="rect" id="caps-lock-warning">
- <normal color="#ffffff" alpha="0.2"/>
- <pos x="0" y="0" width="100%" height="box" anchor="nw"/>
- <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0">
- <item type="label">
- <normal color="#000000" font="Sans 12"/>
- <pos x="50%" y="50%" anchor="c"/>
+ <item type="pixmap" id="caps-lock-warning">
+ <normal file="caps.png"/>
+ <pos anchor="c" x="50%" y="50%"/>
+ <fixed>
+ <item type="label" id="message">
+ <normal color="#0b678c" font="Sans Bold 10"/>
+ <pos anchor="c" x="50%" y="85%"/>
<stock type="caps-lock-warning"/>
</item>
- </box>
+ </fixed>
</item>
<!-- pam-error (login failure etc.) -->
<item type="rect" id="pam-error">
diff --git a/art/gdm-theme/screenshot.png b/art/gdm-theme/screenshot.png
new file mode 100644
index 0000000..2a8f085
Binary files /dev/null and b/art/gdm-theme/screenshot.png differ
diff --git a/art/gdm-theme/slx-small.png b/art/gdm-theme/slx-small.png
new file mode 100644
index 0000000..491a5a7
Binary files /dev/null and b/art/gdm-theme/slx-small.png differ
diff --git a/art/gdm-theme/win-login.png b/art/gdm-theme/win-login.png
new file mode 100644
index 0000000..f774833
Binary files /dev/null and b/art/gdm-theme/win-login.png differ
diff --git a/art/kdm-theme/Makefile.am b/art/kdm-theme/Makefile.am
index 2646bc6..de3dc01 100644
--- a/art/kdm-theme/Makefile.am
+++ b/art/kdm-theme/Makefile.am
@@ -1,18 +1,17 @@
KDMTHEME = debian-edu.xml \
- GdmGreeterTheme.desktop \
KdmGreeterTheme.desktop \
- caps.png \
- win-login.png \
- slx-small.png \
- screenshot.png \
- user-entry.png \
- user-entry-li.png \
- session_button.png \
- session_button-li.png \
- system_button.png \
- system_button-li.png \
- pw-entry.png \
- pw-entry-li.png
+ caps.png \
+ icon-language.png \
+ icon-reboot.png \
+ icon-session.png \
+ icon-shutdown.png \
+ screenshot.png \
+ slx-small.png \
+ user-entry.png \
+ user-entry-li.png \
+ pw-entry.png \
+ pw-entry-li.png \
+ win-login.png
kdmthemedir = $(datadir)/apps/kdm/themes/debian-edu
kdmtheme_DATA = $(KDMTHEME)
diff --git a/art/kdm-theme/Makefile.in b/art/kdm-theme/Makefile.in
index 03f42b0..089c47d 100644
--- a/art/kdm-theme/Makefile.in
+++ b/art/kdm-theme/Makefile.in
@@ -31,7 +31,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = art/kdm-theme
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -136,16 +136,19 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
KDMTHEME = debian-edu.xml \
- GdmGreeterTheme.desktop \
KdmGreeterTheme.desktop \
- Dialog.png \
- enter_normal.png \
- enter_over.png \
- enter_pressed.png \
- preview.png \
- system_normal.png \
- system_over.png \
- system_pressed.png
+ caps.png \
+ icon-language.png \
+ icon-reboot.png \
+ icon-session.png \
+ icon-shutdown.png \
+ screenshot.png \
+ slx-small.png \
+ user-entry.png \
+ user-entry-li.png \
+ pw-entry.png \
+ pw-entry-li.png \
+ win-login.png
kdmthemedir = $(datadir)/apps/kdm/themes/debian-edu
kdmtheme_DATA = $(KDMTHEME)
diff --git a/art/kdm-theme/README b/art/kdm-theme/README
index 9c11009..2579b4f 100644
--- a/art/kdm-theme/README
+++ b/art/kdm-theme/README
@@ -1,9 +1,14 @@
The first kdm theme was created by Petter Reinholdtsen based on the
kdm theme in kubuntu and is licensed under the GNU General Public License.
-Based on that work, the oxygen-air theme (GPL 2008 Xavier Araque) and
-a new background image from the Debian moreblue-orbit theme, a
-refurbished theme was created by Andreas B. Mundt (GPL 2010).
+Based on the existent kdm and gdm themes, in combination with the
+oxygen-air theme (GPL 2008 Xavier Araque) and a new background image
+from the Debian moreblue-orbit theme, a refurbished theme was created
+by Andreas B. Mundt (GPL 2010).
+
+The xml-files defining the gdm and kdm theme are mostly identical now,
+except for the user entries: gdm uses a combined "user-pw-entry", where
+kdm has a "user-entry" and a "pw-entry".
Resources:
http://docs.kde.org/stable/en/kdebase-workspace/kdm/kdm-themes.html
diff --git a/art/kdm-theme/debian-edu.xml b/art/kdm-theme/debian-edu.xml
index ab1e414..82bb5b3 100644
--- a/art/kdm-theme/debian-edu.xml
+++ b/art/kdm-theme/debian-edu.xml
@@ -1,93 +1,187 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter id="theme">
- <style font="Sans 12" window-text-color="#bfd9ff"
- base-color="#bfd9ff" alternate-base-color="#666666"
- text-color="#0b678c" disabled-text-color="#111111"/>
- <item type="pixmap" id="background" background="true">
- <normal file="/usr/share/wallpapers/debian-edu-wallpaper.png" scalemode="scale"/>
- <pos width="100%" height="100%"/>
+<greeter>
+ <!-- background (use default wallpaper) -->
+ <item type="pixmap" >
+ <normal file="/usr/share/wallpapers/debian-edu-wallpaper.png" />
+ <!-- <normal file="debian-edu-wallpaper.png" /> -->
+ <!-- <pos width="100%" x="0" y="0" height="100%" /> -->
+ <pos width="100%" x="0" y="0" height="100%" />
</item>
- <item type="pixmap" id="system-session">
+ <!-- hostname and clock -->
+ <item type="label" id="clock">
+ <normal color="#ffffff" font="Sans Bold 11"/>
+ <pos x="95%" y="97.5%" anchor="e"/>
+ <text>%h - %c</text>
+ </item>
+ <!-- the bounding box in the center -->
+ <item type="pixmap">
<normal file="win-login.png"/>
- <pos anchor="c" x="50%" y="45%" width="615" height="401"/>
- <box orientation="vertical" spacing="10" homogeneous="true">
- <item type="pixmap">
- <normal file="slx-small.png"/>
- <pos anchor="c" x="50%" y="80%"/>
+ <pos x="50%" y="50%" width="615" height="401" anchor="c"/>
+ </item>
+ <!-- buttons -->
+ <item type="rect">
+ <normal/>
+ <pos x="0" y="-50" width="100%" height="50"/>
+ <fixed>
+ <item type="rect">
+ <normal />
+ <pos x="0" y="4" width="100%" height="100%"/>
+ <box orientation="horizontal" spacing="10" xpadding="10">
+ <item type="rect" id="language_button" button="true">
+ <normal />
+ <pos y="50%" anchor="w" width="box" height="box"/>
+ <box orientation="horizontal" spacing="10" xpadding="10">
+ <item type="pixmap">
+ <normal file="icon-language.png" tint="#dddddd"/>
+ <prelight file="icon-language.png"/>
+ <active file="icon-language.png" tint="#bbbbbb" />
+ <pos y="50%" anchor="w"/>
+ </item>
+ <item type="label">
+ <normal color="#FFFFFF" font="Sans Bold 12"/>
+ <prelight color="#BBBBBB" font="Sans Bold 12"/>
+ <active color="#bbbbbb" font="Sans Bold 12"/>
+ <pos y="50%" anchor="w"/>
+ <stock type="language" />
+ </item>
+ </box>
+ </item>
+ <item type="rect" id="session_button" button="true">
+ <normal />
+ <pos y="50%" anchor="w" width="box" height="box"/>
+ <box orientation="horizontal" spacing="10" xpadding="10">
+ <item type="pixmap">
+ <normal file="icon-session.png" tint="#dddddd"/>
+ <prelight file="icon-session.png"/>
+ <active file="icon-session.png" tint="#bbbbbb"/>
+ <pos y="50%" anchor="w"/>
+ </item>
+ <item type="label">
+ <normal color="#FFFFFF" font="Sans Bold 12"/>
+ <prelight color="#BBBBBB" font="Sans Bold 12"/>
+ <active color="#bbbbbb" font="Sans Bold 12"/>
+ <pos y="50%" anchor="w"/>
+ <stock type="session" />
+ </item>
+ </box>
+ </item>
+ <item type="rect" id="system_button" button="true">
+ <normal />
+ <show modes="console" type="system"/>
+ <pos y="50%" anchor="w" width="box" height="box"/>
+ <box orientation="horizontal" spacing="10" xpadding="10">
+ <item type="pixmap">
+ <normal file="icon-reboot.png" tint="#dddddd"/>
+ <prelight file="icon-reboot.png"/>
+ <active file="icon-reboot.png" tint="#bbbbbb"/>
+ <pos y="50%" anchor="w"/>
+ </item>
+ <item type="label">
+ <normal color="#FFFFFF" font="Sans Bold 12"/>
+ <prelight color="#BBBBBB" font="Sans Bold 12"/>
+ <active color="#bbbbbb" font="Sans Bold 12"/>
+ <pos y="50%" anchor="w"/>
+ <stock type="system"/>
+ </item>
+ </box>
+ </item>
+ <item type="rect" id="disconnect_button" button="true">
+ <normal />
+ <show modes="flexi,remote"/>
+ <pos y="50%" anchor="w" width="box" height="box"/>
+ <box orientation="horizontal" spacing="10" xpadding="10">
+ <item type="pixmap">
+ <normal file="icon-shutdown.png" tint="#dddddd"/>
+ <prelight file="icon-shutdown.png"/>
+ <active file="icon-shutdown.png" tint="#bbbbbb"/>
+ <pos y="50%" anchor="w"/>
+ </item>
+ <item type="label">
+ <normal color="#FFFFFF" font="Sans Bold 12"/>
+ <prelight color="#666666" font="Sans Bold 12"/>
+ <active color="#bbbbbb" font="Sans Bold 12"/>
+ <pos y="50%" anchor="w"/>
+ <stock type="disconnect"/>
+ <show modes="remote"/>
+ </item>
+ <item type="label">
+ <normal color="#FFFFFF" font="Sans Bold 12"/>
+ <prelight color="#BBBBBB" font="Sans Bold 12"/>
+ <active color="#bbbbbb" font="Sans Bold 12"/>
+ <pos y="50%" anchor="w"/>
+ <stock type="quit"/>
+ <show modes="flexi"/>
+ </item>
+ </box>
+ </item>
+ </box>
</item>
- <item type="label" id="welcome">
- <pos anchor="c" x="50%" y="46%"/>
- <normal alpha="0.5" font="Sans Bold 18" color="#FFFFFF"/>
- <stock type="welcome-label"/>
+ </fixed>
+ </item>
+ <!-- container for labels etc. -->
+ <item type="rect">
+ <pos x="50%" y="50%" width="474" height="334" anchor="c"/>
+ <box orientation="vertical">
+ <!-- skolelinux label -->
+ <item type="pixmap">
+ <normal file="slx-small.png"/>
+ <pos anchor="c" x="50%" y="60%"/>
</item>
+ <!-- welcome -->
+ <!-- <item type="label" id="welcome-label">
+ <pos x="50%" y="95" anchor="c"/>
+ <normal font="Sans Bold 18" color="#000000"/>
+ <stock type="welcome-label"/>
+ </item> -->
<item type="rect" id="user-field">
- <pos anchor="c" x="50%" y="43%" width="400" height="144"/>
- <box orientation="vertical" spacing="0" homogeneous="true">
- <item type="pixmap" butoon="true">
- <normal file="user-entry.png"/>
- <prelight file="user-entry-li.png"/>
- <active file="user-entry-li.png"/>
- <pos anchor="c" x="50%" y="100%"/>
- </item>
- <item type="entry" id="user-entry">
- <pos anchor="c" x="52%" y="0%" width="110" height="22"/>
- </item>
- <item type="pixmap">
- <normal file="pw-entry.png"/>
- <prelight file="pw-entry-li.png"/>
- <pos anchor="c" x="50%" y="100%"/>
- </item>
- <item type="entry" id="pw-entry">
- <pos anchor="c" x="52%" y="0%" width="110" height="22"/>
- </item>
- </box>
- </item>
- <item type="rect" id="system-session">
- <pos anchor="c" x="50%" y="70%" width="615" height="44"/>
- <fixed>
- <item type="label">
- <pos anchor="se" x="96%" y="70%"/>
- <normal alpha="0.5" font="Sans 8" color="#ffffff"/>
- <text>%c</text>
- </item>
- <item type="pixmap" id="session_button" button="true">
- <normal file="session_button.png"/>
- <prelight file="session_button-li.png"/>
- <active file="session_button-li.png"/>
- <pos anchor="w" x="15" y="50%"/>
- </item>
- <item type="pixmap" id="system_button" button="true">
- <normal file="system_button.png"/>
- <prelight file="system_button-li.png"/>
- <active file="system_button-li.png"/>
- <pos anchor="w" x="47" y="50%"/>
- </item>
- </fixed>
+ <pos anchor="c" x="50%" y="160%" width="400" height="80"/>
+ <style font="Sans 11" window-text-color="#bfd9ff"
+ base-color="#bfd9ff" alternate-base-color="#666666"
+ text-color="#0b678c" disabled-text-color="#111111"/>
+ <box orientation="vertical" spacing="0" homogeneous="true">
+ <item type="pixmap" butoon="true">
+ <normal file="user-entry.png"/>
+ <prelight file="user-entry-li.png"/>
+ <active file="user-entry-li.png"/>
+ <pos anchor="c" x="50%" y="100%"/>
+ </item>
+ <item type="entry" id="user-entry">
+ <pos anchor="c" x="54%" y="0%" width="135" height="22"/>
+ </item>
+ <item type="pixmap">
+ <normal file="pw-entry.png"/>
+ <prelight file="pw-entry-li.png"/>
+ <pos anchor="c" x="50%" y="100%"/>
+ </item>
+ <item type="entry" id="pw-entry">
+ <pos anchor="c" x="54%" y="0%" width="135" height="22"/>
+ </item>
+ </box>
</item>
</box>
- </item>
+ </item>
+ <!-- caps-lock-warning -->
<item type="pixmap" id="caps-lock-warning">
<normal file="caps.png"/>
- <pos anchor="c" x="50%" y="45%"/>
+ <pos anchor="c" x="50%" y="50%"/>
<fixed>
<item type="label" id="message">
- <normal color="#0b678c" font="Sans Bold 10"/>
- <pos anchor="c" x="50%" y="85%"/>
- <stock type="caps-lock-warning"/>
+ <normal color="#0b678c" font="Sans Bold 10"/>
+ <pos anchor="c" x="50%" y="85%"/>
+ <stock type="caps-lock-warning"/>
</item>
</fixed>
</item>
- <item type="rect" id="pam-error-paceholder">
- <pos anchor="c" x="50%" y="98%" widht="615" height="200"/>
- <item type="label" id="dummy1">
- <normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
- <!-- </text> -->
- </item>
- <item type="label" id="pam-error">
- <pos anchor="c" x="50%" y="50%" expand="true"/>
- <normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
- <!-- </text> -->
- </item>
+ <!-- pam-error (login failure etc.) -->
+ <item type="rect" id="pam-error">
+ <pos x="0" y="90%" width="100%" height="box" anchor="sw"/>
+ <box orientation="vertical" min-width="250" xpadding="10" ypadding="5" spacing="0">
+ <item type="label" id="pam-error">
+ <normal color="#FFFFFF" font="Sans 12"/>
+ <pos x="50%" y="50%" anchor="c"/>
+ <text></text>
+ </item>
+ </box>
</item>
</greeter>
diff --git a/art/kdm-theme/icon-language.png b/art/kdm-theme/icon-language.png
new file mode 100644
index 0000000..03fe222
Binary files /dev/null and b/art/kdm-theme/icon-language.png differ
diff --git a/art/kdm-theme/icon-reboot.png b/art/kdm-theme/icon-reboot.png
new file mode 100644
index 0000000..6373e01
Binary files /dev/null and b/art/kdm-theme/icon-reboot.png differ
diff --git a/art/kdm-theme/icon-session.png b/art/kdm-theme/icon-session.png
new file mode 100644
index 0000000..ac7843c
Binary files /dev/null and b/art/kdm-theme/icon-session.png differ
diff --git a/art/kdm-theme/icon-shutdown.png b/art/kdm-theme/icon-shutdown.png
new file mode 100644
index 0000000..0b78ec1
Binary files /dev/null and b/art/kdm-theme/icon-shutdown.png differ
diff --git a/art/kdm-theme/screenshot.png b/art/kdm-theme/screenshot.png
index 22b5291..d99a378 100644
Binary files a/art/kdm-theme/screenshot.png and b/art/kdm-theme/screenshot.png differ
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index bf8e141..470d815 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -146,7 +146,7 @@ XPMGZS = $(XPMS:.xpm=.xpm.gz)
grubdir = /boot/grub
grubsplashdir = $(grubdir)/splashimages
grubsplash_DATA = $(XPMGZS)
-grub2splashdir = /usr/share/desktop-base/grub_background.sh
+grub2splashdir = /usr/share/desktop-base/
#BUILT_SOURCES = $(XPMGZS) $(RLES)
SUFFIXES = .png .rle .xpm .xpm.gz
diff --git a/debian/changelog b/debian/changelog
index 26c520a..a3cb197 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,13 @@ debian-edu-artwork (0.0.30-5) UNRELEASED; urgency=low
/usr/share/desktop-base/grub_background.sh which is also there.
[ Andreas B. Mundt ]
- * Update kdm theme (Closes: #572769) including the wallpaper.
+ * Update kdm and gdm theme (Closes: #572769).
+ * Regenerate some Makefile.in files using automake (gdm-theme, kdm-theme
+ and splash).
+ * Add new wallpaper.
* Fix paths in debian/update-artwork (kde3 -> kde4).
- -- Petter Reinholdtsen <pere at debian.org> Sun, 07 Mar 2010 19:43:19 +0100
+ -- Andreas B. Mundt <andi.mundt at web.de> Mon, 12 Apr 2010 14:43:00 +0200
debian-edu-artwork (0.0.30-4) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git
More information about the debian-edu-commits
mailing list