Revert "Add debconf to inform the user of the necessity of port forwarding."

This reverts commit 61fd574b4497f00fc69cc4523f5bf478fb3ca9c5.

Conflicts:

	debian/control

diff --git a/debian/apt-p2p.config b/debian/apt-p2p.config
deleted file mode 100644 (file)
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 (file)
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 09c68af6a0ed93e40432553b1048690efe7ea7fd..93c7412428ada6deb9072df586151c7dcf5e2f0b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Cameron Dale <camrdale@gmail.com>
 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 (file)
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 (file)
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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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 e167c41fc90bbe7b6473d83e6a94d64890f38366..24147f26f0839f87f74aa23642a9b5ec002c2033 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -5,8 +5,6 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>
@@ -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 dab7b0f6f6bd7674ce317b04ad1e6847dc41a671..a019ee3b074b27fb00fe0742fefe1aaf51230358 100755 (executable)
--- 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