[debian-edu-commits] debian-edu/ 04/09: Move dpkg-statoverride code into package scripts of bin:package debian-edu-artwork (was: bin:package debian-edu-artwork-lines).

[Mike Gabriel]

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 d35528f1aa1cfbb4758f848a0f1bb8972df3f32c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Oct 5 23:22:02 2014 +0200

    Move dpkg-statoverride code into package scripts of bin:package debian-edu-artwork (was: bin:package debian-edu-artwork-lines).
---
 debian/changelog                        |  2 ++
 debian/debian-edu-artwork-lines.links   |  2 --
 debian/debian-edu-artwork-lines.postrm  | 10 ----------
 debian/debian-edu-artwork-lines.preinst | 12 ------------
 debian/debian-edu-artwork.links         |  3 ++-
 debian/debian-edu-artwork.postrm        |  2 ++
 debian/debian-edu-artwork.preinst       |  4 ++++
 7 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f0bb21f..308fd52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ debian-edu-artwork (0.49-1) UNRELEASED; urgency=medium
     by this src:package.
   * Provide spacefun theme and joy theme for Debian jessie's GDM3 login
     screen.
+  * Move dpkg-statoverride code into package scripts of bin:package
+    debian-edu-artwork (was: bin:package debian-edu-artwork-lines).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 03 Oct 2014 16:54:10 +0200
 
diff --git a/debian/debian-edu-artwork-lines.links b/debian/debian-edu-artwork-lines.links
deleted file mode 100644
index 0e7c9d3..0000000
--- a/debian/debian-edu-artwork-lines.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted usr/share/gnome-shell/theme/gnome-shell.css
-
diff --git a/debian/debian-edu-artwork-lines.postrm b/debian/debian-edu-artwork-lines.postrm
deleted file mode 100755
index 0e69d82..0000000
--- a/debian/debian-edu-artwork-lines.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-if [ "$1" = remove ]; then
-	dpkg-divert --package debian-edu-artwork-lines --rename \
-	            --remove /usr/share/gnome-shell/theme/gnome-shell.css
-fi
-
-#DEBHELPER#
diff --git a/debian/debian-edu-artwork-lines.preinst b/debian/debian-edu-artwork-lines.preinst
deleted file mode 100755
index f846e83..0000000
--- a/debian/debian-edu-artwork-lines.preinst
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-if [ "$1" = install ] || [ $1 = upgrade ]; then
-	dpkg-divert --package debian-edu-artwork-lines \
-	            --rename \
-	            --divert /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted \
-	            /usr/share/gnome-shell/theme/gnome-shell.css
-fi
-
-#DEBHELPER#
diff --git a/debian/debian-edu-artwork.links b/debian/debian-edu-artwork.links
index 760cd41..09ca74b 100644
--- a/debian/debian-edu-artwork.links
+++ b/debian/debian-edu-artwork.links
@@ -1,2 +1,3 @@
 usr/share/images/desktop-base/login-background.svg.edu-diverted usr/share/images/desktop-base/login-background.svg
-usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js.edu-diverted usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
\ No newline at end of file
+usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js.edu-diverted usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
+usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted usr/share/gnome-shell/theme/gnome-shell.css
diff --git a/debian/debian-edu-artwork.postrm b/debian/debian-edu-artwork.postrm
index 8781ddd..ad1c7cd 100755
--- a/debian/debian-edu-artwork.postrm
+++ b/debian/debian-edu-artwork.postrm
@@ -7,6 +7,8 @@ if [ "$1" = remove ]; then
 	            --remove /usr/share/images/desktop-base/login-background.svg
 	dpkg-divert --package debian-edu-artwork --rename \
 	            --remove /usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
+	dpkg-divert --package debian-edu-artwork --rename \
+	            --remove /usr/share/gnome-shell/theme/gnome-shell.css
 fi
 
 #DEBHELPER#
diff --git a/debian/debian-edu-artwork.preinst b/debian/debian-edu-artwork.preinst
index 7f27414..647addf 100755
--- a/debian/debian-edu-artwork.preinst
+++ b/debian/debian-edu-artwork.preinst
@@ -11,6 +11,10 @@ if [ "$1" = install ] || [ $1 = upgrade ]; then
 	            --rename \
 	            --divert /usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js.edu-diverted \
 	            /usr/share/kde4/apps/plasma-desktop/init/10-desktop-base.js
+	dpkg-divert --package debian-edu-artwork \
+	            --rename \
+	            --divert /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted \
+	            /usr/share/gnome-shell/theme/gnome-shell.css
 fi
 
 #DEBHELPER#

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