# HG changeset patch # User Paul Crowley # Date 1315304218 -3600 # Node ID f597eb3b5aaf04b8ea8e1de5e23846ed9e208667 # Parent 31d5c6236f713ca8fc72099d20101e154dcdcaad# Parent 4e65f8242c0bb8669897ec65306b1cf961596805 Merge default diff -r 4e65f8242c0b -r f597eb3b5aaf .hgignore --- a/.hgignore Tue Sep 06 11:11:29 2011 +0100 +++ b/.hgignore Tue Sep 06 11:16:58 2011 +0100 @@ -1,5 +1,10 @@ ^build/ ^dev/chroot-test/build/ +^build-stamp$ +^configure-stamp$ +^debian/files$ +^debian/mercurial-server/ +^debian/mercurial-server. syntax: glob diff -r 4e65f8242c0b -r f597eb3b5aaf .hgtags --- a/.hgtags Tue Sep 06 11:11:29 2011 +0100 +++ b/.hgtags Tue Sep 06 11:16:58 2011 +0100 @@ -1,8 +1,14 @@ 535502c18eaad098437e49adea1e26a68e4b6d75 release_0.5 975fb921c3f3ffe7ccde5877f2954a5d1141bb14 release_0.6 243dd21d0dbc140957afbe7c9e2afb9caaffee37 release_0.7 +95c9ab8e4bfc6fea6460b3147c3097373eba5d42 debian_0.7 1ad9d5841a48a77f68dc5350bd1f941327a6348a release_0.8 +1e4050abb96e72c6324b93709e56a3e135e63ce1 debian_0.8-1 fed42d3f5311c55cab668d6962a61d44ba98645e release_0.9 +b6887a9b8792bb2b69b428448102140fce121e29 debian_0.9-1 8ce190faa5c2b50f63cc5b11e28daf98836498d8 release_1.0 +60c2d676a754e02f1f7656a4b137399438b2ed35 debian_1.0-1 92cb6640a6417edaf52870c8a97000e11bb8b138 release_1.0.1 +c7aca86585824f39fa47015d6ebf1bab6a25b82c debian_1.0.1-1 01eca64f77abbf0da41cd777a365de2a5a02988b release_1.1 +32dba1a70a5443cf86a78b5a9471ad7ced034a12 debian_1.1-1 diff -r 4e65f8242c0b -r f597eb3b5aaf CREDITS --- a/CREDITS Tue Sep 06 11:11:29 2011 +0100 +++ b/CREDITS Tue Sep 06 11:16:58 2011 +0100 @@ -19,6 +19,7 @@ Ji ZhengYu Waldemar Augustyn Steven King +Christian Perrier This credits file may be incomplete - please remind me about people I should add! diff -r 4e65f8242c0b -r f597eb3b5aaf debian/changelog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/changelog Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,48 @@ +mercurial-server (1.1-1) unstable; urgency=low + + * New upstream version + * Fix "leaves unowned files on purge": Delete user/group only + when purging data (Closes: #605584) + * Fix "installation fails with aptitude": run update-python-modules + to ensure hg will work before using it (Closes: #604213) + * Add translation for pt_BR (Closes: #607407) + + -- Paul Crowley Sat, 18 Dec 2010 15:46:45 +0000 + +mercurial-server (1.0.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Explicitly use 1.0 source format + * Fix pending l10n issues. Debconf translations: + - Spanish (Francisco Javier Cuadrado). Closes: #561921 + - Portuguese (Pedro Ribeiro). Closes: #562243 + - Russian (Yuri Kozlov). Closes: #562637 + - Finnish (Esko Arajärvi). Closes: #564505 + - French (Christian Perrier). Closes: #564594 + - Vietnamese (Clytie Siddall). Closes: #576134 + + -- Christian Perrier Fri, 16 Apr 2010 19:57:05 +0200 + +mercurial-server (1.0.1-1) unstable; urgency=medium + + * New upstream version with security fix + * Add translations for de, ja, cs, sv, it, zh_CN + (Closes: #559486 #559541 #559883 #559934) + + -- Paul Crowley Sat, 19 Dec 2009 19:22:45 +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 4e65f8242c0b -r f597eb3b5aaf debian/compat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/compat Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,1 @@ +7 diff -r 4e65f8242c0b -r f597eb3b5aaf debian/config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/config Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/control --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/control Tue Sep 06 11:16:58 2011 +0100 @@ -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.9.1 +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 4e65f8242c0b -r f597eb3b5aaf debian/copyright --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/copyright Tue Sep 06 11:16:58 2011 +0100 @@ -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-2010 Paul Crowley +Copyright 2008-2010 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 4e65f8242c0b -r f597eb3b5aaf debian/dirs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/dirs Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/doc-base --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/doc-base Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/po/POTFILES.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/POTFILES.in Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,1 @@ +[type: gettext/rfc822deb] templates diff -r 4e65f8242c0b -r f597eb3b5aaf debian/po/cs.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/cs.po Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/po/de.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/de.po Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/po/es.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/es.po Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,44 @@ +# mercurial-server po-debconf translation to Spanish +# Copyright (C) 2009 Software in the Public Interest +# This file is distributed under the same license as the mercurial-server package. +# +# Changes: +# - Initial translation +# Francisco Javier Cuadrado , 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +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 23:50+0200\n" +"Last-Translator: Francisco Javier Cuadrado \n" +"Language-Team: Debian l10n Spanish \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 "¿Desea borrar los repositorios cuando mercurial-server sea purgado?" diff -r 4e65f8242c0b -r f597eb3b5aaf debian/po/fi.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/fi.po Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,26 @@ +# Copyright (C) 2009 +# This file is distributed under the same license as the mercurial-server package. +# +# Esko Arajärvi , 2010. +msgid "" +msgstr "" +"Project-Id-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: 2010-01-09 22:45+0200\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"Haluatko, että tietokannat poistetaan, kun paketti mercurial-server " +"siivotaan?" diff -r 4e65f8242c0b -r f597eb3b5aaf debian/po/fr.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/fr.po Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,28 @@ +# Translation of mercurial-server debconf templates to French +# Copyright (C) 2005-2009 Debian French l10n team +# This file is distributed under the same license as the mercurial-server package. +# +# Translators: +# Christian Perrier , 2010. +msgid "" +msgstr "" +"Project-Id-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: 2010-01-02 18:50+0100\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"Faut-il supprimer les dépôts de suivi de version lorsque mercurial-server " +"est purgé ?" diff -r 4e65f8242c0b -r f597eb3b5aaf debian/po/it.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/it.po Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/po/ja.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/ja.po Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/po/pt.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/pt.po Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,25 @@ +# Portuguese translation for mercurial server debconf messages +# Copyright (C) 2009 +# This file is distributed under the same license as the mercurial server package. +# Pedro Ribeiro , 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-04 22:40+0000\n" +"Last-Translator: Pedro Ribeiro \n" +"Language-Team: Portuguese \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 "" +"Quer que os repositórios sejam removidos quando o mercurial-server for " +"purgado?" diff -r 4e65f8242c0b -r f597eb3b5aaf debian/po/pt_BR.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/pt_BR.po Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,28 @@ +# Debconf translations for mercurial-server. +# Copyright (C) 2009 THE mercurial-server'S COPYRIGHT HOLDER +# This file is distributed under the same license as the mercurial-server package. +# Adriano Rafael Gomes , 2009, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: mercurial-server 1.0.1-1.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: 2010-11-13 21:02-0200\n" +"Last-Translator: Adriano Rafael Gomes \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR utf-8\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "" +"Você quer que os repositórios sejam removidos quando o mercurial-server for " +"expurgado?" diff -r 4e65f8242c0b -r f597eb3b5aaf debian/po/ru.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/ru.po Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,26 @@ +# translation of mercurial-server_1.0.1-1_ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2009. +msgid "" +msgstr "" +"Project-Id-Version: mercurial-server 1.0.1-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-26 20:41+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 4e65f8242c0b -r f597eb3b5aaf debian/po/sv.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/sv.po Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/po/templates.pot --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/templates.pot Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/po/vi.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/vi.po Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,24 @@ +# Vietnamese translation for Mercurial Server. +# Copyright © 2010 Free Software Foundation, Inc. +# Clytie Siddall , 2010. +# +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: 2010-04-01 17:23+1030\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.8\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"Do you want the repositories to be removed when mercurial-server is purged?" +msgstr "Khi tẩy gói này thì cũng nên gỡ bỏ các kho lưu ?" diff -r 4e65f8242c0b -r f597eb3b5aaf debian/po/zh_CN.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/po/zh_CN.po Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/postinst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/postinst Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,37 @@ +#!/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 + # Make sure Mercurial's modules will work when we come to use them + update-python-modules -p + 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 4e65f8242c0b -r f597eb3b5aaf debian/postrm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/postrm Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,44 @@ +#!/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 + delgroup --quiet --system hg > /dev/null || true + echo done + fi + ;; + + 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 4e65f8242c0b -r f597eb3b5aaf debian/rules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/rules Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/source/format --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/source/format Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,1 @@ +3.0 (quilt) diff -r 4e65f8242c0b -r f597eb3b5aaf debian/templates --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/templates Tue Sep 06 11:16:58 2011 +0100 @@ -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 4e65f8242c0b -r f597eb3b5aaf debian/watch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/watch Tue Sep 06 11:16:58 2011 +0100 @@ -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. + diff -r 4e65f8242c0b -r f597eb3b5aaf dev/chroot-test/action/install-installables --- a/dev/chroot-test/action/install-installables Tue Sep 06 11:11:29 2011 +0100 +++ b/dev/chroot-test/action/install-installables Tue Sep 06 11:16:58 2011 +0100 @@ -1,5 +1,5 @@ aptitude --allow-untrusted --quiet --without-recommends --assume-yes install \ - make mercurial xsltproc docbook-xsl openssh-server \ - python python-support adduser -cd mercurial-server -make setup-adduser + debconf python python-support adduser openssh-server ucf +echo dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb +dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb + diff -r 4e65f8242c0b -r f597eb3b5aaf dev/chroot-test/action/refresh-auth --- a/dev/chroot-test/action/refresh-auth Tue Sep 06 11:11:29 2011 +0100 +++ b/dev/chroot-test/action/refresh-auth Tue Sep 06 11:16:58 2011 +0100 @@ -2,4 +2,4 @@ set -e -/usr/local/share/mercurial-server/refresh-auth +/usr/share/mercurial-server/refresh-auth diff -r 4e65f8242c0b -r f597eb3b5aaf dev/chroot-test/copy-installables --- a/dev/chroot-test/copy-installables Tue Sep 06 11:11:29 2011 +0100 +++ b/dev/chroot-test/copy-installables Tue Sep 06 11:16:58 2011 +0100 @@ -1,3 +1,2 @@ +cp build/debian/*.deb $BACKING/action -hg st -mac0n -X '.hg*' -X 'dev/**' \ - | cpio -p -0 -d $BACKING/action/mercurial-server diff -r 4e65f8242c0b -r f597eb3b5aaf dev/debian-build/dbuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev/debian-build/dbuild Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,33 @@ +#!/bin/sh + +set -e + +cd $(hg root) + +PACKAGE=$(dpkg-parsechangelog | sed -n 's/^Source: \(.*\)/\1/p') +DEBIAN_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p') +# Lazy, but hey +UPSTREAM_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*/\1/p') +UPSTREAM=$(hg log --template '{node}' -r 'heads(ancestors(.) and branch(default))') +BUILDDIR=$(pwd)/build/debian + +echo PACKAGE $PACKAGE +echo DEBIAN_VERSION $DEBIAN_VERSION +echo UPSTREAM_VERSION $UPSTREAM_VERSION +echo UPSTREAM $UPSTREAM +echo BUILDDIR $BUILDDIR + +rm -rf ${BUILDDIR} +mkdir -p ${BUILDDIR} +hg archive -X '.hg*' -X 'dev/**' -t tgz -r ${UPSTREAM} \ + ${BUILDDIR}/${PACKAGE}_${UPSTREAM_VERSION}.orig.tar.gz +hg st -mac0n -X '.hg*' -X 'dev/**' | cpio -p -0 -d \ + ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION} + +cd ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION} +#dpkg-buildpackage -kFD56DDC0 +dpkg-buildpackage +cd .. +lintian -i --pedantic -IE ${PACKAGE}_${DEBIAN_VERSION}_*.changes +#sudo pbuilder --build ${PACKAGE}_${DEBIAN_VERSION}.dsc + diff -r 4e65f8242c0b -r f597eb3b5aaf dev/debian-build/dbuild_release --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev/debian-build/dbuild_release Tue Sep 06 11:16:58 2011 +0100 @@ -0,0 +1,32 @@ +#!/bin/sh + +set -e + +cd $(hg root) + +PACKAGE=$(dpkg-parsechangelog | sed -n 's/^Source: \(.*\)/\1/p') +DEBIAN_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)/\1/p') +# Lazy, but hey +UPSTREAM_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*\)-[^-]*/\1/p') +BUILDDIR=$(pwd)/build/debian + +echo PACKAGE $PACKAGE +echo DEBIAN_VERSION $DEBIAN_VERSION +echo UPSTREAM_VERSION $UPSTREAM_VERSION +echo UPSTREAM $UPSTREAM +echo BUILDDIR $BUILDDIR + +rm -rf ${BUILDDIR} +mkdir -p ${BUILDDIR} +hg archive -X '.hg*' -X 'dev/**' -t tgz -r release_${UPSTREAM_VERSION} \ + ${BUILDDIR}/${PACKAGE}_${UPSTREAM_VERSION}.orig.tar.gz +hg archive -X '.hg*' -X 'dev/**' -r debian_${DEBIAN_VERSION} \ + ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION} + +cd ${BUILDDIR}/${PACKAGE}-${UPSTREAM_VERSION} +dpkg-buildpackage -kFD56DDC0 +#dpkg-buildpackage +cd .. +lintian -i --pedantic -IE ${PACKAGE}_${DEBIAN_VERSION}_*.changes +sudo pbuilder --build ${PACKAGE}_${DEBIAN_VERSION}.dsc +