Commits

Michael Granger  committed 0c4deac Merge

Merged 05572376234d with upstream

  • Participants
  • Parent commits 0557237, e2278af

Comments (0)

Files changed (19)

 32dba1a70a5443cf86a78b5a9471ad7ced034a12 debian_1.1-1
 30d35aed0ae264836384a151d549aaffd9c02abd release_1.2
 83de2f945bbe47195b8d655f432dbeb4a0c68d0b debian_1.2-1
+660f5631013eb1bd25dcf6e4012cbbd970d85b03 release_1.3
+660f5631013eb1bd25dcf6e4012cbbd970d85b03 debian_1.3-1
 Steven King <kingrst@gmail.com>
 Christian Perrier <bubulle@debian.org>
 Andrej Krpic <akrpic77@gmail.com>
+Joe Dalton <joedalton2@yahoo.dk>
+Jeroen Schot <schot@A-Eskwadraat.nl>
+Slavko <slavko@slavino.sk>
+Michał Kułach <michalkulach@gmail.com>
+Tom Parker <palfrey@lshift.net>
+Hugh Fisher <hugh.fisher@anu.edu.au>
 
 This credits file may be incomplete - please remind me about people I
 should add!
 ETCDIR=/etc/mercurial-server
 NEWUSER=hg
 HOMEDIR=/var/lib/mercurial-server
-DOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh
+DOCBOOK_XSL?=/usr/share/xml/docbook/stylesheet/nwalsh
 
 INSTALL=install
 
 # WARNING: this is experimental
 setup-useradd: installfiles useradd inituser
 
+# WARNING: this is experimental
+setup-windows: installfiles adduser-windows
+
 installetc:
 	$(INSTALL) -d $(DESTDIR)$(ETCDIR)
-	$(INSTALL) -m 644 src/init/conf/access.conf \
-	    $(DESTDIR)$(ETCDIR)
+	$(INSTALL) -m 644 -t $(DESTDIR)$(ETCDIR) \
+	    src/init/conf/access.conf
 	$(INSTALL) -d $(DESTDIR)$(ETCDIR)/remote-hgrc.d
-	$(INSTALL) -m 644 \
+	$(INSTALL) -m 644 -t $(DESTDIR)$(ETCDIR)/remote-hgrc.d \
 	    src/init/conf/remote-hgrc.d/access.rc \
-	    src/init/conf/remote-hgrc.d/logging.rc \
-	    $(DESTDIR)$(ETCDIR)/remote-hgrc.d
+	    src/init/conf/remote-hgrc.d/logging.rc
 	$(INSTALL) -d $(DESTDIR)$(ETCDIR)/keys/root
 	$(INSTALL) -d $(DESTDIR)$(ETCDIR)/keys/users
 
 pythonbuild:
 	python setup.py build
 
-dot-mercurial: src/init/dot-mercurial-server.tmpl
-	sed -e "s|_ETCDIR_|$(ETCDIR)|" \
-	    src/init/dot-mercurial-server.tmpl \
-	    > src/init/dot-mercurial-server
-
-pythoninstall: dot-mercurial
+pythoninstall:
 	python setup.py install \
 	    --install-purelib=$(DESTDIR)$(LIBDIR) \
 	    --install-platlib=$(DESTDIR)$(LIBDIR) \
 	    --home $(HOMEDIR) --create-home \
 	    --comment  "Mercurial repositories" $(NEWUSER)
 
+# WARNING: this is experimental
+adduser-windows:
+	net user $(NEWUSER) /add
+
 bsduseradd:
 	pw useradd $(NEWUSER) -c "Mercurial repositories" -m -s /bin/sh \
 	    -d $(HOMEDIR)
 
 inituser:
-	su $(NEWUSER) -c "$(DESTDIR)$(LIBDIR)/init/hginit $(DESTDIR)$(LIBDIR)" -
+	su -l -c "$(DESTDIR)$(LIBDIR)/init/hginit $(DESTDIR)$(LIBDIR)" $(NEWUSER)
 
