[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.12-126-gee248d1



The following commit has been merged in the master branch:
commit 60e8779bc2dc256de3ea6590bb00ac7cd132c0d1
Author: Niels Thykier <niels@thykier.net>
Date:   Sun May 26 18:08:50 2013 +0200

    d/{postinst,prerm,triggers}: Drop unused files
    
    Stable's libc-bin provide C.UTF-8.  Since Lintian in Wheezy will clean
    up its internal locale, we no longer need these scripts nor the
    triggers.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 0afe1d7..ef38133 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -104,6 +104,13 @@ lintian (2.5.13) UNRELEASED; urgency=low
     + [NT] Add correction for unnecessarily.  Thanks to Guillem
       Jover for the suggestion.  (Closes: #706241)
 
+  * debian/{postinst,prerm}:
+    + [NT] Remove unused maintainer scripts now that stable's
+      libc-bin provides a C.UTF-8.
+  * debian/triggers:
+    + [NT] Remove unused trigger now that stable's libc-bin
+      provides a C.UTF-8.
+
   * doc/tutorial/**/*.pod:
     + [NT] Fix a number of spelling mistakes in the POD.
   * doc/tutorial/Lintian/Tutorial/WritingChecks.pod:
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index bf64725..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# Lintian requires a UTF-8 locale in order to properly do man page tests.
-# Generate one at installation time so that we're guaranteed to have one.
-
-set -eu
-
-locale_dir=/var/lib/lintian/locale
-
-gen_locale() {
-    echo 'Generating en_US.UTF-8 locale for internal Lintian use....'
-    mkdir -p "$locale_dir"
-    if ! localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias \
-                --quiet "$locale_dir"/en_US.UTF-8 ; then
-        rm -rf "$locale_dir"
-        exit 1
-    fi
-}
-
-if [ "$1" = "configure" ]; then
-    if [ ! -f "$locale_dir/en_US.UTF-8/LC_CTYPE" ] &&
-	[ -f /usr/share/locale/locale.alias ] &&
-	[ ! -d /usr/lib/locale/C.UTF-8/ ] ; then
-
-	# handle upgrades from the previous, incorrect, directory:
-	rm -rf "$locale_dir"
-	gen_locale
-    elif [ -d "$locale_dir" -a -d /usr/lib/locale/C.UTF-8/ ] ; then
-        # handle upgrades into a system with the libc C.UTF-8
-        rm -rf "$locale_dir"
-    fi
-fi
-
-if [ "$1" = "triggered" ]; then
-    # Remove our locale directory in all cases:
-    # If locales is removed, locales-all should provide us the locale
-    # we want.
-    # If locales is upgraded, we should still regenerate our locale.
-    # If the libc provided C.UTF-8 appeared, we do not need our locale
-    # anymore.
-    rm -rf "$locale_dir"
-
-    if [ -f /usr/share/locale/locale.alias ] &&
-	[ ! -d /usr/lib/locale/C.UTF-8/ ] ; then
-
-	gen_locale
-    fi
-fi
-
-#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100644
index 76f97cb..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#
-# Remove our generated locale if we are not upgrading or
-# we are upgrading into a system with a libc provided
-# C.UTF-8 (libc-bin >= 2.13)
-
-if [ 'upgrade' != "$1" -o -d '/usr/lib/locale/C.UTF-8/' ] ; then
-    rm -rf /var/lib/lintian/
-fi
-
-#DEBHELPER#
diff --git a/debian/triggers b/debian/triggers
deleted file mode 100644
index 4cdecc2..0000000
--- a/debian/triggers
+++ /dev/null
@@ -1,3 +0,0 @@
-interest /usr/share/locale/locale.alias
-interest /usr/lib/locales-all
-interest /usr/lib/locale/C.UTF-8

-- 
Debian package checker


Reply to: