[Python-apps-commits] r908 - in packages/mercurial/trunk/debian (17 files)
gerardo-guest at users.alioth.debian.org
gerardo-guest at users.alioth.debian.org
Fri Apr 4 12:42:55 UTC 2008
Date: Friday, April 4, 2008 @ 12:42:52
Author: gerardo-guest
Revision: 908
Splitting mercurial into 3 packages: mercurial, mercurial-core(arch-deb bits) and mercurial-web(cgi scripts)
Added:
packages/mercurial/trunk/debian/mercurial-common.dirs
packages/mercurial/trunk/debian/mercurial-common.examples
packages/mercurial/trunk/debian/mercurial-common.install
packages/mercurial/trunk/debian/mercurial-web.dirs
packages/mercurial/trunk/debian/mercurial-web.install
packages/mercurial/trunk/debian/mercurial.dirs
packages/mercurial/trunk/debian/mercurial.docs
packages/mercurial/trunk/debian/mercurial.install
packages/mercurial/trunk/debian/mercurial.manpages
packages/mercurial/trunk/debian/mercurial.preinst
Modified:
packages/mercurial/trunk/debian/control
packages/mercurial/trunk/debian/rules
Deleted:
packages/mercurial/trunk/debian/dirs
packages/mercurial/trunk/debian/docs
packages/mercurial/trunk/debian/examples
packages/mercurial/trunk/debian/preinst
packages/mercurial/trunk/debian/pycompat
Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control 2008-04-03 22:15:35 UTC (rev 907)
+++ packages/mercurial/trunk/debian/control 2008-04-04 12:42:52 UTC (rev 908)
@@ -6,22 +6,60 @@
Build-Depends: debhelper (>= 5.0.37.2), quilt, patchutils (>= 0.2.25),
cdbs (>= 0.4.27), python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc
Standards-Version: 3.7.3
-XS-Python-Version: >= 2.4
Homepage: http://www.selenic.com/mercurial/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk
Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/mercurial/trunk/
+
Package: mercurial
-Architecture: any
-XB-Python-Version: ${python:Version}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-pygments
-Provides: ${python:Provides}
-Recommends: rcs | kdiff3 | tkdiff | meld, python-mysqldb, python-openssl
-Suggests: qct, python-elementtree, tk8.4 | wish, python-flup
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}, mercurial-common (= ${binary:Version}), python-pygments, python-elementtree
+Recommends: rcs | kdiff3 | tkdiff | meld
+Suggests: qct, tk8.4 | wish, vim | emacs, python-mysqldb ,mercurial-web
Description: Scalable distributed version control system
Mercurial is a fast, lightweight Source Control Management system designed
for efficient handling of very large distributed projects.
+ .
+ Its features include:
+ * O(1) delta-compressed file storage and retrieval scheme
+ * Complete cross-indexing of files and changesets for efficient exploration
+ of project history
+ * Robust SHA1-based integrity checking and append-only storage model
+ * Decentralized development model with arbitrary merging between trees
+ * High-speed HTTP-based network merge protocol
+ * Easy-to-use command-line interface
+ * Integrated stand-alone web interface
+ * Small Python codebase
+
+
+Package: mercurial-common
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: mercurial
+Description: Scalable distributed version control system (Common files)
+ Mercurial is a fast, lightweight Source Control Management system designed
+ for efficient handling of very large distributed projects.
+ .
+ Its features include:
+ * O(1) delta-compressed file storage and retrieval scheme
+ * Complete cross-indexing of files and changesets for efficient exploration
+ of project history
+ * Robust SHA1-based integrity checking and append-only storage model
+ * Decentralized development model with arbitrary merging between trees
+ * High-speed HTTP-based network merge protocol
+ * Easy-to-use command-line interface
+ * Integrated stand-alone web interface
+ * Small Python codebase
.
+
+Package: mercurial-web
+Architecture: all
+Depends: mercurial (= ${binary:Version}), python (>= 2.4), python (<< 2.6), python-flup
+Recommends: python-openssl
+Description: Scalable distributed version control system (Web interface)
+ Mercurial is a fast, lightweight Source Control Management system designed
+ for efficient handling of very large distributed projects.
+ .
Its features include:
* O(1) delta-compressed file storage and retrieval scheme
* Complete cross-indexing of files and changesets for efficient exploration
@@ -32,3 +70,6 @@
* Easy-to-use command-line interface
* Integrated stand-alone web interface
* Small Python codebase
+
+
+
Deleted: packages/mercurial/trunk/debian/dirs
===================================================================
--- packages/mercurial/trunk/debian/dirs 2008-04-03 22:15:35 UTC (rev 907)
+++ packages/mercurial/trunk/debian/dirs 2008-04-04 12:42:52 UTC (rev 908)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/mercurial
Deleted: packages/mercurial/trunk/debian/docs
===================================================================
--- packages/mercurial/trunk/debian/docs 2008-04-03 22:15:35 UTC (rev 907)
+++ packages/mercurial/trunk/debian/docs 2008-04-04 12:42:52 UTC (rev 908)
@@ -1,2 +0,0 @@
-README
-doc/FAQ.txt
Deleted: packages/mercurial/trunk/debian/examples
===================================================================
--- packages/mercurial/trunk/debian/examples 2008-04-03 22:15:35 UTC (rev 907)
+++ packages/mercurial/trunk/debian/examples 2008-04-04 12:42:52 UTC (rev 908)
@@ -1,16 +0,0 @@
-hgeditor
-contrib/git-viz
-contrib/hgdiff
-contrib/hg-relink
-contrib/hgsh
-contrib/hg-ssh
-contrib/hgwebdir.fcgi
-contrib/rewrite-log
-contrib/mergetools.hgrc
-contrib/sample.hgrc
-contrib/simplemerge
-contrib/tcsh_completion
-contrib/vim
-contrib/zsh_completion
-hgweb.cgi
-hgwebdir.cgi
Added: packages/mercurial/trunk/debian/mercurial-common.dirs
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.dirs (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-common.dirs 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,5 @@
+usr/share
+usr/share/mercurial
+usr/share/emacs
+usr/share/emacs/site-lisp
+
Added: packages/mercurial/trunk/debian/mercurial-common.examples
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.examples (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-common.examples 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,14 @@
+hgeditor
+contrib/git-viz
+contrib/hgdiff
+contrib/hg-relink
+contrib/hgsh
+contrib/hg-ssh
+contrib/rewrite-log
+contrib/mergetools.hgrc
+contrib/sample.hgrc
+contrib/simplemerge
+contrib/tcsh_completion
+contrib/vim
+contrib/zsh_completion
+
Added: packages/mercurial/trunk/debian/mercurial-common.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.install (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-common.install 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/python2.5/site-packages/mercurial/templates usr/share/mercurial
+contrib/mercurial.el usr/share/emacs/site-lisp
+contrib/mq.el usr/share/emacs/site-lisp
+contrib/logo-droplets.svg usr/share/mercurial
+
Added: packages/mercurial/trunk/debian/mercurial-web.dirs
===================================================================
--- packages/mercurial/trunk/debian/mercurial-web.dirs (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-web.dirs 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1 @@
+usr/lib/cgi-bin
Added: packages/mercurial/trunk/debian/mercurial-web.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial-web.install (rev 0)
+++ packages/mercurial/trunk/debian/mercurial-web.install 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,4 @@
+contrib/hgwebdir.fcgi usr/lib/cgi-bin/
+hgweb.cgi usr/lib/cgi-bin/
+hgwebdir.cgi usr/lib/cgi-bin/
+
Added: packages/mercurial/trunk/debian/mercurial.dirs
===================================================================
--- packages/mercurial/trunk/debian/mercurial.dirs (rev 0)
+++ packages/mercurial/trunk/debian/mercurial.dirs 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,7 @@
+usr/bin
+usr/share/mercurial
+etc/
+etc/bash_completion.d
+etc/mercurial
+etc/mercurial/hgrc.d
+
Added: packages/mercurial/trunk/debian/mercurial.docs
===================================================================
--- packages/mercurial/trunk/debian/mercurial.docs (rev 0)
+++ packages/mercurial/trunk/debian/mercurial.docs 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,2 @@
+README
+doc/FAQ.txt
Added: packages/mercurial/trunk/debian/mercurial.install
===================================================================
--- packages/mercurial/trunk/debian/mercurial.install (rev 0)
+++ packages/mercurial/trunk/debian/mercurial.install 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,5 @@
+debian/tmp/usr/bin
+debian/tmp/usr/lib
+debian/hgext.rc etc/mercurial/hgrc.d/
+contrib/bash_completion etc/bash_completion.d/mercurial
+contrib/hgk usr/share/mercurial/
Added: packages/mercurial/trunk/debian/mercurial.manpages
===================================================================
--- packages/mercurial/trunk/debian/mercurial.manpages (rev 0)
+++ packages/mercurial/trunk/debian/mercurial.manpages 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,3 @@
+doc/hg.1
+doc/hgrc.5
+doc/hgignore.5
Added: packages/mercurial/trunk/debian/mercurial.preinst
===================================================================
--- packages/mercurial/trunk/debian/mercurial.preinst (rev 0)
+++ packages/mercurial/trunk/debian/mercurial.preinst 2008-04-04 12:42:52 UTC (rev 908)
@@ -0,0 +1,62 @@
+#! /bin/sh
+# preinst script for mercurial
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+#
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ install|upgrade)
+ # Fixing a wrong name in a config file (package 6c-1)
+ FILE=/etc/bash_completion.d/bash_completion
+ if [ -f $FILE ] && grep -sq hg $FILE ; then
+ # Argh, there is the previous wrong named file
+ # Has it been modified ?
+ MD5="`md5sum $FILE | cut -f 1 -d \ `"
+ if [ "$MD5" != a78c4acd831bacee32fde42a42a5ae5e ]; then
+ # conffile has been locally modified. Moving it so that
+ # dpkg will ask what to do about
+ mv $FILE /etc/bash_completion.d/mercurial
+ else
+ # not changed. Removing it so that dpkg install quietly the
+ # new (renamed) file
+ rm $FILE
+ fi
+ fi
+ if [ "$2" = "0.7-3" ] && [ -f /etc/mercurial/hgrc.d/hgit.rc ]; then
+ # This release has never been official. Let's purge the
+ # old config file if someone installed the package from
+ # my web page. No need to take care of user's modifications:
+ # it was experimental stuff.
+ echo "Purging old config file '/etc/mercurial/hgrc.d/hgit.rc'"
+ rm -fv /etc/mercurial/hgrc.d/hgit.rc
+ fi
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Deleted: packages/mercurial/trunk/debian/preinst
===================================================================
--- packages/mercurial/trunk/debian/preinst 2008-04-03 22:15:35 UTC (rev 907)
+++ packages/mercurial/trunk/debian/preinst 2008-04-04 12:42:52 UTC (rev 908)
@@ -1,62 +0,0 @@
-#! /bin/sh
-# preinst script for mercurial
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- install|upgrade)
- # Fixing a wrong name in a config file (package 6c-1)
- FILE=/etc/bash_completion.d/bash_completion
- if [ -f $FILE ] && grep -sq hg $FILE ; then
- # Argh, there is the previous wrong named file
- # Has it been modified ?
- MD5="`md5sum $FILE | cut -f 1 -d \ `"
- if [ "$MD5" != a78c4acd831bacee32fde42a42a5ae5e ]; then
- # conffile has been locally modified. Moving it so that
- # dpkg will ask what to do about
- mv $FILE /etc/bash_completion.d/mercurial
- else
- # not changed. Removing it so that dpkg install quietly the
- # new (renamed) file
- rm $FILE
- fi
- fi
- if [ "$2" = "0.7-3" ] && [ -f /etc/mercurial/hgrc.d/hgit.rc ]; then
- # This release has never been official. Let's purge the
- # old config file if someone installed the package from
- # my web page. No need to take care of user's modifications:
- # it was experimental stuff.
- echo "Purging old config file '/etc/mercurial/hgrc.d/hgit.rc'"
- rm -fv /etc/mercurial/hgrc.d/hgit.rc
- fi
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: packages/mercurial/trunk/debian/pycompat
===================================================================
--- packages/mercurial/trunk/debian/pycompat 2008-04-03 22:15:35 UTC (rev 907)
+++ packages/mercurial/trunk/debian/pycompat 2008-04-04 12:42:52 UTC (rev 908)
@@ -1 +0,0 @@
-2
Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules 2008-04-03 22:15:35 UTC (rev 907)
+++ packages/mercurial/trunk/debian/rules 2008-04-04 12:42:52 UTC (rev 908)
@@ -4,60 +4,34 @@
DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
-# must be before including python-distutils.mk
-binary-install/mercurial::
- # fix bugs in cdbs/dh_python: mercurial will use python and not pythonX.Y
- sed -i -e 's/python[0-9.]*/python/' $(DEB_DESTDIR)/usr/bin/hg
-include /usr/share/cdbs/1/class/python-distutils.mk
+binary-install/mercurial-web::
+ chmod 0755 $(CURDIR)/debian/mercurial-web/usr/lib/cgi-bin/*
-DEB_INSTALL_MANPAGES_mercurial=doc/hg.1 doc/hgrc.5 doc/hgignore.5
binary-install/mercurial::
- # Install bash autocompletion.
- install -d $(DEB_DESTDIR)/etc/bash_completion.d/
- install -m 644 \
- contrib/bash_completion \
- $(DEB_DESTDIR)/etc/bash_completion.d/mercurial
- #
- # Install system-wide conffile
- install -d $(DEB_DESTDIR)/etc/mercurial/
+ # Install system-wide conffiles
echo "# system-wide mercurial configuration file" \
- > $(DEB_DESTDIR)/etc/mercurial/hgrc
+ > $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
echo "# See hgrc(5) for more information" \
- >> $(DEB_DESTDIR)/etc/mercurial/hgrc
- #
- # Install system-wide extensions
- install -d $(DEB_DESTDIR)/etc/mercurial/hgrc.d/
- install -m 644 \
- debian/hgext.rc \
- $(DEB_DESTDIR)/etc/mercurial/hgrc.d/hgext.rc
- # Install hgk subscript
- install -d $(DEB_DESTDIR)/usr/share/mercurial
- install -m 0755 contrib/hgk $(DEB_DESTDIR)/usr/share/mercurial/hgk
- #
- # Install emacs scripts.
- install -d $(DEB_DESTDIR)/usr/share/emacs/site-lisp/
- install -m 0644 \
- contrib/mercurial.el \
- contrib/mq.el \
- $(DEB_DESTDIR)/usr/share/emacs/site-lisp/
- # Move webstuff in /usr/share
- mv $(DEB_DESTDIR)/usr/share/python-support/mercurial/mercurial/templates \
- $(DEB_DESTDIR)/usr/share/mercurial/
+ >> $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
+
+ rm -rf $(CURDIR)/debian/mercurial/usr/share/python-support/mercurial/mercurial/templates
+
ln -sf ../../../mercurial/templates \
- $(DEB_DESTDIR)/usr/share/python-support/mercurial/mercurial/templates
- chmod 0755 $(DEB_DESTDIR)/usr/share/python-support/mercurial/mercurial/lsprof.py $(DEB_DESTDIR)/usr/share/python-support/mercurial/mercurial/simplemerge.py
- #
- # Install svg logo
- install -m 0644 contrib/logo-droplets.svg $(DEB_DESTDIR)/usr/share/mercurial
+ $(CURDIR)/debian/mercurial/usr/share/python-support/mercurial/mercurial/templates
-build: build-doc
+ chmod 0755 $(CURDIR)/debian/mercurial/usr/share/python-support/mercurial/mercurial/lsprof.py \
+ $(CURDIR)/debian/mercurial/usr/share/python-support/mercurial/mercurial/simplemerge.py
-build-doc:
+
+build/mercurial-common::
$(MAKE) -C doc man
+
clean::
$(MAKE) clean
$(RM) -rv tmp/
+
More information about the Python-apps-commits
mailing list