+# WARNING: this is experimental
+inituser-windows:
+	mkdir /home/$(NEWUSER)
+	chown $(NEWUSER) /home/$(NEWUSER)
+	chmod 755 $(DESTDIR)$(LIBDIR)/init/*
+	ssh $(NEWUSER)@localhost "sh $(DESTDIR)$(LIBDIR)/init/hginit $(DESTDIR)$(LIBDIR)"
+
 * Missing entries in CREDITS
 * Debian build management improvements
 * Release documentation
+* Experimental Cygwin support
 
 ====================
 mercurial-server 1.2
 
 http://www.lshift.net/mercurial-server.html
 
-Copyright (C) 2008-2011 LShift Ltd.
+Copyright (C) 2008-2012 LShift Ltd.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 See doc/manual.docbook for the rest of the documentation.
 
-Paul Crowley, paul@lshift.net, 2011
+Paul Crowley, paul@lshift.net, 2012

File README-windows.txt

+Windows setup for mercurial-server
+==================================
+
+WARNING: Windows is *not* a supported system. We've gotten this guide to work ok
+but the permissions are still broken in various ways to do with the underlying
+issues in Windows' permissions system. Unix-based systems, especially Debian and
+derivatives are still the main target. Patches to this guide to improve the
+support are welcome however!
+
+1) Install Cygwin (http://cygwin.com/) using the setup.exe from there. Tested
+against 1.7.12-1, may work with earlier versions. You'll need the base install
+plus the following additional packages:
+
+- docbook-xsl
+- libxslt
+- make
+- mercurial
+- openssh
+- python
+  
+Note that even if you've already got them installed in Windows, Python and
+Mercurial still need to be installed in Cygwin.
+
+2) Open a new Cygwin terminal as Adminstrator (under Windows 7, that's right
+click on "Cygwin Terminal" start menu option and pick "Run as administrator")
+
+3) Run "ssh-host-config -y" and "cygrunsrv -S sshd" to get sshd running. We need
+this because there's no proper su in Cygwin (see
+http://cygwin.com/faq-nochunks.html#faq.using.su for why this is)
+
+3) Goto the mercurial-server folder and "sh windows.sh setup-windows"
+
+4) Run "passwd hg" and set the password for the hg user (created by
+setup-windows), then "mkpasswd -l > /etc/passwd" to add them to the Cygwin user
+database
+
+5) Run "sh windows.sh inituser-windows" to finish setting up the hg user
+
+5) Following the example from the main mercurial-server documentation (in that
+the server is called 'jeeves', your username is 'jay' and the client is called
+'spoon'), but with a few differences for Cygwin, we can now get you initial
+access. We assume that you've generated a key with PuTTYgen
+(http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) and then
+copied the contents of the "public key" box into a file called my-key. Run the
+following, altered as appropriate for your local system:
+
+  mkdir -p /etc/mercurial-server/keys/root/jay
+  cp my-key /etc/mercurial-server/keys/root/jay/spoon
+  chown hg /etc/mercurial-server/keys/root/jay/spoon
+  ssh hg@localhost /usr/local/share/mercurial-server/refresh-auth
+
+The rest of the instructions in the normal mercurial-server documentation should
+now work. Note that although it's possible to add keys/access info to
+/etc/mercurial-server it's much easier to do things via the hgadmin repository,
+and doing things via /etc should probably be limited to only if you mess up the
+setup in hgadmin.
+
+# vim: tw=80 fo=cqt wm=0

File debian/changelog

 mercurial-server (1.3-1) unstable; urgency=low
 
   * New upstream version
+  * Add translations for da, nl, sk, pl
+    (Closes: #658943 #675317 #685558 #685700)
+  * New Standards-Version
+  * Switch to dh_python2
 
- -- Paul Crowley <paul@lshift.net>  Thu, 08 Sep 2011 08:26:13 +0100
+ -- Paul Crowley <paul@lshift.net>  Fri, 24 Aug 2012 12:07:33 +0100
 
 mercurial-server (1.2-1) unstable; urgency=high
 

File debian/control

 Section: devel
 Priority: extra
 Maintainer: Paul Crowley <paul@lshift.net>
-Build-Depends: debhelper (>= 7.0.50~), python-support, xsltproc, docbook-xsl
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), xsltproc, docbook-xsl
+Standards-Version: 3.9.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
+Depends: ${misc:Depends}, ${python:Depends}, adduser, python (>= 2.6.6-3~), 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

File debian/po/da.po

+# Danish translation mercurial-server.
+# Copyright (C) 2012 mercurial-server & nedenstående oversættere.
+# This file is distributed under the same license as the mercurial-server package.
+# Joe Hansen (joedalton2@yahoo.dk), 2012.
+#
+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: 2012-02-06 12:42+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\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 ""
+"Ønsker du at arkiverne skal fjernes, når mercurial-server afinstalleres?"
+

File debian/po/nl.po

+# Dutch translation of mercurial-server debconf templates.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mercurial-server package.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mercurial-server 1.2-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: 2012-05-31 10:03+0200\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\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 ""
+"Wilt u dat de database verwijderd wordt wanneer mercurial-server gewist "
+"('purge') wordt?"

File debian/po/pl.po

+# Translation of mercurial-server debconf templates to Polish.
+# Copyright (C) 2009
+# This file is distributed under the same license as the mercurial-server package.
+#
+# Michał Kułach <michal.kulach@gmail.com>, 2012.
+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: 2012-08-21 19:05+0200\n"
+"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
+"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.4\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want the repositories to be removed when mercurial-server is purged?"
+msgstr ""
+"Czy repozytoria mają być usunięte podczas czyszczenia pakietu "
+"mercurial-server?"
+

File debian/po/sk.po

+# Slovak translations for mercurial-server package
+# Slovenské preklady pre balík mercurial-server.
+# Copyright (C) 2012 THE mercurial-server'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mercurial-server package.
+# Automatically generated, 2012.
+# Slavko <linux@slavino.sk>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mercurial-server 1.2-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: 2012-08-21 23:21+0200\n"
+"Last-Translator: Slavko <linux@slavino.sk>\n"
+"Language-Team: slovenčina <debian-l10n-slovak@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-POFile-SpellExtra: purge mercurial-server\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"Do you want the repositories to be removed when mercurial-server is purged?"
+msgstr ""
+"Chcete aby pri vyčistení (purge) mercurial-server boli odstránené aj "
+"úložiská ?"

File debian/postinst

                 --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
     ;;

File debian/rules

 #!/usr/bin/make -f
 %:
-	dh $@
+	dh --with python2 $@
 
 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_python2:
+	dh_python2 /usr/share/mercurial-server/mercurialserver
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

File dev/chroot-test/action/install-installables

 if ${CHROOT_TEST_INSTALLDEB:-false} ; then
     aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
-         debconf python python-support adduser openssh-server ucf
+         debconf python 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
 else
     aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
         make mercurial xsltproc docbook-xsl openssh-server \
-        python python-support adduser
+        python adduser
     cd mercurial-server
     make setup-adduser
 fi

File dev/chroot-test/run-test

 # Must be root to run this
 
 set -e
+
+for clause in $@ ; do
+    export $clause
+done
+
 cd $(hg root)
 
 DEBVERSION=sid

File dev/making-a-release

 - run debchange
 - Fix the actual problems (updating NEWS, CREDITS, debchange as we go)
 - Test with dev/chroot-test/run-test
-- Ensure year in README is up to date
+- Ensure year in README and doc/manual.docbook is up to date
 - Update Standards-Version
 - dev/debian-build/dbuild
 - CHROOT_TEST_INSTALLDEB=true dev/chroot-test/run-test

File doc/manual.docbook

 <info>
   <title>Sharing Mercurial repositories with mercurial-server</title>
   <author><firstname>Paul</firstname><surname>Crowley</surname></author>
-  <copyright><year>2008-2011</year><holder>Paul Crowley, LShift Ltd</holder></copyright>
+  <copyright><year>2008-2012</year><holder>Paul Crowley, LShift Ltd</holder></copyright>
 </info>
 <section>
 <title>About mercurial-server</title>
 xlink:href="http://sial.org/howto/openssh/publickey-auth/">OpenSSH Public
 Key Authentication tutorial</link> may be helpful.
 </para>
+<para>
+When mercurial-server is installed, a new user account called <systemitem
+class="username">hg</systemitem> will be created; this user's home directory will be where all repositories will be stored, so you should ensure that it has enough space and suchlike.</para>
 <section>
 <title>Initial access to mercurial-server</title>
 <para>
 it.
 </para>
 <para>
-Paul Crowley, <email>paul@lshift.net</email>, 2011
+Paul Crowley, <email>paul@lshift.net</email>, 2012
 </para>
 </section>
 </section>
+#!/bin/sh
+
+DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets make $@
+