[Pkg-mozext-commits] [SCM] mozilla noscript extension branch, master, updated. debian/2.6.4.3-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 326a3c0f29df602008ec808118c9cfa5c07e0986
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sat Jan 12 14:40:44 2013 +0100

    Remove upgrade logic for versions before 1.9.9.47-1
    
    This one was predates Squeeze, so let's cleanup for Jessie.

diff --git a/debian/control b/debian/control
index b9b30c1..7861fec 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,7 @@ Package: xul-ext-noscript
 Architecture: all
 Recommends: ${xpi:Recommends}
 Provides: ${xpi:Provides}
-Replaces: mozilla-noscript (<< 1.9.9.47-1)
-Breaks: mozilla-noscript (<< 1.9.9.47-1), ${xpi:Breaks}
+Breaks: ${xpi:Breaks}
 Enhances: ${xpi:Enhances}
 Depends: ${misc:Depends}, ${xpi:Depends}
 Description: Javascript/plugins permissions manager for Iceweasel and Iceape
diff --git a/debian/xul-ext-noscript.postinst b/debian/xul-ext-noscript.postinst
deleted file mode 100755
index b25d214..0000000
--- a/debian/xul-ext-noscript.postinst
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-mv_conffile() {
-    local OLDCONFFILE="$1"
-    local NEWCONFFILE="$2"
-    local CONFDIR="$3"
-
-    [ -e "$OLDCONFFILE" ] || return 0
-
-    mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
-    mv -f "$OLDCONFFILE" "$NEWCONFFILE"
-    [ -n "$CONFDIR" ] && rmdir "$CONFDIR"
-}
-
-case "$1" in
-configure)
-    if dpkg --compare-versions "$2" le 1.9.9.47-1; then
-        mv_conffile /etc/xul-ext-noscript/noscript.js /etc/xul-ext/noscript.js /etc/xul-ext-noscript/
-    fi
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/xul-ext-noscript.preinst b/debian/xul-ext-noscript.preinst
deleted file mode 100755
index b8c95cd..0000000
--- a/debian/xul-ext-noscript.preinst
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-prep_mv_conffile() {
-    local PKGNAME="$1"
-    local CONFFILE="$2"
-    local CONFDIR="$3"
-
-    [ -e "$CONFFILE" ] || return 0
-
-    local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-    local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
-            sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
-    if [ "$md5sum" = "$old_md5sum" ]; then
-        rm -f "$CONFFILE"
-        [ -n "$CONFDIR" ] && rmdir "$CONFDIR"
-    fi
-}
-
-case "$1" in
-install|upgrade)
-    if dpkg --compare-versions "$2" le 1.9.9.47-1; then
-        prep_mv_conffile xul-ext-noscript /etc/xul-ext-noscript/noscript.js /etc/xul-ext-noscript/
-    fi
-esac
-
-#DEBHELPER#
-
-exit 0
-

-- 
mozilla noscript extension