[Python-apps-commits] r2218 - in packages/mercurial/trunk/debian (4 files)
vt-guest at users.alioth.debian.org
vt-guest at users.alioth.debian.org
Thu Jan 15 13:21:25 UTC 2009
Date: Thursday, January 15, 2009 @ 13:21:24
Author: vt-guest
Revision: 2218
Don't enable extensions by default. (closes: #511872, #503865, #491109)
Modified:
packages/mercurial/trunk/debian/README.Debian
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/hgext.rc
packages/mercurial/trunk/debian/mercurial.postinst
Modified: packages/mercurial/trunk/debian/README.Debian
===================================================================
--- packages/mercurial/trunk/debian/README.Debian 2009-01-14 23:29:16 UTC (rev 2217)
+++ packages/mercurial/trunk/debian/README.Debian 2009-01-15 13:21:24 UTC (rev 2218)
@@ -19,29 +19,18 @@
not online) as soon as the documentation stabilizes.
-Extensions provided in this package and their dependencies
-**********************************************************
+Extensions
+**********
Extensions can be enabled system-wide, per-user and/or per repository (see
-hgrc(5) for more information).
+hgrc(5) for more information). Previous versions of this Debian package
+enabled some extensions by default; however, this is no longer the case.
-By default, this Debian package enables extensions that only enable new
-commands (such as 'hgk' and 'gpg'), but not extensions that modify Mercurial's
-behaviour (such as 'win32text'). The system administrator can modify this by
-editing /etc/mercurial/hgrc.d/hgext.rc.
+To enable extensions system-wide, you may edit the
+/etc/mercurial/hgrc.d/hgext.rc configuration file. This file also contains
+information on the dependencies of each extension.
-Some extensions (hgk and highlight) are enabled automatically only if the their
-dependencies are installed. This auto-detection will not work if these
-dependencies are installed or removed after mercurial. In this case, run
-"dpkg-reconfigure mercurial" or manually edit /etc/mercurial/hgrc.d/hgext.rc
-Packages needed for extensions are listed as Suggests: as they are not strictly
-required to use Mercurial. Install them if you need them.
-
-For more information on the dependencies for each extension, please see
-/etc/mercurial/hgrc.d/hgext.rc.
-
-
Emacs support
*************
This package installs a mercurial.el file. However, it is not enabled (loaded)
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2009-01-14 23:29:16 UTC (rev 2217)
+++ packages/mercurial/trunk/debian/changelog 2009-01-15 13:21:24 UTC (rev 2218)
@@ -12,7 +12,7 @@
(closes: #506694)
* Install hg-ssh (ssh login shell for an hg server) system-wide.
- * Don't enable inotify by default. (closes: #503865)
+ * Don't enable extensions by default. (closes: #511872, #503865, #491109)
* debian/control:
- Moved dependencies to mercurial-common where appropriate
@@ -54,7 +54,7 @@
+ Add ${misc:Depends} to Depends to remove
lintian warning.
- -- Vernon Tang <vt at foilhead.net> Sat, 10 Jan 2009 02:19:44 +0800
+ -- Vernon Tang <vt at foilhead.net> Thu, 15 Jan 2009 17:47:38 +0800
mercurial (1.0.1-5.1) unstable; urgency=high
Modified: packages/mercurial/trunk/debian/hgext.rc
===================================================================
--- packages/mercurial/trunk/debian/hgext.rc 2009-01-14 23:29:16 UTC (rev 2217)
+++ packages/mercurial/trunk/debian/hgext.rc 2009-01-15 13:21:24 UTC (rev 2218)
@@ -2,8 +2,6 @@
# See hgrc(5) for more information
# Extensions included in Mercurial listed in alphabetical order
-# See /usr/share/doc/mercurial/README.Debian.gz for more information
-# (for example, some extensions need other Debian packages to work)
[extensions]
# changeset access control
@@ -13,7 +11,7 @@
# hgext.alias =
# provides the 'bookmarks' command
-hgext.bookmarks =
+# hgext.bookmarks =
# bugzilla integration
# requires python-mysqldb
@@ -21,11 +19,11 @@
# show the children of the given or working dir revision
# provides the 'children' command
-hgext.children =
+# hgext.children =
# graph count of revisions grouped by template
# provides the 'churn' command
-hgext.churn =
+# hgext.churn =
# add color output to status, qseries, and diff-related commands
# hgext.color =
@@ -40,23 +38,23 @@
# - tla to convert from GNU Arch
# - monotone to convert from Monotone
# - python-subversion to convert from Subversion
-hgext.convert =
+# hgext.convert =
# external diff program support
# hgext.extdiff =
# pull and merge remote changes
# provides the 'fetch' command
-hgext.fetch =
+# hgext.fetch =
# GnuPG signing
# provides the 'sign', 'sigcheck' and 'sigs' commands
# requires gnupg
-hgext.gpg =
+# hgext.gpg =
# show revision graphs in terminal windows
# provides the 'glog' command
-hgext.graphlog =
+# hgext.graphlog =
# CIA notification hook
# hgext.hgcia =
@@ -72,7 +70,7 @@
# lets you split a merge into pieces
# provides the 'imerge' command
-hgext.imerge =
+# hgext.imerge =
# inotify-based status acceleration for Linux systems
# provides the 'inserve' command
@@ -86,7 +84,7 @@
# quilt-like patch queues
# provides the 'q*' commands
-hgext.mq =
+# hgext.mq =
# email notifications
# hgext.notify =
@@ -95,27 +93,27 @@
# hgext.pager =
# make it easy to refer to the parent of a revision
-hgext.parentrevspec =
+# hgext.parentrevspec =
# send changes as series of email patches
# provides the 'email' command
-hgext.patchbomb =
+# hgext.patchbomb =
# removes files not known to mercurial
# provides the 'purge' command
-hgext.purge =
+# hgext.purge =
# moves sets of revisions to a different ancestor
# provides the 'rebase' command
-hgext.rebase =
+# hgext.rebase =
# interactive change selection during commit
# provides the 'record' command
-hgext.record =
+# hgext.record =
# patch transplanting tool
# provides the 'transplant' command
-hgext.transplant =
+# hgext.transplant =
# non-Unicode MBCS filename support
# hgext.win32mbcs =
Modified: packages/mercurial/trunk/debian/mercurial.postinst
===================================================================
--- packages/mercurial/trunk/debian/mercurial.postinst 2009-01-14 23:29:16 UTC (rev 2217)
+++ packages/mercurial/trunk/debian/mercurial.postinst 2009-01-15 13:21:24 UTC (rev 2218)
@@ -17,45 +17,6 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-check_ext() {
- local file
- local ext
- local dep
- local enable
- file="$1"
- ext="$2"
- dep="$3"
- enable="true"
-
- case "$dep" in
- wish)
- which wish > /dev/null || enable=false
- reason="no 'wish' script found [can be found in 'tk8.4' package]"
- ;;
- python-*)
- test -d /usr/share/doc/$dep || enable=false
- reason="package '$dep' is not installed"
- ;;
- inotify)
- # etch does not build the inotify extension due to a too old libc
- if test "$(ls /usr/lib/python-support/mercurial/python*/hgext/inotify 2>/dev/null | wc -l)" = 0; then
- enable=false
- reason="not built probably due to a lack of support (old libc, ...)"
- fi
- ;;
- *)
- echo "Internal error"
- exit 1
- ;;
- esac
- if [ "$enable" = true ]; then
- echo "Enabling $ext extension"
- sed -i -e "s/^# *\(hgext[.]$ext *=\)/\1/" "$file"
- else
- echo "Disabling $ext extension ($reason)"
- fi
-}
-
case "$1" in
configure)
# Fix for old packages not managing pyc files
@@ -67,23 +28,14 @@
done
for conffile in hgext.rc; do
- # Tell ucf that the file in /usr/share/mercurial is the latest
- # maintainer version (but we rewrite it to enable extension based
- # on guess on whether other packages are here or not), and let it
- # handle how to manage the real configuration file in
+ # Tell ucf that the file in /usr/share/mercurial is the latest maintainer
+ # version, and let it handle how to manage the real configuration file in
# /etc/mercurial/hgrc.d.
- TMPFILE=`mktemp`
- chmod 644 "$TMPFILE"
- cp /usr/share/mercurial/$conffile "$TMPFILE"
- check_ext "$TMPFILE" hgk wish
- check_ext "$TMPFILE" highlight python-pygments
-# check_ext "$TMPFILE" inotify inotify
ucf --sum-file /usr/share/mercurial/$conffile.md5sums --three-way \
- "$TMPFILE" /etc/mercurial/hgrc.d/$conffile
+ /usr/share/mercurial/$conffile /etc/mercurial/hgrc.d/$conffile
# Fix wrong registration until 1.0.1-2 included
ucfr --purge mercurial /etc/hgrc.d/$conffile
ucfr mercurial /etc/mercurial/hgrc.d/$conffile
- rm -f "$TMPFILE"
done
;;
More information about the Python-apps-commits
mailing list