[SCM] libdvd-pkg/master: don't use debconf as registry
onlyjob at users.alioth.debian.org
onlyjob at users.alioth.debian.org
Sun Jun 30 17:15:59 UTC 2013
The following commit has been merged in the master branch:
commit 6c570b31021889a5eb3d4225b42f61faac65ee79
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sat Jun 29 18:37:26 2013 +1000
don't use debconf as registry
diff --git a/debian/b-i_libdvdcss.sh b/debian/b-i_libdvdcss.sh
index fe50354..6634255 100755
--- a/debian/b-i_libdvdcss.sh
+++ b/debian/b-i_libdvdcss.sh
@@ -4,13 +4,7 @@ PKGI="libdvd-pkg"
DIR="/usr/src/${PKGI}"
PKGG="libdvdcss2"
PKGG_ALL="libdvdcss2 libdvdcss-dev"
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-db_version 2.0
-db_get ${PKGI}/build
-## $RET contains "true" if build is allowed in debconf.
-[ "$RET" = "true" ] || exit 0
+P88="88libdvdcss-pkg"
## get installed guest-package version
VERG="$(dpkg --status ${PKGG} 2>/dev/null | perl -0ne 'print $1 if m{^Status:\s+install\s+ok\s+installed}sm and m{^Version:\s+([0-9.-]+)}sm;')"
@@ -25,11 +19,9 @@ dpkg --compare-versions "${VERGG}~local" gt "${VERG}"
## we have newer package to build/install
-## Check if this very version of guest package was previously installed.
-## self-disable in debconf settings, if user manually removed it.
+## Check if this very version of guest package was previously installed
+## and avoid re-installing if it was removed.
if [ -f "${DIR}/${PKGG}-${VERGG}.is-installed" ]; then
- rm "${DIR}/${PKGG}-${VERGG}.is-installed"
- db_set ${PKGI}/build false
echo "${PKGI}: Package ${PKGG}-${VERGG} was removed, stop processing..."
exit 0
fi
@@ -38,8 +30,7 @@ fi
dpkg -i /dev/zero 2>/dev/null
if [ "$?" -eq 2 ]; then
echo "${PKGI}: dpkg database is locked. You may need to use command \"sudo dpkg-reconfigure ${PKGI}\"."
- db_get ${PKGI}/post-invoke_hook
- if [ "$RET" = "true" ]; then
+ if [ -h "/etc/apt/apt.conf.d/${P88}" ]; then
echo "${PKGI}: Building and installation of package(s) [${PKGG}] postponed till after next APT operation."
fi
exit 0
@@ -65,7 +56,6 @@ fi
apt-get check >/dev/null 2>&1
if [ "$?" -ne 0 ]; then
echo "${PKGI}: \`apt-get check\` failed, you may have broken packages. Aborting..."
- db_set ${PKGI}/build false
exit 0
fi
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index f940020..1b7756b 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,6 +1,3 @@
-# using debconf in script to check if installation is allowed
-debconf-is-not-a-registry
-
# Technically speaking this package could use a native format
# as we don't really have an "upstream" Homepage.
# However the intention is to have the very same package
--
libdvdcss-pkg packaging
More information about the pkg-multimedia-commits
mailing list