Updated to current Debian package (now accepted official in Debian/testing, yay\!)

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/tags/postfixadmin-2.3.5@1375 a1433add-5e2c-0410-b055-b7f2511e0802

debian/README.Debian

@@ -1,20 +1,13 @@
 PostfixAdmin for Debian
 =======================
-
 After installing the package, you should find that :
 
 http://youserver/postfixadmin/setup.php works. This should 
 guide you through the appropriate process.
 
-You will need to create a database (either MySQL or PostgreSQL) 
-and know the username and password for it. The Database does not need
-to be on the same server as the Postfixadmin install.
-
-
 
 Recommended and Suggested Packages
 ==================================
-
  - Postfix
  - MySQL or PostgreSQL
  - Courier or Dovecot
@@ -22,25 +15,8 @@ Recommended and Suggested Packages
 
 Where to get help
 =================
-
 The first stop would be the Postfixadmin Website, Forum or IRC channel. 
 
 See :
  - http://postfixadmin.sf.net
  - #postfixadmin on irc.freenode.net
-
-
-How to build this package for Debian/lenny
-==========================================
-
-If you want to build this package for Debian/lenny, you have to execute
-
-	DIST="lenny" dpkg-buildpackage -rfakeroot
-
-This will include the confd-link.sh script into the package. That script
-is included in wwwconfig-common >0.2, but we have an older version in
-lenny at the moment.
-
-We (upstream and myself) want to provide also an lenny ready package,
-which will be available via sf.net. Just as an easy way for interested
-people which are running lenny.

debian/TODO

@@ -1,4 +1,3 @@
- * Do all necessary things automatically (maybe with dbconfig?) (database, setp password...)
  * DebTags
  * dbconfig: DOCUMENTS/SECURITY.txt
  * include postfix configuration templates

debian/changelog

