[Python-apps-commits] r2951 - in packages/mercurial/trunk/debian (5 files)
vdanjean at users.alioth.debian.org
vdanjean at users.alioth.debian.org
Tue May 19 05:18:05 UTC 2009
Date: Tuesday, May 19, 2009 @ 05:18:04
Author: vdanjean
Revision: 2951
Switch to dh7 instead of cdbs
Modified:
packages/mercurial/trunk/debian/changelog
packages/mercurial/trunk/debian/control
packages/mercurial/trunk/debian/mercurial.dirs
packages/mercurial/trunk/debian/rules
Deleted:
packages/mercurial/trunk/debian/mercurial-common.docs
Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog 2009-05-16 18:30:22 UTC (rev 2950)
+++ packages/mercurial/trunk/debian/changelog 2009-05-19 05:18:04 UTC (rev 2951)
@@ -1,12 +1,24 @@
mercurial (1.2.1-1) unstable; urgency=low
[ Vernon Tang ]
- * New upstream release. (closes: #522426)
+ * New bugfix upstream release. (Closes: #525403)
+ - fixed version number build from tarball
+ - fix allow_read logic for hgweb
+ - improve handling of damaged revlogs in verify
+ - keep .orig files when resolving
+ - clear resolve state properly when rebasing
+ - improve --command handling with bisect
+ - fix diff against bundles
+ - improve fetch logic for inactive branches
+ - fix diffstat with notify
+ - fix 'synthetic file adds' in CVS conversion
[ Vincent Danjean ]
* Dump Standards-Version (no change needed)
+ * Switch to dh7 instead of cdbs (last releases of cdbs was breaking
+ the build system) (Closes: #522426, #527504)
- -- Vernon Tang <vt at foilhead.net> Mon, 06 Apr 2009 19:47:26 +1000
+ -- Vincent Danjean <vdanjean at debian.org> Mon, 18 May 2009 19:43:53 +0200
mercurial (1.2-1) unstable; urgency=low
Modified: packages/mercurial/trunk/debian/control
===================================================================
--- packages/mercurial/trunk/debian/control 2009-05-16 18:30:22 UTC (rev 2950)
+++ packages/mercurial/trunk/debian/control 2009-05-19 05:18:04 UTC (rev 2951)
@@ -5,13 +5,30 @@
Uploaders: Vincent Danjean <vdanjean at debian.org>,
Gerardo Curiel <gcuriel at debian.org.ve>,
Vernon Tang <vt at foilhead.net>
-Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25), gettext,
- cdbs (>= 0.4.27), python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc
+Build-Depends: debhelper (>= 7.0.50), quilt, patchutils (>= 0.2.25), gettext,
+ python-support (>= 0.5.3), python-all-dev, xmlto, asciidoc
Standards-Version: 3.8.1
Homepage: http://www.selenic.com/mercurial/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/mercurial/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/
+Package: mercurial-common
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: mercurial (= ${binary:Version})
+Suggests: wish,
+ python-mysqldb,
+ python-pygments,
+ python-openssl
+Conflicts: mercurial (<< ${binary:Version})
+Replaces: mercurial (<< ${binary:Version})
+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.
+ .
+ This package contains the architecture independent components of Mercurial,
+ and is generally useless without the mercurial package.
+
Package: mercurial
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ucf (>= 2.0020),
@@ -36,20 +53,3 @@
* Small Python codebase
.
This package contains the architecture dependent files.
-
-Package: mercurial-common
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Recommends: mercurial (= ${binary:Version})
-Suggests: wish,
- python-mysqldb,
- python-pygments,
- python-openssl
-Conflicts: mercurial (<< ${binary:Version})
-Replaces: mercurial (<< ${binary:Version})
-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.
- .
- This package contains the architecture independent components of Mercurial,
- and is generally useless without the mercurial package.
Deleted: packages/mercurial/trunk/debian/mercurial-common.docs
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.docs 2009-05-16 18:30:22 UTC (rev 2950)
+++ packages/mercurial/trunk/debian/mercurial-common.docs 2009-05-19 05:18:04 UTC (rev 2951)
@@ -1 +0,0 @@
-debian/README.Debian
Modified: packages/mercurial/trunk/debian/mercurial.dirs
===================================================================
--- packages/mercurial/trunk/debian/mercurial.dirs 2009-05-16 18:30:22 UTC (rev 2950)
+++ packages/mercurial/trunk/debian/mercurial.dirs 2009-05-19 05:18:04 UTC (rev 2951)
@@ -1,2 +1,3 @@
etc/bash_completion.d
etc/mercurial/hgrc.d
+usr/share/doc/mercurial
Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules 2009-05-16 18:30:22 UTC (rev 2950)
+++ packages/mercurial/trunk/debian/rules 2009-05-19 05:18:04 UTC (rev 2951)
@@ -1,34 +1,27 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-clean::
- # Keep current mercurial version
- # (must be done BEFORE the *.mk includes)
- cp -a mercurial/__version__.py mercurial/__version__.py.save
+%:
+ dh --with quilt $@
-DEB_PYTHON_SYSTEM=pysupport
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-DEB_INSTALL_DOCS_ALL=
+PYVERS=$(shell pyversions -vs)
-# These part must be run between dh_install and dh_pysupport
-# So, they must be defined BEFORE including python-distutils.mk
-binary-install/mercurial::
- # remove arch-independent python stuff
- find debian/mercurial/usr/lib \
- ! -name '*.so' ! -type d -delete , \
- -type d -empty -delete
+override_dh_auto_build: $(PYVERS:%=build-python%)
+ $(MAKE) -C doc man
+ touch $@
-binary-install/mercurial-common::
- # remove arch-dependent python stuff
- find debian/mercurial-common/usr/lib \
- -name '*.so' ! -type d -delete , \
- -type d -empty -delete
+build-python%: mercurial/__version__.py
+ python$* setup.py build
+ touch $@
-include /usr/share/cdbs/1/class/python-distutils.mk
+override_dh_auto_install: $(PYVERS:%=install-python%)
+install-python%: build-python%
+ python$* setup.py install --root $(CURDIR)/debian/tmp
-binary-install/mercurial::
+
+override_dh_install:
+ dh_install
# Install bash autocompletion.
install -m 644 \
contrib/bash_completion \
@@ -46,20 +39,25 @@
# Symlink docs
rm -rf $(CURDIR)/debian/mercurial/usr/share/doc/mercurial
ln -s mercurial-common $(CURDIR)/debian/mercurial/usr/share/doc/mercurial
+ # remove arch-independent python stuff
+ find debian/mercurial/usr/lib \
+ ! -name '*.so' ! -type d -delete , \
+ -type d -empty -delete
+ # remove arch-dependent python stuff
+ find debian/mercurial-common/usr/lib \
+ -name '*.so' ! -type d -delete , \
+ -type d -empty -delete
-build/mercurial:: mercurial/__version__.py
-
-build/mercurial-common::
- $(MAKE) -C doc man
-
-clean::
+override_dh_auto_clean:
+ cp -a mercurial/__version__.py mercurial/__version__.py.save
$(MAKE) clean
- # Restoring the version file saved at the begining of the clean
mv mercurial/__version__.py.save mercurial/__version__.py
$(RM) -rv tmp/
+ $(RM) build-python*
mercurial/__version__.py:
@echo "$@ is missing (you probably call 'make clean' directly)."
@echo "Restore it from sources before building the package"
@echo "Aborting."
exit 1
+
More information about the Python-apps-commits
mailing list