[debian-edu-commits] debian-edu/ 06/08: Adjust debian/{control, copyright, desktop-profiles.install, desktop-profiles.manpages, listing, postinst, postrm}.

Sun Mar 11 17:25:50 UTC 2018

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

schweer-guest pushed a commit to branch master
in repository desktop-profiles.

commit a4d3bcb4b98a2068befba2405c569cea273cfcf0
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Mar 11 18:20:04 2018 +0100

    Adjust debian/{control,copyright,desktop-profiles.install,
    desktop-profiles.manpages,listing,postinst,postrm}.
---
 debian/changelog                 | 18 +++++++++++
 debian/control                   | 19 ++++++------
 debian/copyright                 | 64 ----------------------------------------
 debian/desktop-profiles.install  |  3 +-
 debian/desktop-profiles.manpages |  1 -
 debian/listing                   |  2 --
 debian/postinst                  | 15 +++++-----
 debian/postrm                    |  2 --
 8 files changed, 35 insertions(+), 89 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d79ca48..a7c9de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+desktop-profiles (1.4.27) UNRELEASED; urgency=medium
+
+  * Drop profile-manager, related profile-manager.1 manpage and po/* files.
+    The last appearance of the needed binary 'kmdr-executor': Lenny.
+  * Adjust other manpages to reflect the profile-manager.1 manpage removal.
+  * Drop Kommander script 'profile-manager.kmdr' and related debian/menu file.
+    The last appearance of the needed binary 'kommander': Stretch.
+  * Drop config file, the related debian/po/* files and debian/preinst;
+    this has been unneeded since a long time.
+  * Cleanup README and desktop-profiles.7 manpage content from information
+    concerning no longer available tools.
+  * Adjust debian/{postinst, control, copyright, desktop-profiles.install,
+    desktop-profiles.manpages, listing, postinst, postrm}.
+  * Adjust Makefile.
+  * d/control: Fix typo (replace Rules-Require-Root with Rules-Requires-Root).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 11 Mar 2018 13:55:17 +0100
+
 desktop-profiles (1.4.26) unstable; urgency=medium
 
   * Add debian/source/format and switch to 3.0 (native).
diff --git a/debian/control b/debian/control
index 6cedb65..1578ef9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
  Holger Levsen <holger at debian.org>
 Build-Depends: debhelper (>= 11~)
 Build-Depends-Indep: po-debconf, intltool
-Rules-Require-Root: no
+Rules-Requires-Root: no
 Standards-Version: 4.1.3
 Vcs-git: https://anonscm.debian.org/git/debian-edu/upstream/desktop-profiles.git
 Vcs-Browser: http://anonscm.debian.org/git/debian-edu/upstream/desktop-profiles.git
@@ -14,21 +14,20 @@ Vcs-Browser: http://anonscm.debian.org/git/debian-edu/upstream/desktop-profiles.
 Package: desktop-profiles
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: kommander, gconf-editor, menu-xdg, hicolor-icon-theme, shared-mime-info
-Enhances: kdebase, gconf, gconf2, libxfce4util-1 (>= 4.2), rox-filer, ude
+Suggests: gconf-editor, menu-xdg, hicolor-icon-theme, shared-mime-info
+Enhances: kde-baseapps, gconf2, libxfce4util-bin, rox-filer
 Description: framework for setting up desktop profiles
  This package offers a standard cross-desktop way of managing the conditional
  activation of available profiles. As such it is useful to both administrators
- (allowing different configurations for different sets of users) and CDD's
- (who want to have a configuration customized for a certain target group).
+ (allowing different configurations for different sets of users) and Debian
+ Blends (who want to customize configuration for a certain target group).
  .
  The different Desktop environments in Debian all offer the possibility of
  customizing them through the use of profiles (sets of configuration and/or
  data files). Usually it's also possible to stack configuration sets,
  combining the customizations provided by a number of profiles.
  .
- This package currently supports setting up profiles for KDE, GNOME, ROX,
- Xfce (>=4.2), GNUSTEP, UDE, and Freedesktop. Freedesktop profiles allow
- you to do a (growing amount of) cross-desktop customization, while the
- other profile kinds allow you to customize the respective desktop environments
- to various degrees.
+ This package currently supports profiles for KDE, GNOME, Xfce, MATE and
+ Freedesktop. Freedesktop profiles allow you to do a (growing amount of)
+ cross-desktop customization, while the other profile kinds allow you to
+ customize the respective desktop environments to various degrees.
diff --git a/debian/copyright b/debian/copyright
index 5f1c8df..1392ecf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,67 +7,3 @@ License: GPL-2+
  Everything in this package is under the GNU General Public Licence, version 2
  or later. Which on a Debian system can be found in 
  /usr/share/common-licenses/GPL-2
-
-Files: po/ca.po
-Copyright: (c) Guillem Jover <guillem at debian.org>, 2005, 2007.
-License: GPL-2+
-
-Files: debian/po/ca.po
-Copyright: (c) Guillem Jover <guillem at debian.org>, 2006
-License: GPL-2+
-
-Files: po/cs.po, debian/po/cs.po
-Copyright: (c) Miroslav Kure <kurem at debian.cz>, 2005
-License: GPL-2+
-
-Files: po/eu.po, debian/po/eu.po
-Copyright: (c) Piarres Beobide Egaa <pi at beobide.net>, 2005
-License: GPL-2+
-
-Files: po/fr.po, debian/po/fr.po
-Copyright: (c) Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>, 2005
-License: GPL-2+
-
-Files: po/gl.po, debian/po/gl.po
-Copyright: (c) Jacobo Tarrio <jtarrio at debian.org>, 2008
-License: GPL-2+
-
-Files: po/it.po 
-Copyright: (c) Marco Presi <zufus at debian.org>, 2005
-License: GPL-2+
-
-Files: debian/po/ja.po
-Copyright: (c) Hideki Yamane (Debian-JP) <henrich at debian.org>
-License: GPL-2+
-
-Files: po/pt_BR.po, debian/po/pt_BR.po
-Copyright: (c) Felipe Augusto van de Wiel (faw) <felipe at cathedrallabs.org>, 2006
-License: GPL-2+
-
-Files: po/pt.po, debian/po/pt.po
-Copyright: (c) Rui Branco <ruipb at netcabo.pt>, 2005
-License: GPL-2+
-
-Files: po/sv.po, debian/po/sv.po
-Copyright: (c) Daniel Nylander <po at danielnylander.se>, 2005
-License: GPL-2+
-
-Files: po/tr.po, debian/po/tr.po
-Copyright: (c) Mert Dirik <mertdirik at gmail.com>, 2008
-License: GPL-2+
-
-Files: po/vi.po, debian/po/vi.po
-Copyright: (c) Clytie Siddall <clytie at riverland.net.au>, 2005.
-License: GPL-2+
-
-Files: debian/po/de.po 
-Copyright: (c) Matthias Julius <mdeb at julius-net.net>, 2007.
-License: GPL-2+
-
-Files: debian/po/es.po 
-Copyright: (c) César Gómez Martín <cesar.gomez at gmail.com>, 2005
-License: GPL-2+
-
-Files: debian/po/ru.po
-Copyright: Yuri Kozlov <kozlov.y at gmail.com>, 2007
-License: GPL-2+
diff --git a/debian/desktop-profiles.install b/debian/desktop-profiles.install
index e065ea6..2a5a59b 100644
--- a/debian/desktop-profiles.install
+++ b/debian/desktop-profiles.install
@@ -1,10 +1,9 @@
-dh_installlisting update-profile-cache profile-manager usr/bin
+dh_installlisting update-profile-cache usr/bin
 listingmodule get_desktop-profiles_variables path usr/share/desktop-profiles/
 postinst-desktop-profiles usr/share/debhelper/autoscripts/
 profile-snippet zlogin-snippet usr/share/doc/desktop-profiles/examples
 tests.tgz usr/share/doc/desktop-profiles
 list-desktop-profiles usr/bin/
-profile-manager.kmdr usr/share/desktop-profiles/kommander-scripts/
 desktop-profiles etc/default
 desktop-profiles.csh etc/csh/login.d/
 desktop-profiles.fish etc/fish.d/
diff --git a/debian/desktop-profiles.manpages b/debian/desktop-profiles.manpages
index d7e003a..f5a3a98 100644
--- a/debian/desktop-profiles.manpages
+++ b/debian/desktop-profiles.manpages
@@ -2,5 +2,4 @@ desktop-profiles.7
 list-desktop-profiles.1
 update-profile-cache.1
 dh_installlisting.1
-profile-manager.1
 path2listing.1
diff --git a/debian/listing b/debian/listing
index 87b37e6..f72e495 100644
--- a/debian/listing
+++ b/debian/listing
@@ -11,8 +11,6 @@ default-xdg_data_dirs;XDG_DATA;/usr/local/share:/usr/share;;;Default value as de
 default-rox-system;ROX;/usr/local/share/Choices:/usr/share/rox/Choices;;;ROX system settings (on Debian, differs from upstream)
 default-rox-user;ROX;${HOME}/.rox_choices;999999999999999999;;ROX user settings (on Debian, differs from upstream) - should take precedence over everything else
 
-ude-install-dir;UDE;/usr/share/ude;;;Default location of system-wide UDE stuff
-
 gnustep-user-domain;GNUSTEP;${GNUSTEP_USER_ROOT};30;;Default location of user domain, evaluates to ~/GNUstep by default
 gnustep-local-domain;GNUSTEP;${GNUSTEP_LOCAL_ROOT};20;;Default location of local domain, evaluates to /usr/local/lib/GNUstep/Local by default
 gnustep-network-domain;GNUSTEP;${GNUSTEP_NETWORK_ROOT};10;;Default location of network domain, evaluates to /usr/local/lib/GNUstep/Network by default
diff --git a/debian/postinst b/debian/postinst
index 37d0b53..a8ee9fb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,13 +1,12 @@
 #!/bin/sh
 set -e
 
-# source debconf library
-. /usr/share/debconf/confmodule
-
-
-if(  ( test "$1" = "configure" ) && 
-     ( test -x "$(which update-profile-cache 2>/dev/null)" ) ); then
-  update-profile-cache;
-fi;
+case "$1" in
+configure)
+    if [ -x "$(which update-profile-cache 2>/dev/null)" ] ; then
+      update-profile-cache;
+    fi
+    ;;
+esac
 
 #DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
index 5d2ac69..a0f2ea3 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -e
 
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
-
 if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
     . /usr/share/debconf/confmodule
     db_purge

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