@@ -1,7 +1,14 @@
+postfixadmin (2.3.5-2) unstable; urgency=low
+
+  * Added .po translation files (Closes: 667951, #667962, #668202, #668288)
+  * Closes: #668298, #668301, #668405, #668635
+  * Updated standards version to 3.9.3 without changes.
+
+ -- Norman Messtorff <normes@normes.org>  Thu, 26 Apr 2012 20:55:57 +0200
+
 postfixadmin (2.3.5-1) unstable; urgency=low
 
   * Initial Debian release (Closes: #247225)
-  * Changed email address from normes to myself for signing purposes.
 
- -- David Goodwin (PalePurple) <david@palepurple.co.uk>  Wed, 25 Jan 2012 12:27:28 +0100
+ -- Norman Messtorff <normes@normes.org>  Sun, 15 Jan 2012 12:27:28 +0100
 

debian/control

@@ -2,22 +2,26 @@ Source: postfixadmin
 Section: admin
 Priority: optional
 Maintainer: Norman Messtorff <normes@normes.org>
-Build-Depends: debhelper (>= 7), po-debconf, quilt (>= 0.46)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7), po-debconf
+Standards-Version: 3.9.3
+XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
+XS-Vcs-Browser: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
 Homepage: http://postfixadmin.sourceforge.net
 
 Package: postfixadmin
 Architecture: all
 Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php5 | php5-cgi | php5, php5-imap, php5-mysql | php5-pgsql, mysql-client | postgresql-client, ${misc:Depends}
-Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server | postgresql
-Suggests: squirrelmail-postfixadmin, dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
+Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server
+Suggests: dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
 Description: Virtual mail hosting interface for Postfix
- Postfixadmin is a web interface to managing virtual users and domains
- for a Postfix mail transport agent. The web interface is written in PHP.
- It supports Virtual mailboxes, aliases, forwarders and vacation.
+ Postfixadmin is a web interface to manage virtual users and domains
+ for a Postfix mail transport agent. It supports Virtual mailboxes, 
+ aliases, forwarders and vacation.
  .
- Allows administrators to delegate the handling of domains to the
- domain administrators. Allows users to login and change their own
+ Postfixadmin allows administrators to delegate account handling 
+ to domain administrators and allows users to login and change their own
  settings (e.g. forwarders, vacation, passwords etc).
  .
- Provides easy integration into dovecot, courier or cyrus.
+ It provides easy integration into dovecot, courier or cyrus.
+ .
+ Postfixadmin is written in PHP.

debian/po/cs.po

@@ -0,0 +1,32 @@
+# Czech PO debconf template translation of postfixadmin.
+# Copyright (C) 2012 Michal Simunek <michal.simunek@gmail.com>
+# This file is distributed under the same license as the postfixadmin package.
+# Michal Simunek <michal.simunek@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-13 18:31+0200\n"
+"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Automaticky přenastavit webový server:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Zvolte si prosím webový server, který se má automaticky nastavit ke "
+"spuštění postfixadmin."

debian/po/da.po

@@ -0,0 +1,34 @@
+# Danish translation postfixadmin.
+# Copyright (C) 2012 postfixadmin & nedenstående oversættere.
+# This file is distributed under the same license as the postfixadmin package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-11 19:21+0100\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: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Internetserver at rekonfigurere automatisk:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Vælg venligst internetserveren som automatisk skal konfigureres til at "
+"køre postfixadmin."
+

debian/po/de.po

@@ -0,0 +1,32 @@
+# German translation of debconf templates for postfixadmin.
+# Copyright (C) 2012 Holger Wansing
+# This file is distributed under the same license as the postfixadmin package.
+# Holger Wansing <linux@wansing-online.de>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-10 21:19+0200\n"
+"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Webserver, der automatisch neu konfiguriert werden soll:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Bitte wählen Sie den Webserver, der automatisch konfiguriert werden soll, um "
+"Postfixadmin auszuführen."

debian/po/es.po

@@ -0,0 +1,53 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Changes:
+#   - Initial translation
+#       Matías Bellone <matiasbellone+debian@gmail.com>, 2012
+#
+# 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 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: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-15 04:27:00+00:00\n"
+"Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Servidor web a reconfigurar automáticamente:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Seleccione el servidor web que deberá ser configurado automáticamente "
+"para ejecutar «postfixadmin»."

debian/po/fr.po

@@ -0,0 +1,35 @@
+# Translation of postfixadmin debconf template to French.
+# Copyright (C) 2012 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the postfixadmin package.
+# Translators:
+# Christian Perrier <bubulle@debian.org>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-07 19:46+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Serveur web à reconfigurer automatiquement :"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Veuillez choisir le serveur web qui doit être configuré automatiquement pour "
+"exécuter postfixadmin."

debian/po/it.po

@@ -0,0 +1,34 @@
+# Italian translation of postfixadmin debconf messages.
+# Copyright (C) 2012 postfixadmin package copyright holder
+# This file is distributed under the same license as the postfixadmin package.
+# Beatrice Torracca <beatricet@libero.it>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-07 16:15+0200\n"
+"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\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"
+"X-Generator: Virtaal 0.7.1\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Server web da riconfigurare automaticamente:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Scegliere il server web che deve essere configurato automaticamente per "
+"eseguire postfixadmin."

debian/po/nl.po

@@ -0,0 +1,32 @@
+# Dutch translation of postfixadmin debconf templates.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the postfixadmin package.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-12 15:26+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: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Automatisch te configureren webserver:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Welke webserver moet automatisch worden geconfigureerd voor postfixadmin?"

debian/po/pl.po

@@ -0,0 +1,37 @@
+# Translation of ostfixadmi debconf templates to Polish.
+# Copyright (C) 2008
+# This file is distributed under the same license as the ostfixadmi package.
+#
+# Michał Kułach <michal.kulach@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-07 18:47+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"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Serwer WWW do automatycznej konfiguracji:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Proszę wybrać serwer WWW, który powinien być automatycznie skonfigurowany w "
+"celu uruchomienia postfixadmin."
+

debian/po/pt.po

@@ -0,0 +1,32 @@
+# Portuguese translation for postfixadmin (debconf)
+# This file is distributed under the same license as the postfixadmin package.
+# Rui Branco <ruipb@debianpt.org>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-09 21:26+0100\n"
+"Last-Translator: Rui Branco <ruipb@debianpt.org>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\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: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Servidor Web a reconfigurar automaticamente:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Por favor escolha o servidor web a ser reconfigurado para correr o "
+"postfixadmin."

debian/po/ru.po

@@ -0,0 +1,36 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the postfixadmin package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.3.5-1\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-09 20:40+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"X-Generator: Lokalize 1.2\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: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Веб-сервер для автоматической перенастройки:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Выберите веб-сервер, который нужно автоматически настроить для запуска "
+"dpostfixadmin."
+

debian/po/sv.po

@@ -0,0 +1,33 @@
+# Translation of postfixadmin debconf template to Swedish
+# Copyright (C) 2012 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the postfixadmin package.
+# 
+# Martin Bagge <brother@bsnet.se>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-10 18:40+0100\n"
+"Last-Translator: Martin Bagge / brother <brother@bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\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: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "Webbservrar som ska ställas in automatiskt:"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr ""
+"Välj webbservrar som automatiskt ska ställas in för att köra postfixadmin."

debian/po/zh_TW.po

@@ -0,0 +1,31 @@
+# Chinese translations for PACKAGE package.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#  Vincent Chen <vinmun@gmail.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: 2012-04-09 18:25-0700\n"
+"Last-Translator: Vincent Chen <vinmun@gmail.com>\n"
+"Language-Team: Chinese (traditional)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid "Web server to reconfigure automatically:"
+msgstr "網頁伺服器將自動重新設定："
+
+#. Type: multiselect
+#. Description
+#: ../templates:1001
+msgid ""
+"Please choose the web server that should be automatically configured to run "
+"postfixadmin."
+msgstr "請選擇要自動執行 postfixadmin 的網頁伺服器"

debian/rules

@@ -4,33 +4,25 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export PFADIR 		= $(shell pwd)
 export VERSION 		= $(shell grep -E "version = '.*';" functions.inc.php |sed -e "s/.version = '//" |sed -e "s/';.*//" |sed -e "s/ /-/g")
 export DEBVERSION	= $(shell grep -E "postfixadmin .([0-9]+|\.)+" debian/changelog |head -1 |sed -e "s/postfixadmin .//" |sed -e "s/-.*//")
 
-include /usr/share/quilt/quilt.make
 
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh_testdir
-	#dh_testroot
 	touch build-stamp
 
 # Create a needed tar.gz file to build a non-nativ .dpkg
 prep:
 	rm -f ../postfixadmin_*orig.tar.gz
-	cd ..; tar --exclude-vcs --exclude=*.svn* --exclude=postfixadmin/debian  --exclude=postfixadmin/.pc -czf postfixadmin_${DEBVERSION}.orig.tar.gz postfixadmin-${DEBVERSION}
+	cd ..; tar --exclude-vcs --exclude=$(notdir ${CURDIR})/debian  --exclude=$(notdir ${CURDIR})/.pc -cvzf postfixadmin_${DEBVERSION}.orig.tar.gz $(notdir ${CURDIR})
 
-# Call this target to build a shiny new .dpkg file.
-build-package: 
+clean:
 	dh_testdir
-	cd ${PFADIR}; dpkg-buildpackage -rfakeroot
-
-clean: unpatch
-	dh_testdir
-	#dh_testroot
+	dh_testroot
 	dh_clean
 	debconf-updatepo
 
@@ -42,7 +34,6 @@ install: build
 	dh_install
 	mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
 	find debian/postfixadmin -name .svn | xargs -r rm -r
-	cp debian/confd-link.sh debian/postfixadmin/usr/share/postfixadmin/
 
 # Build architecture-independent files here.
 binary-indep: build install

debian/watch

@@ -1,2 +1,2 @@
 version=3
-http://sf.net/postfixadmin/postfixadmin_(.+)\.tar\.gz
+http://sf.net/postfixadmin/postfixadmin-([\d\.]+)\.tar\.gz