Bug#582492: desktop-base: diff for NMU version 5.0.5+nmu1
Package: desktop-base
Version: 5.0.5
Severity: normal
Tags: patch pending
Dear maintainers,
I've prepared an NMU for desktop-base (versioned as 5.0.5+nmu1)
fixing the aforementionned problem. Please feel free to include
it in desktop-base.
Regards.
diff -Nru desktop-base-5.0.5/debian/changelog desktop-base-5.0.5+nmu1/debian/changelog
--- desktop-base-5.0.5/debian/changelog 2009-02-27 08:45:13.000000000 +0100
+++ desktop-base-5.0.5+nmu1/debian/changelog 2010-05-21 13:40:45.000000000 +0200
@@ -1,3 +1,10 @@
+desktop-base (5.0.5+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Move /etc/kde3/kdeglobals to /etc/kde4/kdeglobals
+
+ -- Jean-Christophe Dubacq <jcdubacq1@free.fr> Fri, 21 May 2010 13:40:21 +0200
+
desktop-base (5.0.5) unstable; urgency=low
* debian/{preinst,postinst}: remove deprecated, unshipped alternatives.
diff -Nru desktop-base-5.0.5/debian/postinst desktop-base-5.0.5+nmu1/debian/postinst
--- desktop-base-5.0.5/debian/postinst 2009-02-27 08:44:50.000000000 +0100
+++ desktop-base-5.0.5+nmu1/debian/postinst 2010-05-21 13:46:26.000000000 +0200
@@ -1,6 +1,9 @@
#!/bin/bash -e
#DEBHELPER#
+if [ -x $DPKG_LIBDIR/maintscript-helper ]; then
+ $DPKG_LIBDIR/maintscript-helper mv_conffile /etc/kde3/kdeglobals /etc/kde4/kdeglobals 5.0.5 desktop-base -- "$@"
+fi
if [ "${1}" = "configure" ] && [ "$2" != "" ] ; then
diff -Nru desktop-base-5.0.5/debian/postrm desktop-base-5.0.5+nmu1/debian/postrm
--- desktop-base-5.0.5/debian/postrm 2008-10-24 00:30:27.000000000 +0200
+++ desktop-base-5.0.5+nmu1/debian/postrm 2010-05-21 13:47:01.000000000 +0200
@@ -1,6 +1,10 @@
#!/bin/sh -e
#DEBHELPER#
+if [ -x $DPKG_LIBDIR/maintscript-helper ]; then
+ $DPKG_LIBDIR/maintscript-helper mv_conffile /etc/kde3/kdeglobals /etc/kde4/kdeglobals 5.0.5 desktop-base -- "$@"
+fi
+
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
if which update-grub2 > /dev/null ; then
diff -Nru desktop-base-5.0.5/debian/preinst desktop-base-5.0.5+nmu1/debian/preinst
--- desktop-base-5.0.5/debian/preinst 2008-12-06 15:15:14.000000000 +0100
+++ desktop-base-5.0.5+nmu1/debian/preinst 2010-05-21 13:46:30.000000000 +0200
@@ -1,6 +1,10 @@
#!/bin/sh -e
#DEBHELPER#
+if [ -x $DPKG_LIBDIR/maintscript-helper ]; then
+ $DPKG_LIBDIR/maintscript-helper mv_conffile /etc/kde3/kdeglobals /etc/kde4/kdeglobals 5.0.5 desktop-base -- "$@"
+fi
+
if [ "${1}" = "upgrade" ]; then
if dpkg --compare-versions ${2} lt 0.3.11 && dpkg --compare-versions ${2} gt 0.3.5; then
diff -Nru desktop-base-5.0.5/Makefile desktop-base-5.0.5+nmu1/Makefile
--- desktop-base-5.0.5/Makefile 2009-02-27 00:58:23.000000000 +0100
+++ desktop-base-5.0.5+nmu1/Makefile 2010-05-21 13:38:18.000000000 +0200
@@ -57,8 +57,8 @@
mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-moodin
$(INSTALL) $(wildcard ksplash-theme/nightly-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-moodin
# KDE setup
- mkdir -p $(DESTDIR)/etc/kde3
- $(INSTALL) profiles/kde-profile/kdeglobals $(DESTDIR)/etc/kde3
+ mkdir -p $(DESTDIR)/etc/kde4
+ $(INSTALL) profiles/kde-profile/kdeglobals $(DESTDIR)/etc/kde4
mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/kde-profile/share/config
$(INSTALL) $(wildcard profiles/kde-profile/share/config/*) $(DESTDIR)/usr/share/desktop-base/profiles/kde-profile/share/config
# Xfce 4.4
Reply to: