From c1a1061a1655bcc97892fc0edfa9145b1679388a Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Fri, 9 May 2008 18:37:01 -0700 Subject: [PATCH] Revert "Add debconf to inform the user of the necessity of port forwarding." This reverts commit 61fd574b4497f00fc69cc4523f5bf478fb3ca9c5. Conflicts: debian/control --- debian/apt-p2p.config | 15 ------------ debian/apt-p2p.templates | 17 ------------- debian/control | 2 +- debian/po/POTFILES.in | 1 - debian/po/templates.pot | 52 ---------------------------------------- debian/postinst | 5 ---- debian/rules | 1 - 7 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 debian/apt-p2p.config delete mode 100644 debian/apt-p2p.templates delete mode 100644 debian/po/POTFILES.in delete mode 100644 debian/po/templates.pot diff --git a/debian/apt-p2p.config b/debian/apt-p2p.config deleted file mode 100644 index e6cf838..0000000 --- a/debian/apt-p2p.config +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e -#set -x - -# source debconf stuff -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi - -if [ "$1" = "configure" ] -then - db_input high apt-p2p/port_forward || true - db_go -fi diff --git a/debian/apt-p2p.templates b/debian/apt-p2p.templates deleted file mode 100644 index db492c9..0000000 --- a/debian/apt-p2p.templates +++ /dev/null @@ -1,17 +0,0 @@ -Template: apt-p2p/port_forward -Type: note -_Description: Port forwarding - It is VERY important that Apt-P2P's ports be reachable by other peers. - This is needed both to share files with others, and to connect to - others through the DHT to find peers for files. If you aren't - accessible by others, you will not only not share anything, but your - performance during downloading will be affected. - . - Apt-P2P uses a default port of 9977, over both TCP and UDP, for it's - communication. You can change this port in the - /etc/apt-p2p/apt-p2p.conf file, and use different ports for TCP and - UDP, if desired. Whatever port you use, make sure to forward it - through your NAT or firewall to improve your performance and share - with others. Information on port forwarding can be found here: - . - http://portforward.com/ \ No newline at end of file diff --git a/debian/control b/debian/control index 09c68af..93c7412 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Cameron Dale Homepage: http://www.camrdale.org/apt-p2p.html Standards-Version: 3.7.3 Build-Depends: debhelper (>= 5.0.37.2) -Build-Depends-Indep: python-dev, python-support (>= 0.5.4), po-debconf, docbook-to-man +Build-Depends-Indep: python-dev, python-support (>= 0.5.4), docbook-to-man Vcs-Git: git://git.camrdale.org/git/apt-p2p.git Vcs-Browser: http://git.camrdale.org/?p=apt-p2p.git;a=summary XS-Dm-Upload-Allowed: yes diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in deleted file mode 100644 index f6b2fa8..0000000 --- a/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] apt-p2p.templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot deleted file mode 100644 index 9a0e088..0000000 --- a/debian/po/templates.pot +++ /dev/null @@ -1,52 +0,0 @@ -# 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: apt-p2p@packages.debian.org\n" -"POT-Creation-Date: 2008-04-24 11:52-0700\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: note -#. Description -#: ../apt-p2p.templates:1001 -msgid "Port forwarding" -msgstr "" - -#. Type: note -#. Description -#: ../apt-p2p.templates:1001 -msgid "" -"It is VERY important that Apt-P2P's ports be reachable by other peers. This " -"is needed both to share files with others, and to connect to others through " -"the DHT to find peers for files. If you aren't accessible by others, you " -"will not only not share anything, but your performance during downloading " -"will be affected." -msgstr "" - -#. Type: note -#. Description -#: ../apt-p2p.templates:1001 -msgid "" -"Apt-P2P uses a default port of 9977, over both TCP and UDP, for it's " -"communication. You can change this port in the /etc/apt-p2p/apt-p2p.conf " -"file, and use different ports for TCP and UDP, if desired. Whatever port you " -"use, make sure to forward it through your NAT or firewall to improve your " -"performance and share with others. Information on port forwarding can be " -"found here:" -msgstr "" - -#. Type: note -#. Description -#: ../apt-p2p.templates:1001 -msgid "http://portforward.com/" -msgstr "" diff --git a/debian/postinst b/debian/postinst index e167c41..24147f2 100644 --- a/debian/postinst +++ b/debian/postinst @@ -5,8 +5,6 @@ set -e -. /usr/share/debconf/confmodule - # summary of how this script can be called: # * `configure' # * `abort-upgrade' @@ -49,9 +47,6 @@ case "$1" in ;; esac -# Tell debconf to stop so it doesn't get confused -db_stop - # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. diff --git a/debian/rules b/debian/rules index dab7b0f..a019ee3 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,6 @@ install: build-stamp binary-indep: install dh_testdir dh_testroot - dh_installdebconf dh_installdocs dh_installman -- 2.39.5