diff -u ntlmaps-0.9.9.0.1/debian/rules ntlmaps-0.9.9.0.1/debian/rules --- ntlmaps-0.9.9.0.1/debian/rules +++ ntlmaps-0.9.9.0.1/debian/rules @@ -3,62 +3,4 @@ -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - #/usr/bin/docbook-to-man debian/ntlmaps.sgml > ntlmaps.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - debconf-updatepo - dh_clean - -binary-indep: - -binary-arch: - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - - -# Build architecture-dependent files here. -binary: build install - dh_testdir - dh_testroot - dh_installchangelogs changelog.txt - dh_installdocs - dh_install - cp debian/lintian-override debian/ntlmaps/usr/share/lintian/overrides/ntlmaps - dh_installdebconf - dh_installinit - dh_installman - dh_link - dh_strip - dh_compress - dh_pysupport /usr/share/ntlmaps - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: build clean binary install configure +%: + dh $@ --with python2 diff -u ntlmaps-0.9.9.0.1/debian/changelog ntlmaps-0.9.9.0.1/debian/changelog --- ntlmaps-0.9.9.0.1/debian/changelog +++ ntlmaps-0.9.9.0.1/debian/changelog @@ -1,3 +1,34 @@ +ntlmaps (0.9.9.0.1-11.5ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: + + Made debconf ask questions about domain and proxy port during postinst. + + Set SO_REUSEADDR on server socket, allowing for a quick restart. + + -- Graham Inggs Mon, 18 Jan 2016 11:45:11 +0200 + +ntlmaps (0.9.9.0.1-11.5) unstable; urgency=medium + + * Non-maintainer upload. + * Bump debhelper compat version to 9. + * Use the dh sequencer, to fix FTBFS in arch:all autobuilds + (with dpkg-buildpackage -A). + * Bump Standards-Version to 3.9.6, no changes needed. + + -- Mattia Rizzolo Tue, 15 Dec 2015 02:24:53 +0000 + +ntlmaps (0.9.9.0.1-11.4) unstable; urgency=medium + + * Non-maintainer upload. + * Updated debconf translations: + + Japanese (victory). Closes: #718913 + + Dutch (Frans Spiesschaert). Closes: #766638 + * Use dh-python instead of python-support (deprecated). Closes: #786178 + * use dh_lintian instead of manually copying the lintian overrides; also + rename debian/lintian-override to debian/ntlmaps.lintian-overrides. + This improve reproducibiliy when testing different umasks. + + -- Mattia Rizzolo Sat, 12 Dec 2015 23:36:07 +0000 + ntlmaps (0.9.9.0.1-11.3ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: diff -u ntlmaps-0.9.9.0.1/debian/compat ntlmaps-0.9.9.0.1/debian/compat --- ntlmaps-0.9.9.0.1/debian/compat +++ ntlmaps-0.9.9.0.1/debian/compat @@ -1 +1 @@ -7 +9 reverted: --- ntlmaps-0.9.9.0.1/debian/lintian-override +++ ntlmaps-0.9.9.0.1.orig/debian/lintian-override @@ -1,10 +0,0 @@ -# '[[' in config and postinst refers to grep syntax [[:blank:]], not bash. -## Disabling the override, however, since there is no mechanism here to -## allow for wild cards, but I do not want to override bashism checks for all -## scripts, and I don't want to list every single [[:blank:]] line from -## debian/config and debian/postinst -##ntlmaps binary: possible-bashism-in-maintainer-script config:* '[[' -##ntlmaps binary: possible-bashism-in-maintainer-script postinst:* '[[' - -# This file does not need to be executable. -#ntlmaps binary: script-not-executable ./usr/share/ntlmaps/__init__.py diff -u ntlmaps-0.9.9.0.1/debian/control ntlmaps-0.9.9.0.1/debian/control --- ntlmaps-0.9.9.0.1/debian/control +++ ntlmaps-0.9.9.0.1/debian/control @@ -3,9 +3,9 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: David Watson -Build-Depends-Indep: python, python-support (>= 0.3) -Build-Depends: debhelper (>= 7.0.50), po-debconf -Standards-Version: 3.8.3 +Build-Depends-Indep: python, dh-python +Build-Depends: debhelper (>= 9), po-debconf +Standards-Version: 3.9.6 Homepage: http://ntlmaps.sourceforge.net/ Package: ntlmaps only in patch2: unchanged: --- ntlmaps-0.9.9.0.1.orig/debian/po/ja.po +++ ntlmaps-0.9.9.0.1/debian/po/ja.po @@ -0,0 +1,161 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ntlmaps package. +# victory , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: ntlmaps\n" +"Report-Msgid-Bugs-To: david@planetwatson.co.uk\n" +"POT-Creation-Date: 2006-07-17 22:22+0100\n" +"PO-Revision-Date: 2013-07-20 23:32+0900\n" +"Last-Translator: victory \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Listen port:" +msgstr "待ち受けるポート:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"The NTLM Authorization Proxy Server listens to this port. This is the port " +"number you use in your http_proxy or web browser settings." +msgstr "" +"NTLM 認証プロキシサーバはこのポートを待ち受けます。これは http_proxy やウェブ" +"ブラウザの設定に利用しているポート番号です。" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Proxy servers are commonly set to listen to port 8080, but in NTLM APS the " +"default value is 5865." +msgstr "" +"プロキシサーバは一般的にポート 8080 を待ち受けるようになっていますが NTLM " +"APS では 5865 がデフォルト値となっています。" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Parent proxy:" +msgstr "親プロキシ:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"This is the address of the NTLM proxy server (e.g. the Microsoft ISA server) " +"which NTLM APS is authenticating against." +msgstr "" +"これは NTLM APS の認証先 NTLM プロキシサーバ (例えば Microsoft ISA サーバ) の" +"アドレスです。" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"The address may be given with or without the leading http://, for example:\n" +" proxy.myworkplace.com\n" +" http://proxy.myworkplace.com" +msgstr "" +"アドレスの指定には先頭の http:// の有無を問わず使えます。例えば:\n" +" proxy.myworkplace.com\n" +" http://proxy.myworkplace.com" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Parent proxy port:" +msgstr "親プロキシポート:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"This is the port number which the NTLM proxy server (e.g. the Microsoft ISA " +"server), that NTLM APS is authenticating against, listens to." +msgstr "" +"これは NTLM APS の認証先 NTLM プロキシサーバ (例えば Microsoft ISA サーバ) が" +"待ち受けるポート番号です。" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "It is commonly set to 8080." +msgstr "一般的に 8080 となっています。" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "NT Windows username:" +msgstr "NT Windows ユーザ名:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"This field identifies the NT Windows username that you use for " +"authentication." +msgstr "これは認証に使う NT Windows ユーザ名です。" + +#. Type: password +#. Description +#: ../templates:5001 +msgid "NT Windows password:" +msgstr "NT Windows パスワード:" + +#. Type: password +#. Description +#: ../templates:5001 +msgid "" +"This field identifies the NT Windows password that you use for " +"authentication." +msgstr "これは認証に使う NT Windows パスワードです。" + +#. Type: password +#. Description +#: ../templates:5001 +msgid "" +"To help with security, it is not stored permanently in the debconf database, " +"but is deleted from there after being written to the ntlmaps config file. " +"Be aware that it is temporarily stored in the debconf database while this " +"setup procedure is taking place. It is deleted from there at the end of " +"setup." +msgstr "" +"セキュリティの観点から、これは debconf データベースに恒久的には保存されず、" +"ntlmaps 設定ファイルに書かれた後に削除されます。これは設定している間 debconf " +"データベースに一時的に保存されることに留意してください。この準備の最後に削除" +"されます。" + +#. Type: password +#. Description +#: ../templates:5001 +msgid "" +"If you prefer not to have the password stored, even temporarily, in the " +"debconf database, then leave this entry blank, and insert the value manually " +"into the config file /etc/ntlmaps/server.cfg." +msgstr "" +"一時的と言えども debconf データベースにパスワードを保存したくない場合はここで" +"は空白にしておいて設定ファイル /etc/ntlmaps/server.cfg に手作業により記入して" +"ください。" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "NT Windows domain:" +msgstr "NT Windos ドメイン:" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"This field identifies the NT Windows domain that you authenticate against." +msgstr "これは 認証先の NT Windows ドメインです。" only in patch2: unchanged: --- ntlmaps-0.9.9.0.1.orig/debian/po/nl.po +++ ntlmaps-0.9.9.0.1/debian/po/nl.po @@ -0,0 +1,172 @@ +# Dutch translation of ntlmaps debconf templates. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ntlmaps package. +# Frans Spiesschaert , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: ntlmaps\n" +"Report-Msgid-Bugs-To: david@planetwatson.co.uk\n" +"POT-Creation-Date: 2006-07-17 22:22+0100\n" +"PO-Revision-Date: 2014-10-14 22:12+0200\n" +"Last-Translator: Frans Spiesschaert \n" +"Language-Team: Debian Dutch l10n Team \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Listen port:" +msgstr "Poort waarop geluisterd wordt:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"The NTLM Authorization Proxy Server listens to this port. This is the port " +"number you use in your http_proxy or web browser settings." +msgstr "" +"De NTLM autorisatie-proxy-server luistert op die poort. Dit is het " +"poortnummer dat u gebruikt in de instellingen voor http_proxy of voor uw " +"webbrowser." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Proxy servers are commonly set to listen to port 8080, but in NTLM APS the " +"default value is 5865." +msgstr "" +"Gewoonlijk luisteren proxy-servers op poort 8080, maar in NTLM APS is de " +"standaardwaarde 5865." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Parent proxy:" +msgstr "Bovenliggende proxy:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"This is the address of the NTLM proxy server (e.g. the Microsoft ISA server) " +"which NTLM APS is authenticating against." +msgstr "" +"Dit is het adres van de NTLM proxy-server (bijv. de Microsoft ISA-server) " +"tegenover wie NTLM APS zich authenticeert." + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"The address may be given with or without the leading http://, for example:\n" +" proxy.myworkplace.com\n" +" http://proxy.myworkplace.com" +msgstr "" +"Het adres mag ingegeven worden al of niet voorafgegaan door http://, bijv.:\n" +" proxy.mijnwerkplek.com\n" +" http://proxy.mijnwerkplek.com" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "Parent proxy port:" +msgstr "Poort van de bovenliggende proxy:" + +#. Type: string +#. Description +#: ../templates:3001 +msgid "" +"This is the port number which the NTLM proxy server (e.g. the Microsoft ISA " +"server), that NTLM APS is authenticating against, listens to." +msgstr "" +"Dit is de poort waarop geluisterd wordt door de NTLM proxy-server (bijv. de " +"Microsoft ISA-server), tegenover wie NTLM APS zich authenticeert." + +#. Type: string +#. Description +#: ../templates:3001 +msgid "It is commonly set to 8080." +msgstr "Gewoonlijk is die ingesteld op 8080." + +#. Type: string +#. Description +#: ../templates:4001 +msgid "NT Windows username:" +msgstr "Gebruikersnaam voor NT Windows:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"This field identifies the NT Windows username that you use for " +"authentication." +msgstr "" +"In dit veld geeft u de gebruikersnaam op die u gebruikt voor authenticatie " +"bij NT Windows." + +#. Type: password +#. Description +#: ../templates:5001 +msgid "NT Windows password:" +msgstr "Wachtwoord voor NT Windows:" + +#. Type: password +#. Description +#: ../templates:5001 +msgid "" +"This field identifies the NT Windows password that you use for " +"authentication." +msgstr "" +"Dit veld bevat het wachtwoord dat u gebruikt voor authenticatie bij NT " +"Windows." + +#. Type: password +#. Description +#: ../templates:5001 +msgid "" +"To help with security, it is not stored permanently in the debconf database, " +"but is deleted from there after being written to the ntlmaps config file. " +"Be aware that it is temporarily stored in the debconf database while this " +"setup procedure is taking place. It is deleted from there at the end of " +"setup." +msgstr "" +"Uit veiligheidsoverwegingen wordt dit niet permanent bijgehouden in het " +"gegevensbestand van debconf. Het wordt daaruit verwijderd, nadat het is " +"overgeschreven naar het configuratiebestand van ntlmaps. U moet dus weten " +"dat het tijdelijk opgeslagen wordt in het gegevensbestand van debconf " +"gedurende de tijd dat deze installatieprocedure aan de gang is. Het wordt op " +"het einde van de installatieprocedure daaruit verwijderd." + +#. Type: password +#. Description +#: ../templates:5001 +msgid "" +"If you prefer not to have the password stored, even temporarily, in the " +"debconf database, then leave this entry blank, and insert the value manually " +"into the config file /etc/ntlmaps/server.cfg." +msgstr "" +"Indien u liever heeft dat het wachtwoord niet, zelfs niet tijdelijk, " +"opgeslagen wordt in het gegevensbestand van debconf, dan moet u dit veld " +"leeg laten en de waarde ervoor handmatig invoeren in het " +"configuratiebestand /etc/ntlmaps/server.cfg." + +#. Type: string +#. Description +#: ../templates:6001 +msgid "NT Windows domain:" +msgstr "NT Windows-domein:" + +#. Type: string +#. Description +#: ../templates:6001 +msgid "" +"This field identifies the NT Windows domain that you authenticate against." +msgstr "" +"In dit veld komt de naam van het NT Windows-domein waartegen u zich " +"authenticeert." only in patch2: unchanged: --- ntlmaps-0.9.9.0.1.orig/ntlmaps.lintian-overrides +++ ntlmaps-0.9.9.0.1/ntlmaps.lintian-overrides @@ -0,0 +1,10 @@ +# '[[' in config and postinst refers to grep syntax [[:blank:]], not bash. +## Disabling the override, however, since there is no mechanism here to +## allow for wild cards, but I do not want to override bashism checks for all +## scripts, and I don't want to list every single [[:blank:]] line from +## debian/config and debian/postinst +##ntlmaps binary: possible-bashism-in-maintainer-script config:* '[[' +##ntlmaps binary: possible-bashism-in-maintainer-script postinst:* '[[' + +# This file does not need to be executable. +#ntlmaps binary: script-not-executable ./usr/share/ntlmaps/__init__.py