# HG changeset patch # User Paul Crowley # Date 1261250501 0 # Node ID 107d28ce67f5205c2032983b63457c06c06bd204 # Parent 97a8fe72a35e0de568c7beecee47c8f57d9a09a8# Parent efb4044593ed795d8e74cd38c216998c317eccfa Merge in changes from upstream diff -r efb4044593ed -r 107d28ce67f5 .hgignore --- a/.hgignore Sat Dec 19 19:18:03 2009 +0000 +++ b/.hgignore Sat Dec 19 19:21:41 2009 +0000 @@ -1,7 +1,14 @@ ^build/ +^build-stamp$ +^configure-stamp$ +^debian/files$ +^debian/mercurial-server/ +^debian/mercurial-server. + syntax: glob *~ *.pyc *.orig *.rej + diff -r efb4044593ed -r 107d28ce67f5 .hgtags --- a/.hgtags Sat Dec 19 19:18:03 2009 +0000 +++ b/.hgtags Sat Dec 19 19:21:41 2009 +0000 @@ -1,7 +1,11 @@ 535502c18eaad098437e49adea1e26a68e4b6d75 release_0.5 975fb921c3f3ffe7ccde5877f2954a5d1141bb14 release_0.6 243dd21d0dbc140957afbe7c9e2afb9caaffee37 release_0.7 +95c9ab8e4bfc6fea6460b3147c3097373eba5d42 debian_0.7 1ad9d5841a48a77f68dc5350bd1f941327a6348a release_0.8 -fed42d3f5311c55cab668d6962a61d44ba98645e release_0.9 +1e4050abb96e72c6324b93709e56a3e135e63ce1 debian_0.8-1 +d42d3f5311c55cab668d6962a61d44ba98645e release_0.9 +b6887a9b8792bb2b69b428448102140fce121e29 debian_0.9-1 8ce190faa5c2b50f63cc5b11e28daf98836498d8 release_1.0 +60c2d676a754e02f1f7656a4b137399438b2ed35 debian_1.0-1 92cb6640a6417edaf52870c8a97000e11bb8b138 release_1.0.1 diff -r efb4044593ed -r 107d28ce67f5 debian/changelog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/changelog Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,29 @@ +mercurial-server (1.0-2) unstable; urgency=low + + * Add translations for de, ja, cs, sv, it, zh_CN + * Fix "[INTL:de] initial German debconf translation" (Closes: #559486) + * Fix "[INTL:ja] please add Japanese po-debconf template translation + (ja.po)" (Closes: #559541) + * Fix "[l10n:cs] Initial Czech translation PO debconf template for + package mercurial-server 1.0-1" + (Closes: #559883) + * Fix "[INTL:sv] Swedish strings for mercurial-server debconf" + (Closes: #559934) + + -- Paul Crowley Fri, 18 Dec 2009 13:23:42 +0000 + +mercurial-server (1.0-1) unstable; urgency=low + + * Fix "call to /usr/share/mercurial-server/refresh-auth fails without + -H switch for sudo" (Closes: #558143) + * Fix "NP problem" with new short description (Closes: #558387) + * New upstream version + + -- Paul Crowley Wed, 02 Dec 2009 18:01:27 +0000 + +mercurial-server (0.9-1) sid; urgency=low + + * Initial release. (Closes: #555750: ITP: mercurial-server -- provide + and manage a shared Mercurial repository) + + -- Paul Crowley Thu, 12 Nov 2009 11:21:55 +0000 diff -r efb4044593ed -r 107d28ce67f5 debian/compat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/compat Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,1 @@ +7 diff -r efb4044593ed -r 107d28ce67f5 debian/config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/config Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# Load debconf +. /usr/share/debconf/confmodule + +db_input medium mercurial-server/purge_repositories || true + +db_go || true + +exit 0 + diff -r efb4044593ed -r 107d28ce67f5 debian/control --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/control Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,18 @@ +Source: mercurial-server +Section: devel +Priority: extra +Maintainer: Paul Crowley +Build-Depends: debhelper (>= 7.0.50~), python-support, xsltproc, docbook-xsl +Standards-Version: 3.8.3 +Homepage: http://www.lshift.net/mercurial-server.html +Vcs-Browser: http://hg.opensource.lshift.net/mercurial-server/ +Vcs-Hg: http://hg.opensource.lshift.net/mercurial-server/ + +Package: mercurial-server +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, adduser, python, mercurial, openssh-server | ssh-server +Description: shared Mercurial repository service + mercurial-server makes a group of repositories available to the developers + you choose, identified by SSH keys, with easy key and access management + based on Mercurial. + diff -r efb4044593ed -r 107d28ce67f5 debian/copyright --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/copyright Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,27 @@ +This package was debianized by the upstream author Paul Crowley + on Sat, 07 Mar 2009 10:12:02 +0000. Both the package and +the Debian packaging carry this copyright and license: + +Copyright 2008-2009 Paul Crowley +Copyright 2008-2009 LShift Ltd. + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + diff -r efb4044593ed -r 107d28ce67f5 debian/dirs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/dirs Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,9 @@ +usr/share/mercurial-server +usr/share/mercurial-server/init +usr/share/mercurial-server/mercurialserver +usr/share/doc/mercurial-server +etc/mercurial-server +etc/mercurial-server/remote-hgrc.d +etc/mercurial-server/keys +etc/mercurial-server/keys/root +etc/mercurial-server/keys/users diff -r efb4044593ed -r 107d28ce67f5 debian/doc-base --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/doc-base Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,7 @@ +Document: mercurial-server +Title: mercurial-server manual +Section: Programming + +Format: HTML +Index: /usr/share/doc/mercurial-server/html/index.html +Files: /usr/share/doc/mercurial-server/html/*.html diff -r efb4044593ed -r 107d28ce67f5 debian/po/POTFILES.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/POTFILES.in Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,1 @@ +[type: gettext/rfc822deb] templates diff -r efb4044593ed -r 107d28ce67f5 debian/po/cs.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/cs.po Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,25 @@ +# Czech translation of PO debconf template for package mercurial-server. +# Copyright (C) 2009 Michal Simunek +# This file is distributed under the same license as the mercurial-server package. +# Michal Simunek , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: mercurial-server 1.0-1\n" +"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 18:14+0000\n" +"PO-Revision-Date: 2009-12-07 14:19+0100\n" +"Last-Translator: Michal Simunek \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"Chcete, aby byly smazány repozitáře, když bude kompletně odstraněn mercurial-" +"server?" diff -r efb4044593ed -r 107d28ce67f5 debian/po/de.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/de.po Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,24 @@ +# Translation of mercurial debconf templates to German +# Copyright (C) Helge Kreutzmann , 2009. +# This file is distributed under the same license as the mercurial package. +# +msgid "" +msgstr "" +"Project-Id-Version: mercurial 1.0-1\n" +"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 18:14+0000\n" +"PO-Revision-Date: 2009-12-04 20:45+0100\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"Sollen die Depots entfernt werden, wenn mercurial-server vollständig entfernt " +"wird?" diff -r efb4044593ed -r 107d28ce67f5 debian/po/it.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/it.po Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,25 @@ +# ITALIAN TRANSLATION OF MERCURIAL-SERVER'S PO-DEBCON FILE. +# COPYRIGHT (C) 2009 THE MERCURIAL-SERVER'S COPYRIGHT HOLDER +# This file is distributed under the same license as the mercurial-server package. +# +# Vincenzo Campanella , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: mercurial server\n" +"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 18:14+0000\n" +"PO-Revision-Date: 2009-12-05 06:13+0100\n" +"Last-Translator: Vincenzo Campanella \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"Rimuovere anche i repository quando mercurial-server viene rimosso completamente?" diff -r efb4044593ed -r 107d28ce67f5 debian/po/ja.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/ja.po Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,25 @@ +# Japanese translation for mercurial-server +# Copyright (C) 2009 Paul Crowley +# This file is distributed under the same license as the mercurial-server package. +# Hideki Yamane (Debian-JP) , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: mercurial-server 1.0-1\n" +"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 18:14+0000\n" +"PO-Revision-Date: 2009-12-05 17:19+0000\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"mercurial-server が完全に削除 (purge) される際にリポジトリを削除しますか?" + diff -r efb4044593ed -r 107d28ce67f5 debian/po/sv.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/sv.po Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,26 @@ +# Translation of mercurial-server debconf template to Swedish +# Copyright (C) 2009 Martin Bagge +# This file is distributed under the same license as the mercurial-server package. +# +# Martin Bagge , 2009 +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 18:14+0000\n" +"PO-Revision-Date: 2009-12-07 22:33+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Swedish\n" +"X-Poedit-Country: Sweden\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"Vill du att kodförråd ska tas bort när paketet mercurial-server tas bort?" diff -r efb4044593ed -r 107d28ce67f5 debian/po/templates.pot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/templates.pot Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 18:14+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" diff -r efb4044593ed -r 107d28ce67f5 debian/po/zh_CN.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/zh_CN.po Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,23 @@ +# Chinese (simplified) translation about mercurial-server . +# Copyright (C) 2009 THE mercurial-server'S COPYRIGHT HOLDER +# This file is distributed under the same license as the mercurial-server package. +# Ji ZhengYu , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: mercurial-server 1.0-1\n" +"Report-Msgid-Bugs-To: mercurial-server@packages.debian.org\n" +"POT-Creation-Date: 2009-12-02 18:14+0000\n" +"PO-Revision-Date: 2009-12-05 18:29中国标准时间\n" +"Last-Translator: Ji ZhengYu \n" +"Language-Team: Chinese (simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "您是否想在完全删除 mercurial-server 的同时删除相应的源码仓库？" diff -r efb4044593ed -r 107d28ce67f5 debian/postinst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/postinst Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,35 @@ +#!/bin/sh +# postinst script for mercurial-server + +set -e + +# Load debconf +. /usr/share/debconf/confmodule + +case "$1" in + configure|reconfigure) + if ! getent passwd hg >/dev/null; then + adduser --disabled-password --quiet --system \ + --shell /bin/sh --group \ + --home /var/lib/mercurial-server \ + --gecos "Mercurial repositories" hg + su -c "/usr/share/mercurial-server/init/hginit /usr/share/mercurial-server" hg + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst 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 + diff -r efb4044593ed -r 107d28ce67f5 debian/postrm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/postrm Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,47 @@ +#!/bin/sh +# postrm script for mercurial-server + +set -e + +# Load debconf +. /usr/share/debconf/confmodule + +# Check if the user wants the repositories removed on purging +remove_repositories_on_purge() { + db_get mercurial-server/purge_repositories || RET=false + if [ "$RET" = "true" ]; then + return 0 + else + return 1 + fi +} + +case "$1" in + purge) + if remove_repositories_on_purge; then + echo -n "Removing hg user and purging data..." + deluser --remove-home --quiet --system hg > /dev/null || true + else + echo -n "Removing hg user..." + deluser --quiet --system hg > /dev/null || true + fi + delgroup --quiet --system hg > /dev/null || true + echo done + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm 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 + diff -r efb4044593ed -r 107d28ce67f5 debian/rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/rules Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,15 @@ +#!/usr/bin/make -f +%: + dh $@ + +override_dh_auto_install: + $(MAKE) installfiles \ + DESTDIR=./debian/mercurial-server/ \ + PREFIX=/usr/share + +override_dh_pysupport: + dh_pysupport /usr/share/mercurial-server/mercurialserver + +override_dh_installchangelogs: + dh_installchangelogs NEWS + diff -r efb4044593ed -r 107d28ce67f5 debian/templates --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/templates Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,5 @@ +Template: mercurial-server/purge_repositories +Type: boolean +Default: false +_Description: Do you want the repositories to be removed when mercurial-server is purged? + diff -r efb4044593ed -r 107d28ce67f5 debian/watch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/watch Sat Dec 19 19:21:41 2009 +0000 @@ -0,0 +1,5 @@ +# Nothing in this file. +# I can't find a way to make uscan check for new tags in an +# http-based Mercurial repository. If there is such a way, please +# let me know. +