Thread: SF.net SVN: postfixadmin:[592] trunk/debian
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn
|
From: <Gin...@us...> - 2009-03-19 20:02:37
|
Revision: 592
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=592&view=rev
Author: GingerDog
Date: 2009-03-19 20:02:19 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
update debian configuration
Modified Paths:
--------------
trunk/debian/apache-conf
trunk/debian/changelog
trunk/debian/control
trunk/debian/rules
Modified: trunk/debian/apache-conf
===================================================================
--- trunk/debian/apache-conf 2009-03-19 19:53:05 UTC (rev 591)
+++ trunk/debian/apache-conf 2009-03-19 20:02:19 UTC (rev 592)
@@ -2,5 +2,4 @@
Alias /postfixadmin /usr/share/postfixadmin
-
# END FOR POSTFIXADMIN
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-03-19 19:53:05 UTC (rev 591)
+++ trunk/debian/changelog 2009-03-19 20:02:19 UTC (rev 592)
@@ -1,3 +1,11 @@
+postfixadmin (2.3rc2) unstable; urgency=low
+
+ * Subversion revision 587
+ * Add model directory to .deb etc.
+ * Updated ChangeLog
+
+ -- David Goodwin <dav...@pa...> Thu, 19 Mar 2009 19:50:00 +0000
+
postfixadmin (2.3rc1) unstable; urgency=low
* Subversion revision 587
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-03-19 19:53:05 UTC (rev 591)
+++ trunk/debian/control 2009-03-19 20:02:19 UTC (rev 592)
@@ -9,8 +9,8 @@
Package: postfixadmin
Architecture: all
-Depends: apache2 | httpd, libapache2-mod-php4 | libapache-mod-php4 | php4 | php4-cgi | libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5, ${misc:Depends}
-Recommends: squirrelmail-locales, ispell | aspell | aspell-bin, perl, postfix, postgresql-server, mysql-server
+Depends: apache2 | httpd, libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5, ${misc:Depends}
+Recommends: perl, postfix, postgresql-server, mysql-server, squirrelmail, squirrelmail-postfixadmin, php5-zendframework, courier-imap, dovecot-imapd
Suggests:
Description: Virtual mail hosting interface for Postfix
Postfixadmin is a web interface to managing virtual users and domains
@@ -21,7 +21,7 @@
vacation, password etc).
Postfixadmin also includes support for virtual vacation support -
this requires Perl and various CPAN modules to be installed.
- See vacation.pl for further details.
+ See included vacation.pl for further details.
.
Homepage: http://postfixadmin.sf.net/
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-03-19 19:53:05 UTC (rev 591)
+++ trunk/debian/rules 2009-03-19 20:02:19 UTC (rev 592)
@@ -26,6 +26,7 @@
mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
ln -s /etc/postfixadmin/config.inc.php debian/postfixadmin/usr/share/postfixadmin/config.inc.php
perl -p -i -e "s#$$CONF\['postfix_admin_path'\] = dirname\(__FILE__\)#$$CONF\['postfix_admin_path'\] = '/usr/share/postfixadmin'#" debian/postfixadmin/etc/postfixadmin/config.inc.php
+ cp -a model debian/postfixadmin/usr/share/postfixadmin
cp -a admin debian/postfixadmin/usr/share/postfixadmin
cp -a images debian/postfixadmin/usr/share/postfixadmin
cp -a languages debian/postfixadmin/usr/share/postfixadmin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2009-03-21 16:33:01
|
Revision: 598
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=598&view=rev
Author: GingerDog
Date: 2009-03-21 16:32:50 +0000 (Sat, 21 Mar 2009)
Log Message:
-----------
debian/control: fix some debian-isms after review from me...@so...
Modified Paths:
--------------
trunk/debian/compat
trunk/debian/control
trunk/debian/files
trunk/debian/postfixadmin.dirs
trunk/debian/rules
Removed Paths:
-------------
trunk/debian/conffiles
Modified: trunk/debian/compat
===================================================================
--- trunk/debian/compat 2009-03-20 21:25:07 UTC (rev 597)
+++ trunk/debian/compat 2009-03-21 16:32:50 UTC (rev 598)
@@ -1 +1 @@
-5
+7
Deleted: trunk/debian/conffiles
===================================================================
--- trunk/debian/conffiles 2009-03-20 21:25:07 UTC (rev 597)
+++ trunk/debian/conffiles 2009-03-21 16:32:50 UTC (rev 598)
@@ -1,2 +0,0 @@
-/etc/apache2/conf.d/postfixadmin
-/etc/postfixadmin/config.inc.php
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-03-20 21:25:07 UTC (rev 597)
+++ trunk/debian/control 2009-03-21 16:32:50 UTC (rev 598)
@@ -1,17 +1,18 @@
Source: postfixadmin
-Section: web
+Section: admin
Priority: optional
Maintainer: David Goodwin <dav...@pa...>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.1
+Homepage: http://postfixadmin.sourceforge.net
XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
XS-Vcs-Browse: http://postfixadmin.svn.sourceforge.net/viewvc/postfixadmin/trunk/
Package: postfixadmin
Architecture: all
Depends: apache2 | httpd, libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5, ${misc:Depends}
-Recommends: perl, postfix, postgresql-server, mysql-server, squirrelmail, squirrelmail-postfixadmin, php5-zendframework, courier-imap, dovecot-imapd
-Suggests:
+Recommends:
+Suggests: postfix, postgresql-server, mysql-server, squirrelmail, squirrelmail-postfixadmin, courier-imap, dovecot-imapd
Description: Virtual mail hosting interface for Postfix
Postfixadmin is a web interface to managing virtual users and domains
for a Postfix mailserver. The web interface is written in PHP.
Modified: trunk/debian/files
===================================================================
--- trunk/debian/files 2009-03-20 21:25:07 UTC (rev 597)
+++ trunk/debian/files 2009-03-21 16:32:50 UTC (rev 598)
@@ -1 +1 @@
-postfixadmin_2.2.0-1rc3_all.deb web optional
+postfixadmin_2.3rc3_all.deb admin optional
Modified: trunk/debian/postfixadmin.dirs
===================================================================
--- trunk/debian/postfixadmin.dirs 2009-03-20 21:25:07 UTC (rev 597)
+++ trunk/debian/postfixadmin.dirs 2009-03-21 16:32:50 UTC (rev 598)
@@ -1,3 +1,5 @@
usr/share/postfixadmin
+usr/share/postfixadmin/css
usr/share/doc/postfixadmin
etc/postfixadmin
+etc/apache2/conf.d
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-03-20 21:25:07 UTC (rev 597)
+++ trunk/debian/rules 2009-03-21 16:32:50 UTC (rev 598)
@@ -18,7 +18,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
dh_install
cp motd* debian/postfixadmin/usr/share/postfixadmin
@@ -32,9 +32,7 @@
cp -a languages debian/postfixadmin/usr/share/postfixadmin
cp -a templates debian/postfixadmin/usr/share/postfixadmin
cp -a users debian/postfixadmin/usr/share/postfixadmin
- mkdir -p debian/postfixadmin/usr/share/postfixadmin/css
cp css/default.css debian/postfixadmin/usr/share/postfixadmin/css
- mkdir -p debian/postfixadmin/etc/apache2/conf.d
cp debian/apache-conf debian/postfixadmin/etc/apache2/conf.d/postfixadmin
find debian/postfixadmin -name .svn | xargs -r rm -r
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2009-05-09 22:12:00
|
Revision: 653
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=653&view=rev
Author: normes
Date: 2009-05-09 22:11:32 +0000 (Sat, 09 May 2009)
Log Message:
-----------
Migrated my .deb changes into SVN. Feedback welcome...
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/control
trunk/debian/copyright
trunk/debian/rules
Added Paths:
-----------
trunk/debian/TODO
trunk/debian/apache.conf
trunk/debian/lighttpd.conf
trunk/debian/patches/
trunk/debian/patches/01-20090509_database-credentials
trunk/debian/patches/series
trunk/debian/po/
trunk/debian/po/POTFILES.in
trunk/debian/po/templates.pot
trunk/debian/postfixadmin.config
trunk/debian/postfixadmin.docs
trunk/debian/postfixadmin.examples
trunk/debian/postfixadmin.install
trunk/debian/postfixadmin.links
trunk/debian/postfixadmin.postinst
trunk/debian/postfixadmin.postrm
trunk/debian/postfixadmin.prerm
trunk/debian/templates
trunk/debian/watch
Removed Paths:
-------------
trunk/debian/apache-conf
trunk/debian/docs
Added: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO (rev 0)
+++ trunk/debian/TODO 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,4 @@
+ * Do all necessary things automatically (maybe with dbconfig?) (database, setp password...)
+ * DebTags
+ * dbconfig: DOCUMENTS/SECURITY.txt
+ * include postfix configuration templates
Deleted: trunk/debian/apache-conf
===================================================================
--- trunk/debian/apache-conf 2009-05-07 23:23:21 UTC (rev 652)
+++ trunk/debian/apache-conf 2009-05-09 22:11:32 UTC (rev 653)
@@ -1,5 +0,0 @@
-# BEGIN FOR POSTFIXADMIN
-
-Alias /postfixadmin /usr/share/postfixadmin
-
-# END FOR POSTFIXADMIN
Copied: trunk/debian/apache.conf (from rev 647, trunk/debian/apache-conf)
===================================================================
--- trunk/debian/apache.conf (rev 0)
+++ trunk/debian/apache.conf 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,5 @@
+# BEGIN FOR POSTFIXADMIN
+
+Alias /postfixadmin /usr/share/postfixadmin
+
+# END FOR POSTFIXADMIN
Property changes on: trunk/debian/apache.conf
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-05-07 23:23:21 UTC (rev 652)
+++ trunk/debian/changelog 2009-05-09 22:11:32 UTC (rev 653)
@@ -1,121 +1,6 @@
-postfixadmin (2.3rc4) unstable; urgency=low
+postfixadmin (2.3rc5) unstable; urgency=low
- * Security fix for setup.php (issue occurs for those upgrading only; where
- it's possible for a new admin user to get created by nasty.person)
- * SVN revision 632
+ * Initial release (Closes: #247225)
- -- David Goodwin <dav...@pa...> Sat, 18 Apr 2009 21:00:00 +0000
+ -- Norman Messtorff <no...@no...> Sat, 09 May 2009 22:36:26 +0200
-postfixadmin (2.3rc3) unstable; urgency=low
-
- * Attempt at fixing Debian build issues (thanks to me...@so...)
- * SVN revision 611
-
- -- David Goodwin <dav...@pa...> Mon, 6 Apr 2009 20:56:00 +0000
-
-postfixadmin (2.3rc2) unstable; urgency=low
-
- * Subversion revision 593
- * Add model directory to .deb etc.
- * Updated ChangeLog
-
- -- David Goodwin <dav...@pa...> Thu, 19 Mar 2009 19:50:00 +0000
-
-postfixadmin (2.3rc1) unstable; urgency=low
-
- * Subversion revision 587
- * New XmlRpc API for integration with 3rd party web mail clients.
- * Various bug fixes
- * Translation patches
- * Addition of dovecotpw support
-
- -- David Goodwin <dav...@pa...> Wed, 18 Mar 2009 19:52:00 +0000
-
-postfixadmin (2.3beta) unstable; urgency=low
-
- * Subversion revision 533
- * Fixes for MySQL upgrade issues
- * Improved vacation.pl (renotification options, use SMTP headers, better
- logging, optional external config file)
- * Improved fetchmail.pl
- * Domain aliases - new implementation should reduce backscatter etc.
- * translation updates
- * Added domain-postcreation script support
- * Enhanced mailbox table to make it easier for people to customise where mailboxes live
- * and much more
-
- -- David Goodwin <dav...@pa...> Sat, 17 Jan 2009 20:06:00 +0000
-
-postfixadmin (2.2.1.1) unstable; urgency=low
-
- * Subversion revision 412 (from branches/postfixadmin-2.2.1)
- * THIS IS EFFECTIVELY THE SAME AS 2.2.1 (which should probably be ignored)
-
- -- David Goodwin <dav...@pa...> Wed, 23 Jul 2008 12:37:00 +0000
-
-postfixadmin (2.2.1) unstable; urgency=low
-
- * Various bug fixes (MySQL charset issue(s))
- * Updated translations (pl, bg, ru, nb, tw etc)
- * added quota parameter to mailbox_postcreation hook
- * new hook to update the quota after editing a mailbox
- ($CONF['mailbox_postedit_script'])
- * fixed subfolder creation order and timing
- * allow smtp server to be specified in vacation.pl
- * fixed MySQL charset issues
- * several small bugfixes
- * Norwegian (bokmal) translation added
- * Updated translations (pl, bg, ru, nb, tw etc)
- * Subversion revision 408
-
- -- David Goodwin <dav...@pa...> Mon, 21 Jul 2008 22:44:00 +0000
-postfixadmin (2.2.0) unstable; urgency=low
-
- * 2.2.0 Released.
- * Fix fetchmail script to work with PostgreSQL
- * Fix fetchmail table creation in MySQL and PostgreSQL
- * Documentation fixups
- * Subversion revision 356
-
- -- David Goodwin <dav...@pa...> Thu, 29 Apr 2008 15:47:00 +0000
-
-postfixadmin (2.2.0-rc5) unstable; urgency=low
-
- * Fix MySQL installation issues (schema not being created!)
- * Fix MySQL vacation_notification timestamp issue
- * SVN revision: 340
-
- -- David Goodwin <dav...@pa...> Wed, 23 Apr 2008 16:27:00 +0000
-
-postfixadmin (2.2.0-1rc4) unstable; urgency=low
-
- * Removal of standalone database schema files (see upgrade.php)
- * Various bug fixes
- * Better/Move documentation on installation
- * setup.php/upgrade.php works for PostgreSQL and MySQL
- * MySQL Unicode problems fixed
- * I think this is effectively v2.2.0
- * SVN revision: 336
-
- -- David Goodwin <dav...@pa...> Sun, 20 Apr 2008 20:19:00 +0000
-
-postfixadmin (2.2.0-1rc3) unstable; urgency=low
-
- * Various bug fixes
-
- -- David Goodwin <dav...@pa...> Thu, 28 Feb 2008 12:00:00 +0000
-
-postfixadmin (2.2.0-1rc2) unstable; urgency=low
-
- * Improved CSS
- * Improved upgrade procedure (should work for PGSQL) (see upgrade.php)
- * Various bug fixes
-
- -- David Goodwin <dav...@pa...> Sat, 29 Dec 2007 21:14:00 +0000
-
-postfixadmin (2.2.0-1rc1) unstable; urgency=low
-
- * Initial Release (via dpkg)
-
- -- David Goodwin <dav...@pa...> Sun, 04 Nov 2007 15:36:00 +0000
-
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-05-07 23:23:21 UTC (rev 652)
+++ trunk/debian/control 2009-05-09 22:11:32 UTC (rev 653)
@@ -1,8 +1,8 @@
Source: postfixadmin
Section: admin
Priority: optional
-Maintainer: David Goodwin <dav...@pa...>
-Build-Depends: debhelper (>= 7)
+Maintainer: Norman Messtorff <no...@no...>
+Build-Depends: debhelper (>= 7), po-debconf, quilt (>= 0.46)
Standards-Version: 3.8.1
Homepage: http://postfixadmin.sourceforge.net
XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
@@ -10,19 +10,16 @@
Package: postfixadmin
Architecture: all
-Depends: apache2 | httpd, libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5, ${misc:Depends}
-Recommends:
-Suggests: postfix, postgresql-server, mysql-server, squirrelmail, squirrelmail-postfixadmin, courier-imap, dovecot-imapd
+Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common (>= 0.2.0), apache2 | lighttpd, 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
+Suggests: squirrelmail-postfixadmin, 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 mailserver. The web interface is written in PHP.
- Postfixadmin allows administrators to delegate handling a domain to domain
- administrators.
- Postfixadmin allows users to login and change their own settings (e.g. forward,
- vacation, password etc).
- Postfixadmin also includes support for virtual vacation support -
- this requires Perl and various CPAN modules to be installed.
- See included vacation.pl for further details.
- .
- Homepage: http://postfixadmin.sf.net/
-
+ for a Postfix mail transport agent. The web interface is written in PHP.
+ 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
+ settings (e.g. forwarders, vacation, passwords etc).
+ .
+ Provides easy integration into dovecot, courier or cyrus.
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2009-05-07 23:23:21 UTC (rev 652)
+++ trunk/debian/copyright 2009-05-09 22:11:32 UTC (rev 653)
@@ -3,28 +3,33 @@
It was downloaded from subversion, via http://postfixadmin.sf.net
-Upstream Authors: The PostfixAdmin Development Team <pos...@li...>
+Upstream Authors:
+ The PostfixAdmin Development Team <pos...@li...>
+
Copyright:
Copyright (C) 2007 The Postfixadmin Project Team
- This program is free software; you can redistribute it and/or modify
+License:
+
+ This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
+ along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in the `/usr/share/common-licenses' directory.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'
+
The Debian packaging of Postfixadmin is licensed under the same terms
as Postfixadmin itself.
Deleted: trunk/debian/docs
===================================================================
--- trunk/debian/docs 2009-05-07 23:23:21 UTC (rev 652)
+++ trunk/debian/docs 2009-05-09 22:11:32 UTC (rev 653)
@@ -1,6 +0,0 @@
-VIRTUAL_VACATION
-DOCUMENTS
-ADDITIONS
-LICENSE.TXT
-INSTALL.TXT
-GPL-LICENSE.TXT
Added: trunk/debian/lighttpd.conf
===================================================================
--- trunk/debian/lighttpd.conf (rev 0)
+++ trunk/debian/lighttpd.conf 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,4 @@
+# Alias for Postfixadmin
+alias.url += (
+ "/postfixadmin" => "/usr/share/postfixadmin",
+)
Added: trunk/debian/patches/01-20090509_database-credentials
===================================================================
--- trunk/debian/patches/01-20090509_database-credentials (rev 0)
+++ trunk/debian/patches/01-20090509_database-credentials 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,21 @@
+Index: config.inc.php
+===================================================================
+--- config.inc.php.orig 2009-05-09 21:24:04.000000000 +0200
++++ config.inc.php 2009-05-09 21:26:40.000000000 +0200
+@@ -52,11 +52,11 @@ $CONF['default_language'] = 'en';
+ // mysql = MySQL 3.23 and 4.0, 4.1 or 5
+ // mysqli = MySQL 4.1+
+ // pgsql = PostgreSQL
+-$CONF['database_type'] = 'mysql';
+-$CONF['database_host'] = 'localhost';
+-$CONF['database_user'] = 'postfix';
+-$CONF['database_password'] = 'postfixadmin';
+-$CONF['database_name'] = 'postfix';
++$CONF['database_type'] = '_DBC_DBTYPE_';
++$CONF['database_host'] = '_DBC_DBSERVER_';
++$CONF['database_user'] = '_DBC_DBUSER_';
++$CONF['database_password'] = '_DBC_DBPASS_';
++$CONF['database_name'] = '_DBC_DBNAME_';
+ $CONF['database_prefix'] = '';
+
+ // Here, if you need, you can customize table names.
Added: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series (rev 0)
+++ trunk/debian/patches/series 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1 @@
+01-20090509_database-credentials -p0
Added: trunk/debian/po/POTFILES.in
===================================================================
--- trunk/debian/po/POTFILES.in (rev 0)
+++ trunk/debian/po/POTFILES.in 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
Added: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot (rev 0)
+++ trunk/debian/po/templates.pot 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,31 @@
+# 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: pos...@pa...\n"
+"POT-Creation-Date: 2008-10-27 22:14+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\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 ""
Added: trunk/debian/postfixadmin.config
===================================================================
--- trunk/debian/postfixadmin.config (rev 0)
+++ trunk/debian/postfixadmin.config 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+db_input high postfixadmin/reconfigure-webserver || true
+db_go || true
+
+if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
+ # we support mysql and pgsql
+ dbc_dbtypes="mysql, pgsql"
+
+ . /usr/share/dbconfig-common/dpkg/config
+ dbc_go postfixadmin $@
+fi
Copied: trunk/debian/postfixadmin.docs (from rev 647, trunk/debian/docs)
===================================================================
--- trunk/debian/postfixadmin.docs (rev 0)
+++ trunk/debian/postfixadmin.docs 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,5 @@
+DOCUMENTS
+CHANGELOG.TXT
+GPL-LICENSE.TXT
+INSTALL.TXT
+LICENSE.TXT
Property changes on: trunk/debian/postfixadmin.docs
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mergeinfo
+
Added: trunk/debian/postfixadmin.examples
===================================================================
--- trunk/debian/postfixadmin.examples (rev 0)
+++ trunk/debian/postfixadmin.examples 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,2 @@
+ADDITIONS
+VIRTUAL_VACATION
Added: trunk/debian/postfixadmin.install
===================================================================
--- trunk/debian/postfixadmin.install (rev 0)
+++ trunk/debian/postfixadmin.install 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,12 @@
+*.php usr/share/postfixadmin
+admin usr/share/postfixadmin
+css usr/share/postfixadmin
+images usr/share/postfixadmin
+languages usr/share/postfixadmin
+model usr/share/postfixadmin
+motd.txt usr/share/postfixadmin
+motd-users.txt usr/share/postfixadmin
+templates usr/share/postfixadmin
+users usr/share/postfixadmin
+debian/apache.conf etc/postfixadmin
+debian/lighttpd.conf etc/postfixadmin
Added: trunk/debian/postfixadmin.links
===================================================================
--- trunk/debian/postfixadmin.links (rev 0)
+++ trunk/debian/postfixadmin.links 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1 @@
+etc/postfixadmin/config.inc.php usr/share/postfixadmin/config.inc.php
Added: trunk/debian/postfixadmin.postinst
===================================================================
--- trunk/debian/postfixadmin.postinst (rev 0)
+++ trunk/debian/postfixadmin.postinst 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+if [ "$1" = "configure" ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ dbc_generate_include='template:/etc/postfixadmin/config.inc.php'
+ dbc_generate_include_owner='root:www-data'
+ dbc_generate_include_perms='640'
+ dbc_generate_include_args="-U -o template_infile=/usr/share/postfixadmin/config.inc.php"
+ . /usr/share/dbconfig-common/dpkg/postinst
+ dbc_go postfixadmin $@
+ db_get postfixadmin/reconfigure-webserver
+ servers="$RET"
+ restart="$servers"
+ linkdestination_apache="../../postfixadmin/apache.conf"
+ linkdestination_lighttpd="../../postfixadmin/lighttpd.conf"
+ linkname="postfixadmin"
+ . /usr/share/wwwconfig-common/confd-link.sh
+ . /usr/share/wwwconfig-common/restart.sh
+fi
+
+#DEBHELPER#
+
+exit 0
Added: trunk/debian/postfixadmin.postrm
===================================================================
--- trunk/debian/postfixadmin.postrm (rev 0)
+++ trunk/debian/postfixadmin.postrm 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+ if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+
+ # restart the webserver only if we know which one was configured.
+ if db_get postfixadmin/reconfigure-webserver; then
+ servers="$RET"
+ restart=$servers
+ linkname="postfixadmin"
+ . /usr/share/wwwconfig-common/restart.sh
+ fi
+
+ if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+ . /usr/share/dbconfig-common/dpkg/postrm
+ dbc_go postfixadmin $@
+ fi
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
Added: trunk/debian/postfixadmin.prerm
===================================================================
--- trunk/debian/postfixadmin.prerm (rev 0)
+++ trunk/debian/postfixadmin.prerm 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ -f /usr/share/dbconfig-common/dpkg/prerm ]; then
+ . /usr/share/dbconfig-common/dpkg/prerm
+ dbc_go postfixadmin $@
+fi
+
+if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
+ db_get postfixadmin/reconfigure-webserver
+ servers="$RET"
+ linkname="postfixadmin"
+ . /usr/share/wwwconfig-common/confd-link.sh
+fi
+
+#DEBHELPER#
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-05-07 23:23:21 UTC (rev 652)
+++ trunk/debian/rules 2009-05-09 22:11:32 UTC (rev 653)
@@ -4,16 +4,21 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
build: build-stamp
-build-stamp:
+
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
+ #dh_testroot
touch build-stamp
-clean:
+
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
dh_clean
+ debconf-updatepo
install: build
dh_testdir
@@ -21,33 +26,20 @@
dh_prep
dh_installdirs
dh_install
- cp motd* debian/postfixadmin/usr/share/postfixadmin
- cp *.php debian/postfixadmin/usr/share/postfixadmin
mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
- ln -s /etc/postfixadmin/config.inc.php debian/postfixadmin/usr/share/postfixadmin/config.inc.php
- perl -p -i -e "s#$$CONF\['postfix_admin_path'\] = dirname\(__FILE__\)#$$CONF\['postfix_admin_path'\] = '/usr/share/postfixadmin'#" debian/postfixadmin/etc/postfixadmin/config.inc.php
- cp -a model debian/postfixadmin/usr/share/postfixadmin
- cp -a admin debian/postfixadmin/usr/share/postfixadmin
- cp -a images debian/postfixadmin/usr/share/postfixadmin
- cp -a languages debian/postfixadmin/usr/share/postfixadmin
- cp -a templates debian/postfixadmin/usr/share/postfixadmin
- cp -a users debian/postfixadmin/usr/share/postfixadmin
- cp css/default.css debian/postfixadmin/usr/share/postfixadmin/css
- cp debian/apache-conf debian/postfixadmin/etc/apache2/conf.d/postfixadmin
find debian/postfixadmin -name .svn | xargs -r rm -r
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
- dh_installdebconf
+ dh_installchangelogs
+ dh_installdebconf
dh_installdocs -X.svn
- dh_installexamples
- dh_installman
- dh_installcron
+ dh_installexamples -X.svn
dh_link
dh_compress
- dh_fixperms -X/var
+ dh_fixperms
dh_installdeb
dh_gencontrol
dh_md5sums
Added: trunk/debian/templates
===================================================================
--- trunk/debian/templates (rev 0)
+++ trunk/debian/templates 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,6 @@
+Template: postfixadmin/reconfigure-webserver
+Type: multiselect
+Choices: apache2, apache, apache-ssl, apache-perl, lighttpd
+_Description: Web server to reconfigure automatically:
+ Please choose the web server that should be automatically configured
+ to run postfixadmin.
Added: trunk/debian/watch
===================================================================
--- trunk/debian/watch (rev 0)
+++ trunk/debian/watch 2009-05-09 22:11:32 UTC (rev 653)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/postfixadmin/postfixadmin-(.*)\.tar\.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2009-06-04 21:24:47
|
Revision: 671
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=671&view=rev
Author: normes
Date: 2009-06-04 21:24:26 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
Support for lenny packages added.
Please have a look at the debian/README.Debian file for more informations.
Modified Paths:
--------------
trunk/debian/README.Debian
trunk/debian/control
trunk/debian/postfixadmin.postinst
trunk/debian/postfixadmin.prerm
trunk/debian/rules
Added Paths:
-----------
trunk/debian/confd-link.sh
Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian 2009-06-01 14:56:29 UTC (rev 670)
+++ trunk/debian/README.Debian 2009-06-04 21:24:26 UTC (rev 671)
@@ -19,6 +19,7 @@
- MySQL or PostgreSQL
- Courier or Dovecot
+
Where to get help
=================
@@ -28,3 +29,18 @@
- 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.
Added: trunk/debian/confd-link.sh
===================================================================
--- trunk/debian/confd-link.sh (rev 0)
+++ trunk/debian/confd-link.sh 2009-06-04 21:24:26 UTC (rev 671)
@@ -0,0 +1,86 @@
+#!/bin/sh
+# File: confd-link.sh
+# Changes:
+# 20081109 Norman Messtorff <no...@no...>
+# Initial version.
+#
+# Needs: $servers - the servers to link configurations in.
+# $linkname - specify the link name
+# $linkdestination_apache - specify the link destination (Apache config)
+# $linkdestination_lighttpd - specify the link destination (lighttpd config)
+# Description: Linking configurations into Webservers conf.d
+# Sets: $status = {error, nothing, linked, removed}
+# $error = error message (if $status = error)
+
+status="nothing"
+error=""
+
+#
+# Checking needed settings...
+#
+if [ -z "$servers" ]; then
+ status="error"
+ error="No servers specified in confd-link.sh"
+elif [ -z "$linkname" ]; then
+ status="error"
+ error="No linkname specified in confd-link.sh"
+else
+
+ #
+ # The link removal part...
+ #
+ if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+ for A in $servers ; do
+ A=${A%,}
+ #
+ # lighttpd has no conf.d
+ #
+ if [ "$A" = "lighttpd" ]; then
+ linkpath="/etc/lighttpd/conf-available"
+ else
+ linkpath="/etc/$A/conf.d"
+ fi
+
+ #
+ # Is it existing and a symbolic link or are we going to do some unwished things?
+ #
+ if [ -L $linkpath/$linkname ]; then
+ if rm -f $linkpath/$linkname 2>&1 ; then
+ status="removed"
+ else
+ status="error"
+ error="ERROR! Couln't remove $linkpath/$linkname "
+ fi
+ else
+ status="error"
+ error="ERROR! $linkpath/$linkname is no symbolic link or doesn't exists."
+ fi
+ done
+ else
+ for A in $servers ; do
+ A=${A%,}
+ #
+ # lighttpd has no conf.d
+ #
+ if [ "$A" = "lighttpd" ]; then
+ linkpath="/etc/lighttpd/conf-available"
+ linkdestination=$linkdestination_lighttpd
+ else
+ linkpath="/etc/$A/conf.d"
+ linkdestination=$linkdestination_apache
+ fi
+
+ if [ -d $linkpath ]; then
+ if ln -s $linkdestination $linkpath/$linkname >/dev/null 2>&1 ; then
+ status="linked"
+ else
+ status="error"
+ error="ERROR! 'ln -s' returned an error. Could not create link in $linkpath"
+ fi
+ else
+ status="error"
+ error="ERROR! $linkpath doesn't exists. Could not create link in $linkpath"
+ fi
+ done
+ fi
+fi
Property changes on: trunk/debian/confd-link.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-06-01 14:56:29 UTC (rev 670)
+++ trunk/debian/control 2009-06-04 21:24:26 UTC (rev 671)
@@ -10,7 +10,7 @@
Package: postfixadmin
Architecture: all
-Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common (>= 0.2.0), apache2 | lighttpd, libapache2-mod-php5 | php5-cgi | php5, php5-imap, php5-mysql | php5-pgsql, mysql-client | postgresql-client, ${misc:Depends}
+Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd, 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
Suggests: squirrelmail-postfixadmin, dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
Description: Virtual mail hosting interface for Postfix
Modified: trunk/debian/postfixadmin.postinst
===================================================================
--- trunk/debian/postfixadmin.postinst 2009-06-01 14:56:29 UTC (rev 670)
+++ trunk/debian/postfixadmin.postinst 2009-06-04 21:24:26 UTC (rev 671)
@@ -16,7 +16,11 @@
linkdestination_apache="../../postfixadmin/apache.conf"
linkdestination_lighttpd="../../postfixadmin/lighttpd.conf"
linkname="postfixadmin"
- . /usr/share/wwwconfig-common/confd-link.sh
+ if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then
+ . /usr/share/wwwconfig-common/confd-link.sh
+ else
+ . /usr/share/postfixadmin/confd-link.sh
+ fi
. /usr/share/wwwconfig-common/restart.sh
fi
Modified: trunk/debian/postfixadmin.prerm
===================================================================
--- trunk/debian/postfixadmin.prerm 2009-06-01 14:56:29 UTC (rev 670)
+++ trunk/debian/postfixadmin.prerm 2009-06-04 21:24:26 UTC (rev 671)
@@ -14,7 +14,11 @@
db_get postfixadmin/reconfigure-webserver
servers="$RET"
linkname="postfixadmin"
- . /usr/share/wwwconfig-common/confd-link.sh
+ if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then
+ . /usr/share/wwwconfig-common/confd-link.sh
+ else
+ . /usr/share/postfixadmin/confd-link.sh
+ fi
fi
#DEBHELPER#
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-06-01 14:56:29 UTC (rev 670)
+++ trunk/debian/rules 2009-06-04 21:24:26 UTC (rev 671)
@@ -28,6 +28,7 @@
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
+ if test "${DIST}" = "lenny" ; then cp debian/confd-link.sh debian/postfixadmin/usr/share/postfixadmin/; fi
# Build architecture-independent files here.
binary-indep: build install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2010-02-21 18:39:01
|
Revision: 805
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=805&view=rev
Author: normes
Date: 2010-02-21 18:38:29 +0000 (Sun, 21 Feb 2010)
Log Message:
-----------
* debian/control: Updated Standards-Version, XS-Vcs-Browse not longer used.
* debian/postfixadmin.examples: excluded squirrelmail-plugin, I'll put it in a seperate package later...
* debian/patches/*: Updated debhelpers config.inc.php patch
* debian/changelog: This changelog is only used for .deb changes! Please put PA related changes only into CHANGELOG.TXT.
* debian/postfixadmin.docs: removed license-info, debian/copyright is the right place
* debian/README.source: lintian want to have this file present.
* debian/watch: not usefull
* debian/postfixadmin.install: removed motd.txt and motd-users.txt
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/series
trunk/debian/postfixadmin.docs
trunk/debian/postfixadmin.examples
trunk/debian/postfixadmin.install
Added Paths:
-----------
trunk/debian/README.source
trunk/debian/patches/20100221_db-credentials
Removed Paths:
-------------
trunk/debian/patches/01-20090509_database-credentials
trunk/debian/watch
Added: trunk/debian/README.source
===================================================================
--- trunk/debian/README.source (rev 0)
+++ trunk/debian/README.source 2010-02-21 18:38:29 UTC (rev 805)
@@ -0,0 +1,27 @@
+This package is using the quilt framework.
+All patches are located in debian/patches.
+
+Adding a new patch: quilt new <date-patch_name>
+This will create a new file debian/patches/patch/date-patch_name.
+Please use the current date (e.g. 20100221 - YYYYMMDD) as prefix!
+
+Editing a file to include it into the patch: quilt edit <filename>
+This will open your $EDITOR.
+
+To write your changes into the new patchfile: quilt refresh.
+
+quilt push:
+Apply patch(es) from the series file. Without options, the next
+patch in the series file is applied. When a number is specified,
+apply the specified number of patches. When a patch name is
+specified, apply all patches up to and including the specified patch.
+Patch names may include the patches/ prefix, which means that
+filename completion can be used.
+
+quilt pop:
+Remove patch(es) from the stack of applied patches. Without options,
+the topmost patch is removed. When a number is specified, remove the
+specified number of patches. When a patch name is specified, remove
+patches until the specified patch end up on top of the stack.
+Patch names may include the patches/ prefix, which means that
+filename completion can be used.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/changelog 2010-02-21 18:38:29 UTC (rev 805)
@@ -1,19 +1,6 @@
-postfixadmin (2.3rc7) unstable; urgency=low
+postfixadmin (2.3) unstable; urgency=low
- * Fix issue with pre.rm script
- * New 'upstream' release.
-
- -- David Goodwin <dav...@pa...> Mon, 27 Jul 2009 22:08:26 +0100
-
-postfixadmin (2.3rc6) unstable; urgency=low
-
- * Bump version number; etc.
-
- -- David Goodwin <dav...@pa...> Mon, 20 Jul 2009 19:56:26 +0100
-
-postfixadmin (2.3rc5) unstable; urgency=low
-
* Initial release (Closes: #247225)
- -- Norman Messtorff <no...@no...> Sat, 09 May 2009 22:36:26 +0200
+ -- Norman Messtorff <no...@no...> Sun, 21 Feb 2010 22:36:26 +0200
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/control 2010-02-21 18:38:29 UTC (rev 805)
@@ -3,10 +3,9 @@
Priority: optional
Maintainer: Norman Messtorff <no...@no...>
Build-Depends: debhelper (>= 7), po-debconf, quilt (>= 0.46)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
Homepage: http://postfixadmin.sourceforge.net
XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
-XS-Vcs-Browse: http://postfixadmin.svn.sourceforge.net/viewvc/postfixadmin/trunk/
Package: postfixadmin
Architecture: all
Deleted: trunk/debian/patches/01-20090509_database-credentials
===================================================================
--- trunk/debian/patches/01-20090509_database-credentials 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/patches/01-20090509_database-credentials 2010-02-21 18:38:29 UTC (rev 805)
@@ -1,30 +0,0 @@
-Index: config.inc.php
-===================================================================
---- config.inc.php (revision 690)
-+++ config.inc.php (working copy)
-@@ -23,7 +23,7 @@
- * Doing this implies you have changed this file as required.
- * i.e. configuring database etc; specifying setup.php password etc.
- */
--$CONF['configured'] = false;
-+$CONF['configured'] = true;
-
- // In order to setup Postfixadmin, you MUST specify a hashed password here.
- // To create the hash, visit setup.php in a browser and type a password into the field,
-@@ -46,11 +46,11 @@
- // mysql = MySQL 3.23 and 4.0, 4.1 or 5
- // mysqli = MySQL 4.1+
- // pgsql = PostgreSQL
--$CONF['database_type'] = 'mysql';
--$CONF['database_host'] = 'localhost';
--$CONF['database_user'] = 'postfix';
--$CONF['database_password'] = 'postfixadmin';
--$CONF['database_name'] = 'postfix';
-+$CONF['database_type'] = '_DBC_DBTYPE_';
-+$CONF['database_host'] = '_DBC_DBSERVER_';
-+$CONF['database_user'] = '_DBC_DBUSER_';
-+$CONF['database_password'] = '_DBC_DBPASS_';
-+$CONF['database_name'] = '_DBC_DBNAME_';
- $CONF['database_prefix'] = '';
-
- // Here, if you need, you can customize table names.
Added: trunk/debian/patches/20100221_db-credentials
===================================================================
--- trunk/debian/patches/20100221_db-credentials (rev 0)
+++ trunk/debian/patches/20100221_db-credentials 2010-02-21 18:38:29 UTC (rev 805)
@@ -0,0 +1,31 @@
+Index: postfixadmin-trunk/config.inc.php
+===================================================================
+--- postfixadmin-trunk.orig/config.inc.php 2010-02-21 19:04:32.000000000 +0100
++++ postfixadmin-trunk/config.inc.php 2010-02-21 19:05:26.000000000 +0100
+@@ -23,7 +23,7 @@
+ * Doing this implies you have changed this file as required.
+ * i.e. configuring database etc; specifying setup.php password etc.
+ */
+-$CONF['configured'] = false;
++$CONF['configured'] = true;
+
+ // In order to setup Postfixadmin, you MUST specify a hashed password here.
+ // To create the hash, visit setup.php in a browser and type a password into the field,
+@@ -45,11 +45,12 @@
+ // mysql = MySQL 3.23 and 4.0, 4.1 or 5
+ // mysqli = MySQL 4.1+
+ // pgsql = PostgreSQL
+-$CONF['database_type'] = 'mysql';
+-$CONF['database_host'] = 'localhost';
+-$CONF['database_user'] = 'postfix';
+-$CONF['database_password'] = 'postfixadmin';
+-$CONF['database_name'] = 'postfix';
++
++$CONF['database_type'] = '_DBC_DBTYPE_';
++$CONF['database_host'] = '_DBC_DBSERVER_';
++$CONF['database_user'] = '_DBC_DBUSER_';
++$CONF['database_password'] = '_DBC_DBPASS_';
++$CONF['database_name'] = '_DBC_DBNAME_';
+ $CONF['database_prefix'] = '';
+ // If you need to specify a different port for a MYSQL database connection, use e.g.
+ // $CONF['database_host'] = '172.30.33.66:3308';
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/patches/series 2010-02-21 18:38:29 UTC (rev 805)
@@ -1 +1 @@
-01-20090509_database-credentials -p0
+20100221_db-credentials
Modified: trunk/debian/postfixadmin.docs
===================================================================
--- trunk/debian/postfixadmin.docs 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/postfixadmin.docs 2010-02-21 18:38:29 UTC (rev 805)
@@ -1,5 +1,2 @@
DOCUMENTS
CHANGELOG.TXT
-GPL-LICENSE.TXT
-INSTALL.TXT
-LICENSE.TXT
Modified: trunk/debian/postfixadmin.examples
===================================================================
--- trunk/debian/postfixadmin.examples 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/postfixadmin.examples 2010-02-21 18:38:29 UTC (rev 805)
@@ -1,2 +1,16 @@
-ADDITIONS
VIRTUAL_VACATION
+ADDITIONS/change_password.tgz
+ADDITIONS/import_users_from_csv.py
+ADDITIONS/postfixadmin-domain-postdeletion.sh
+ADDITIONS/cleanupdirs.pl
+ADDITIONS/mailbox_remover.pl
+ADDITIONS/postfixadmin-mailbox-postcreation.sh
+ADDITIONS/virtualmaildel.php
+ADDITIONS/convert-passwd-to-postfixadmin.pl
+ADDITIONS/mkeveryone.pl
+ADDITIONS/postfixadmin-mailbox-postdeletion.sh
+ADDITIONS/delete-mailq-by-domain.pl
+ADDITIONS/pfa_maildir_cleanup.pl
+ADDITIONS/quota_usage.pl
+ADDITIONS/fetchmail.pl
+ADDITIONS/README.TXT
Modified: trunk/debian/postfixadmin.install
===================================================================
--- trunk/debian/postfixadmin.install 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/postfixadmin.install 2010-02-21 18:38:29 UTC (rev 805)
@@ -4,8 +4,6 @@
images usr/share/postfixadmin
languages usr/share/postfixadmin
model usr/share/postfixadmin
-motd.txt usr/share/postfixadmin
-motd-users.txt usr/share/postfixadmin
templates usr/share/postfixadmin
users usr/share/postfixadmin
debian/apache.conf etc/postfixadmin
Deleted: trunk/debian/watch
===================================================================
--- trunk/debian/watch 2010-02-21 15:16:26 UTC (rev 804)
+++ trunk/debian/watch 2010-02-21 18:38:29 UTC (rev 805)
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/postfixadmin/postfixadmin-(.*)\.tar\.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2011-12-18 20:41:46
|
Revision: 1295
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1295&view=rev
Author: normes
Date: 2011-12-18 20:41:40 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Again some Debian stuff:
- Changed source format to 3.0 (quilt)
- Added watchfile
Added Paths:
-----------
trunk/debian/source/
trunk/debian/source/format
trunk/debian/watch
Added: trunk/debian/source/format
===================================================================
--- trunk/debian/source/format (rev 0)
+++ trunk/debian/source/format 2011-12-18 20:41:40 UTC (rev 1295)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/debian/watch
===================================================================
--- trunk/debian/watch (rev 0)
+++ trunk/debian/watch 2011-12-18 20:41:40 UTC (rev 1295)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/postfixadmin/postfixadmin_(.+)\.tar\.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2012-04-26 19:57:26
|
Revision: 1376
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1376&view=rev
Author: normes
Date: 2012-04-26 19:57:20 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
Updating trunk also to current Debian packaging...
Modified Paths:
--------------
trunk/debian/README.Debian
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/postfixadmin.install
trunk/debian/rules
trunk/debian/watch
Added Paths:
-----------
trunk/debian/po/cs.po
trunk/debian/po/da.po
trunk/debian/po/de.po
trunk/debian/po/es.po
trunk/debian/po/fr.po
trunk/debian/po/it.po
trunk/debian/po/nl.po
trunk/debian/po/pl.po
trunk/debian/po/pt.po
trunk/debian/po/ru.po
trunk/debian/po/sv.po
trunk/debian/po/zh_TW.po
Removed Paths:
-------------
trunk/debian/confd-link.sh
Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/README.Debian 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 @@
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.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/TODO 2012-04-26 19:57:20 UTC (rev 1376)
@@ -1,4 +1,3 @@
- * Do all necessary things automatically (maybe with dbconfig?) (database, setp password...)
* DebTags
* dbconfig: DOCUMENTS/SECURITY.txt
* include postfix configuration templates
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/changelog 2012-04-26 19:57:20 UTC (rev 1376)
@@ -1,19 +1,14 @@
-postfixadmin (2.3.2) unstable; urgency=low
+postfixadmin (2.3.5-2) unstable; urgency=low
- * New upstream release
+ * Added .po translation files (Closes: 667951, #667962, #668202, #668288)
+ * Closes: #668298, #668301, #668405, #668635
+ * Updated standards version to 3.9.3 without changes.
- -- David Goodwin <dav...@pa...> Mon, 23 Aug 2010 11:24:00 +0100
+ -- Norman Messtorff <no...@no...> Thu, 26 Apr 2012 20:55:57 +0200
-postfixadmin (2.3.1) unstable; urgency=low
+postfixadmin (2.3.5-1) unstable; urgency=low
- * New upstream release
- * Updated .deb standards (thanks normes)
+ * Initial Debian release (Closes: #247225)
- -- David Goodwin <dav...@pa...> Thu, 08 Jul 2010 22:20:14 +0100
+ -- Norman Messtorff <no...@no...> Sun, 15 Jan 2012 12:27:28 +0100
-postfixadmin (2.3) unstable; urgency=low
-
- * Initial release (Closes: #247225)
-
- -- Norman Messtorff <no...@no...> Sun, 21 Feb 2010 22:36:26 +0200
-
Deleted: trunk/debian/confd-link.sh
===================================================================
--- trunk/debian/confd-link.sh 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/confd-link.sh 2012-04-26 19:57:20 UTC (rev 1376)
@@ -1,86 +0,0 @@
-#!/bin/sh
-# File: confd-link.sh
-# Changes:
-# 20081109 Norman Messtorff <no...@no...>
-# Initial version.
-#
-# Needs: $servers - the servers to link configurations in.
-# $linkname - specify the link name
-# $linkdestination_apache - specify the link destination (Apache config)
-# $linkdestination_lighttpd - specify the link destination (lighttpd config)
-# Description: Linking configurations into Webservers conf.d
-# Sets: $status = {error, nothing, linked, removed}
-# $error = error message (if $status = error)
-
-status="nothing"
-error=""
-
-#
-# Checking needed settings...
-#
-if [ -z "$servers" ]; then
- status="error"
- error="No servers specified in confd-link.sh"
-elif [ -z "$linkname" ]; then
- status="error"
- error="No linkname specified in confd-link.sh"
-else
-
- #
- # The link removal part...
- #
- if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
- for A in $servers ; do
- A=${A%,}
- #
- # lighttpd has no conf.d
- #
- if [ "$A" = "lighttpd" ]; then
- linkpath="/etc/lighttpd/conf-available"
- else
- linkpath="/etc/$A/conf.d"
- fi
-
- #
- # Is it existing and a symbolic link or are we going to do some unwished things?
- #
- if [ -L $linkpath/$linkname ]; then
- if rm -f $linkpath/$linkname 2>&1 ; then
- status="removed"
- else
- status="error"
- error="ERROR! Couln't remove $linkpath/$linkname "
- fi
- else
- status="error"
- error="ERROR! $linkpath/$linkname is no symbolic link or doesn't exists."
- fi
- done
- else
- for A in $servers ; do
- A=${A%,}
- #
- # lighttpd has no conf.d
- #
- if [ "$A" = "lighttpd" ]; then
- linkpath="/etc/lighttpd/conf-available"
- linkdestination=$linkdestination_lighttpd
- else
- linkpath="/etc/$A/conf.d"
- linkdestination=$linkdestination_apache
- fi
-
- if [ -d $linkpath ]; then
- if ln -s $linkdestination $linkpath/$linkname >/dev/null 2>&1 ; then
- status="linked"
- else
- status="error"
- error="ERROR! 'ln -s' returned an error. Could not create link in $linkpath"
- fi
- else
- status="error"
- error="ERROR! $linkpath doesn't exists. Could not create link in $linkpath"
- fi
- done
- fi
-fi
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/control 2012-04-26 19:57:20 UTC (rev 1376)
@@ -2,22 +2,26 @@
Section: admin
Priority: optional
Maintainer: Norman Messtorff <no...@no...>
-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-cli, php5-imap, php5-mysql | php5-pgsql, mysql-client | postgresql-client, ${misc:Depends}
Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server
-Suggests: squirrelmail-postfixadmin, dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
+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.
Added: trunk/debian/po/cs.po
===================================================================
--- trunk/debian/po/cs.po (rev 0)
+++ trunk/debian/po/cs.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -0,0 +1,32 @@
+# Czech PO debconf template translation of postfixadmin.
+# Copyright (C) 2012 Michal Simunek <mic...@gm...>
+# This file is distributed under the same license as the postfixadmin package.
+# Michal Simunek <mic...@gm...>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <mic...@gm...>\n"
+"Language-Team: Czech <deb...@li...>\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."
Added: trunk/debian/po/da.po
===================================================================
--- trunk/debian/po/da.po (rev 0)
+++ trunk/debian/po/da.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <joe...@ya...>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <joe...@ya...>\n"
+"Language-Team: Danish <deb...@li...>\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."
+
Added: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po (rev 0)
+++ trunk/debian/po/de.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <li...@wa...>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <li...@wa...>\n"
+"Language-Team: German <deb...@li...>\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."
Added: trunk/debian/po/es.po
===================================================================
--- trunk/debian/po/es.po (rev 0)
+++ trunk/debian/po/es.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <mat...@gm...>, 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: pos...@pa...\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 <mat...@gm...>\n"
+"Language-Team: Debian Spanish <deb...@li...>\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»."
Added: trunk/debian/po/fr.po
===================================================================
--- trunk/debian/po/fr.po (rev 0)
+++ trunk/debian/po/fr.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -0,0 +1,35 @@
+# Translation of postfixadmin debconf template to French.
+# Copyright (C) 2012 Debian French l10n team <deb...@li...>
+# This file is distributed under the same license as the postfixadmin package.
+# Translators:
+# Christian Perrier <bu...@de...>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <bu...@de...>\n"
+"Language-Team: French <deb...@li...>\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."
Added: trunk/debian/po/it.po
===================================================================
--- trunk/debian/po/it.po (rev 0)
+++ trunk/debian/po/it.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <bea...@li...>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <bea...@li...>\n"
+"Language-Team: Italian <deb...@li...>\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."
Added: trunk/debian/po/nl.po
===================================================================
--- trunk/debian/po/nl.po (rev 0)
+++ trunk/debian/po/nl.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <sc...@a-...>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <sc...@a-...>\n"
+"Language-Team: Debian l10n Dutch <deb...@li...>\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?"
Added: trunk/debian/po/pl.po
===================================================================
--- trunk/debian/po/pl.po (rev 0)
+++ trunk/debian/po/pl.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <mic...@gm...>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <mic...@gm...>\n"
+"Language-Team: Polish <deb...@li...>\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."
+
Added: trunk/debian/po/pt.po
===================================================================
--- trunk/debian/po/pt.po (rev 0)
+++ trunk/debian/po/pt.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -0,0 +1,32 @@
+# Portuguese translation for postfixadmin (debconf)
+# This file is distributed under the same license as the postfixadmin package.
+# Rui Branco <ru...@de...>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: postfixadmin 2.3.5-1\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <ru...@de...>\n"
+"Language-Team: Portuguese <tr...@de...>\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."
Added: trunk/debian/po/ru.po
===================================================================
--- trunk/debian/po/ru.po (rev 0)
+++ trunk/debian/po/ru.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <yu...@ko...>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.3.5-1\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <yu...@ko...>\n"
+"Language-Team: Russian <deb...@li...>\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."
+
Added: trunk/debian/po/sv.po
===================================================================
--- trunk/debian/po/sv.po (rev 0)
+++ trunk/debian/po/sv.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -0,0 +1,33 @@
+# Translation of postfixadmin debconf template to Swedish
+# Copyright (C) 2012 Martin Bagge <br...@bs...>
+# This file is distributed under the same license as the postfixadmin package.
+#
+# Martin Bagge <br...@bs...>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <br...@bs...>\n"
+"Language-Team: Swedish <deb...@li...>\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."
Added: trunk/debian/po/zh_TW.po
===================================================================
--- trunk/debian/po/zh_TW.po (rev 0)
+++ trunk/debian/po/zh_TW.po 2012-04-26 19:57:20 UTC (rev 1376)
@@ -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 <vi...@gm...>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: pos...@pa...\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 <vi...@gm...>\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 的網頁伺服器"
Modified: trunk/debian/postfixadmin.install
===================================================================
--- trunk/debian/postfixadmin.install 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/postfixadmin.install 2012-04-26 19:57:20 UTC (rev 1376)
@@ -10,7 +10,6 @@
smarty usr/share/postfixadmin
templates usr/share/postfixadmin
templates_c usr/share/postfixadmin
-tests usr/share/postfixadmin
users usr/share/postfixadmin
debian/apache.conf etc/postfixadmin
debian/lighttpd.conf etc/postfixadmin
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/rules 2012-04-26 19:57:20 UTC (rev 1376)
@@ -4,32 +4,23 @@
# 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=postfixadmin/debian --exclude=postfixadmin/.pc -czf postfixadmin_${DEBVERSION}.orig.tar.gz postfixadmin
+ 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: prep
+clean:
dh_testdir
- cd ${PFADIR}; dpkg-buildpackage -rfakeroot
-
-clean: unpatch
- dh_testdir
dh_testroot
dh_clean
debconf-updatepo
@@ -42,7 +33,6 @@
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/
chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli
chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli.php
Modified: trunk/debian/watch
===================================================================
--- trunk/debian/watch 2012-04-26 19:51:28 UTC (rev 1375)
+++ trunk/debian/watch 2012-04-26 19:57:20 UTC (rev 1376)
@@ -1,2 +1,2 @@
version=3
-http://sf.net/postfixadmin/postfixadmin_(.+)\.tar\.gz
+http://sf.net/postfixadmin/postfixadmin-([\d\.]+)\.tar\.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2011-12-18 19:20:04
|
Revision: 1294
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1294&view=rev
Author: normes
Date: 2011-12-18 19:19:58 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Updating Debian-Standards-Version:
* debian/rules: added missing build Targets
* debian/control: removed VCS field, not longer needed.
Modified Paths:
--------------
trunk/debian/control
trunk/debian/rules
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2011-11-29 00:23:55 UTC (rev 1293)
+++ trunk/debian/control 2011-12-18 19:19:58 UTC (rev 1294)
@@ -3,9 +3,8 @@
Priority: optional
Maintainer: Norman Messtorff <no...@no...>
Build-Depends: debhelper (>= 7), po-debconf, quilt (>= 0.46)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Homepage: http://postfixadmin.sourceforge.net
-XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
Package: postfixadmin
Architecture: all
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2011-11-29 00:23:55 UTC (rev 1293)
+++ trunk/debian/rules 2011-12-18 19:19:58 UTC (rev 1294)
@@ -6,8 +6,9 @@
include /usr/share/quilt/quilt.make
-build: build-stamp
-
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp: $(QUILT_STAMPFN)
dh_testdir
#dh_testroot
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2011-12-18 21:30:28
|
Revision: 1296
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1296&view=rev
Author: normes
Date: 2011-12-18 21:30:21 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
- added missing files/dirs (smarty, *.js etc.) into the package
- simplified the DB credential patch and removing ucf registrations on package purge...
Modified Paths:
--------------
trunk/debian/patches/series
trunk/debian/postfixadmin.install
trunk/debian/postfixadmin.postinst
trunk/debian/postfixadmin.postrm
Added Paths:
-----------
trunk/debian/patches/db_credentials
Removed Paths:
-------------
trunk/debian/patches/20110523_db-credentials
Deleted: trunk/debian/patches/20110523_db-credentials
===================================================================
--- trunk/debian/patches/20110523_db-credentials 2011-12-18 20:41:40 UTC (rev 1295)
+++ trunk/debian/patches/20110523_db-credentials 2011-12-18 21:30:21 UTC (rev 1296)
@@ -1,30 +0,0 @@
-Index: config.inc.php
-===================================================================
---- trunk.orig/config.inc.php (revision 1060)
-+++ trunk/config.inc.php (working copy)
-@@ -23,7 +23,7 @@
- * Doing this implies you have changed this file as required.
- * i.e. configuring database etc; specifying setup.php password etc.
- */
--$CONF['configured'] = false;
-+$CONF['configured'] = true;
-
- // In order to setup Postfixadmin, you MUST specify a hashed password here.
- // To create the hash, visit setup.php in a browser and type a password into the field,
-@@ -45,11 +45,11 @@
- // mysql = MySQL 3.23 and 4.0, 4.1 or 5
- // mysqli = MySQL 4.1+
- // pgsql = PostgreSQL
--$CONF['database_type'] = 'mysql';
--$CONF['database_host'] = 'localhost';
--$CONF['database_user'] = 'postfix';
--$CONF['database_password'] = 'postfixadmin';
--$CONF['database_name'] = 'postfix';
-+$CONF['database_type'] = '_DBC_DBTYPE_';
-+$CONF['database_host'] = '_DBC_DBSERVER_';
-+$CONF['database_user'] = '_DBC_DBUSER_';
-+$CONF['database_password'] = '_DBC_DBPASS_';
-+$CONF['database_name'] = '_DBC_DBNAME_';
- // If you need to specify a different port for a MYSQL database connection, use e.g.
- // $CONF['database_host'] = '172.30.33.66:3308';
- // If you need to specify a different port for POSTGRESQL database connection
Added: trunk/debian/patches/db_credentials
===================================================================
--- trunk/debian/patches/db_credentials (rev 0)
+++ trunk/debian/patches/db_credentials 2011-12-18 21:30:21 UTC (rev 1296)
@@ -0,0 +1,56 @@
+Description: This patch sets the dbconfig placeholders in config.inc.php.
+Forwarded: not-needed
+Author: Norman Messtorff <no...@no...>
+Last-Update: 2011-12-18
+
+Index: postfixadmin/config.inc.php
+===================================================================
+--- postfixadmin.orig/config.inc.php 2011-12-18 05:22:05.000000000 +0100
++++ postfixadmin/config.inc.php 2011-12-18 05:31:16.000000000 +0100
+@@ -16,6 +16,11 @@
+ * Contains configuration options.
+ */
+
++// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
++require_once('dbconfig.inc.php');
++if (!isset($dbserver) || empty($dbserver))
++ $dbserver='localhost';
++
+ /*****************************************************************
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * You have to set $CONF['configured'] = true; before the
+@@ -23,7 +28,7 @@
+ * Doing this implies you have changed this file as required.
+ * i.e. configuring database etc; specifying setup.php password etc.
+ */
+-$CONF['configured'] = false;
++$CONF['configured'] = true;
+
+ // In order to setup Postfixadmin, you MUST specify a hashed password here.
+ // To create the hash, visit setup.php in a browser and type a password into the field,
+@@ -32,7 +37,7 @@
+ // Postfix Admin Path
+ // Set the location of your Postfix Admin installation here.
+ // YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
+-$CONF['postfix_admin_url'] = '';
++$CONF['postfix_admin_url'] = '/postfixadmin';
+
+ // Language config
+ // Language files are located in './languages', change as required..
+@@ -85,11 +90,11 @@
+ // mysql = MySQL 3.23 and 4.0, 4.1 or 5
+ // mysqli = MySQL 4.1+
+ // pgsql = PostgreSQL
+-$CONF['database_type'] = 'mysql';
+-$CONF['database_host'] = 'localhost';
+-$CONF['database_user'] = 'postfix';
+-$CONF['database_password'] = 'postfixadmin';
+-$CONF['database_name'] = 'postfix';
++$CONF['database_type'] = $dbtype;
++$CONF['database_host'] = $dbserver;
++$CONF['database_user'] = $dbuser;
++$CONF['database_password'] = $dbpass;
++$CONF['database_name'] = $dbname;
+ // If you need to specify a different port for a MYSQL database connection, use e.g.
+ // $CONF['database_host'] = '172.30.33.66:3308';
+ // If you need to specify a different port for POSTGRESQL database connection
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2011-12-18 20:41:40 UTC (rev 1295)
+++ trunk/debian/patches/series 2011-12-18 21:30:21 UTC (rev 1296)
@@ -1 +1 @@
-20110523_db-credentials
+db_credentials
Modified: trunk/debian/postfixadmin.install
===================================================================
--- trunk/debian/postfixadmin.install 2011-12-18 20:41:40 UTC (rev 1295)
+++ trunk/debian/postfixadmin.install 2011-12-18 21:30:21 UTC (rev 1296)
@@ -1,10 +1,16 @@
*.php usr/share/postfixadmin
+*.js usr/share/postfixadmin
admin usr/share/postfixadmin
+configs usr/share/postfixadmin
css usr/share/postfixadmin
images usr/share/postfixadmin
languages usr/share/postfixadmin
model usr/share/postfixadmin
+scripts usr/share/postfixadmin
+smarty usr/share/postfixadmin
templates usr/share/postfixadmin
+templates_c usr/share/postfixadmin
+tests usr/share/postfixadmin
users usr/share/postfixadmin
debian/apache.conf etc/postfixadmin
debian/lighttpd.conf etc/postfixadmin
Modified: trunk/debian/postfixadmin.postinst
===================================================================
--- trunk/debian/postfixadmin.postinst 2011-12-18 20:41:40 UTC (rev 1295)
+++ trunk/debian/postfixadmin.postinst 2011-12-18 21:30:21 UTC (rev 1296)
@@ -2,14 +2,14 @@
set -e
if [ "$1" = "configure" ]; then
+ # configure DB stuff via dbconfig-common
+ dbc_generate_include=php:/etc/postfixadmin/dbconfig.inc.php
+ dbc_generate_include_args="-O root:www-data -m 640 -U"
. /usr/share/debconf/confmodule
- db_version 2.0
- dbc_generate_include='template:/etc/postfixadmin/config.inc.php'
- dbc_generate_include_owner='root:www-data'
- dbc_generate_include_perms='640'
- dbc_generate_include_args="-U -o template_infile=/usr/share/postfixadmin/config.inc.php"
. /usr/share/dbconfig-common/dpkg/postinst
dbc_go postfixadmin $@
+
+ # configure webserver stuff
db_get postfixadmin/reconfigure-webserver
servers="$RET"
restart="$servers"
@@ -26,4 +26,6 @@
#DEBHELPER#
+chown www-data /usr/share/postfixadmin/templates_c
+
exit 0
Modified: trunk/debian/postfixadmin.postrm
===================================================================
--- trunk/debian/postfixadmin.postrm 2011-12-18 20:41:40 UTC (rev 1295)
+++ trunk/debian/postfixadmin.postrm 2011-12-18 21:30:21 UTC (rev 1296)
@@ -19,6 +19,16 @@
dbc_go postfixadmin $@
fi
fi
+
+ if [ "$1" = "purge" ]; then
+ rm -f /etc/postfixadmin/dbconfig.inc.php
+ if which ucf >/dev/null 2>&1; then
+ ucf --purge /etc/postfixadmin/dbconfig.inc.php
+ fi
+
+ db_purge || true
+
+ fi
fi
#DEBHELPER#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <no...@us...> - 2011-12-24 13:18:21
|
Revision: 1304
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1304&view=rev
Author: normes
Date: 2011-12-24 13:18:14 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
Some more lintian fixes:
- control: added php5-cli dependency
- rules: some permission fixes to postfixadmin-cli scripts
- postfixadmin.docs: removed redundant changelog file
Merry christmas!
Modified Paths:
--------------
trunk/debian/control
trunk/debian/postfixadmin.docs
trunk/debian/rules
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2011-12-20 23:07:34 UTC (rev 1303)
+++ trunk/debian/control 2011-12-24 13:18:14 UTC (rev 1304)
@@ -8,7 +8,7 @@
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}
+Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php5 | php5-cgi | php5, php5-cli, php5-imap, php5-mysql | php5-pgsql, mysql-client | postgresql-client, ${misc:Depends}
Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server
Suggests: squirrelmail-postfixadmin, dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
Description: Virtual mail hosting interface for Postfix
Modified: trunk/debian/postfixadmin.docs
===================================================================
--- trunk/debian/postfixadmin.docs 2011-12-20 23:07:34 UTC (rev 1303)
+++ trunk/debian/postfixadmin.docs 2011-12-24 13:18:14 UTC (rev 1304)
@@ -1,2 +1 @@
DOCUMENTS
-CHANGELOG.TXT
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2011-12-20 23:07:34 UTC (rev 1303)
+++ trunk/debian/rules 2011-12-24 13:18:14 UTC (rev 1304)
@@ -30,6 +30,8 @@
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/
+ chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli
+ chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli.php
# Build architecture-independent files here.
binary-indep: build install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gin...@us...> - 2016-05-22 18:50:05
|
Revision: 1848
http://sourceforge.net/p/postfixadmin/code/1848
Author: gingerdog
Date: 2016-05-22 18:50:03 +0000 (Sun, 22 May 2016)
Log Message:
-----------
Merge in Debian's /debian so we also support Apache 2.4 and PHP7 in our debs.... see: http://http.debian.net/debian/pool/main/p/postfixadmin/postfixadmin_2.3.7-2.debian.tar.xz and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821643
Modified Paths:
--------------
trunk/debian/README.Debian
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/series
trunk/debian/postfixadmin.config
trunk/debian/postfixadmin.dirs
trunk/debian/postfixadmin.install
trunk/debian/postfixadmin.postinst
trunk/debian/postfixadmin.postrm
trunk/debian/postfixadmin.prerm
trunk/debian/rules
Added Paths:
-----------
trunk/debian/apache/
trunk/debian/apache/postfixadmin.conf
trunk/debian/lighttpd/
trunk/debian/lighttpd/90-postfixadmin.conf
trunk/debian/patches/0001-db_credentials.patch
trunk/debian/patches/0002-dovecotpw.patch
trunk/debian/postfixadmin.apache2
trunk/debian/postfixadmin.maintscript
trunk/debian/stamp-patched
Removed Paths:
-------------
trunk/debian/apache.conf
trunk/debian/lighttpd.conf
trunk/debian/patches/db_credentials
trunk/debian/po/
trunk/debian/templates
Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/README.Debian 2016-05-22 18:50:03 UTC (rev 1848)
@@ -6,17 +6,6 @@
guide you through the appropriate process.
-Integration with Postfix, Dovecot etc.
-======================================
-
-Now that PostfixAdmin is working, you need to do some configuration
-in Postfix, Dovecot etc. so that they use the domains, mailboxes and
-aliases you setup in PostfixAdmin.
-
-The files in /usr/share/doc/postfixadmin/ directory explain which
-settings you need to do/change.
-
-
Recommended and Suggested Packages
==================================
- Postfix
Added: trunk/debian/apache/postfixadmin.conf
===================================================================
--- trunk/debian/apache/postfixadmin.conf (rev 0)
+++ trunk/debian/apache/postfixadmin.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,5 @@
+# BEGIN FOR POSTFIXADMIN
+
+Alias /postfixadmin /usr/share/postfixadmin
+
+# END FOR POSTFIXADMIN
Deleted: trunk/debian/apache.conf
===================================================================
--- trunk/debian/apache.conf 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/apache.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,5 +0,0 @@
-# BEGIN FOR POSTFIXADMIN
-
-Alias /postfixadmin /usr/share/postfixadmin
-
-# END FOR POSTFIXADMIN
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/changelog 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,3 +1,10 @@
+postfixadmin (2.93-2) unstable; urgency=low
+
+ * Replace debian/ using Debian v2.3.7-2. See Debian's #821643
+ * This adds : PHP7 and Apache 2.4 support.
+
+ -- David Goodwin <da...@pa...> Sun, 22 May 2016 19:41:01 +0100
+
postfixadmin (2.93-1) unstable; urgency=low
* New upstream release (effectively beta3 for v3.0)
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/control 2016-05-22 18:50:03 UTC (rev 1848)
@@ -2,23 +2,23 @@
Section: admin
Priority: optional
Maintainer: Norman Messtorff <no...@no...>
-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
+Uploaders: Gaudenz Steinlin <ga...@de...>, Christoph Martin <ma...@un...>
+Build-Depends: debhelper (>= 7), po-debconf, dh-apache2
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/collab-maint/postfixadmin.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/postfixadmin.git
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-cli, php5-imap, php5-mysql | php5-mysqlnd | php5-pgsql, mysql-client | postgresql-client | mariadb-client, ${misc:Depends}
-Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server | mariadb-server
-Suggests: dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
+Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php | php-cgi | php, php-imap, php-mysql | php-pgsql, mysql-client | postgresql-client, ${misc:Depends}
+Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql, zendframework, dovecot-core | courier-authlib-mysql | courier-authlib-postgresql
Description: Virtual mail hosting interface for Postfix
Postfixadmin is a web interface to manage virtual users and domains
- for a Postfix mail transport agent. It supports Virtual mailboxes,
+ for a Postfix mail transport agent. It supports Virtual mailboxes,
aliases, forwarders and vacation.
.
- Postfixadmin allows administrators to delegate account handling
+ 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).
.
Added: trunk/debian/lighttpd/90-postfixadmin.conf
===================================================================
--- trunk/debian/lighttpd/90-postfixadmin.conf (rev 0)
+++ trunk/debian/lighttpd/90-postfixadmin.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,4 @@
+# Alias for Postfixadmin
+alias.url += (
+ "/postfixadmin" => "/usr/share/postfixadmin",
+)
Deleted: trunk/debian/lighttpd.conf
===================================================================
--- trunk/debian/lighttpd.conf 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/lighttpd.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,4 +0,0 @@
-# Alias for Postfixadmin
-alias.url += (
- "/postfixadmin" => "/usr/share/postfixadmin",
-)
Added: trunk/debian/patches/0001-db_credentials.patch
===================================================================
--- trunk/debian/patches/0001-db_credentials.patch (rev 0)
+++ trunk/debian/patches/0001-db_credentials.patch 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,59 @@
+From: Norman Messtorff <no...@no...>
+Date: Sun, 23 Mar 2014 17:40:30 +0100
+Subject: db_credentials
+
+---
+ config.inc.php | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/config.inc.php b/config.inc.php
+index e41e7c3..538446d 100644
+--- a/config.inc.php
++++ b/config.inc.php
+@@ -16,6 +16,11 @@
+ * Contains configuration options.
+ */
+
++// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
++require_once('dbconfig.inc.php');
++if (!isset($dbserver) || empty($dbserver))
++ $dbserver='localhost';
++
+ /*****************************************************************
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * You have to set $CONF['configured'] = true; before the
+@@ -23,7 +28,7 @@
+ * Doing this implies you have changed this file as required.
+ * i.e. configuring database etc; specifying setup.php password etc.
+ */
+-$CONF['configured'] = false;
++$CONF['configured'] = true;
+
+ // In order to setup Postfixadmin, you MUST specify a hashed password here.
+ // To create the hash, visit setup.php in a browser and type a password into the field,
+@@ -33,7 +38,7 @@ $CONF['setup_password'] = 'changeme';
+ // Postfix Admin Path
+ // Set the location of your Postfix Admin installation here.
+ // YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
+-$CONF['postfix_admin_url'] = '';
++$CONF['postfix_admin_url'] = '/postfixadmin';
+
+ // shouldn't need changing.
+ $CONF['postfix_admin_path'] = dirname(__FILE__);
+@@ -46,11 +51,11 @@ $CONF['default_language'] = 'en';
+ // mysql = MySQL 3.23 and 4.0, 4.1 or 5
+ // mysqli = MySQL 4.1+
+ // pgsql = PostgreSQL
+-$CONF['database_type'] = 'mysql';
+-$CONF['database_host'] = 'localhost';
+-$CONF['database_user'] = 'postfix';
+-$CONF['database_password'] = 'postfixadmin';
+-$CONF['database_name'] = 'postfix';
++$CONF['database_type'] = $dbtype;
++$CONF['database_host'] = $dbserver;
++$CONF['database_user'] = $dbuser;
++$CONF['database_password'] = $dbpass;
++$CONF['database_name'] = $dbname;
+ // If you need to specify a different port for a MYSQL database connection, use e.g.
+ // $CONF['database_host'] = '172.30.33.66:3308';
+ // If you need to specify a different port for POSTGRESQL database connection
Added: trunk/debian/patches/0002-dovecotpw.patch
===================================================================
--- trunk/debian/patches/0002-dovecotpw.patch (rev 0)
+++ trunk/debian/patches/0002-dovecotpw.patch 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,21 @@
+Description: Use doveadm pw instead of dovecotpw by default
+ Newer versions of dovecot no longer have the dovecotpw command.
+Author: Gaudenz Steinlin <ga...@de...>
+Forwarded: not-needed
+Applied-Upstream: fixed upstream in version 2.91
+Last-Update: 2014-10-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: postfixadmin/config.inc.php
+===================================================================
+--- postfixadmin.orig/config.inc.php 2014-10-02 17:21:08.000000000 +0200
++++ postfixadmin/config.inc.php 2014-10-03 10:40:32.836919086 +0200
+@@ -111,7 +111,7 @@
+ $CONF['authlib_default_flavor'] = 'md5raw';
+
+ // If you use the dovecot encryption method: where is the dovecotpw binary located?
+-$CONF['dovecotpw'] = "/usr/sbin/dovecotpw";
++$CONF['dovecotpw'] = "/usr/bin/doveadm pw";
+
+ // Minimum length required for passwords. Postfixadmin will not
+ // allow users to set passwords which are shorter than this value.
Deleted: trunk/debian/patches/db_credentials
===================================================================
--- trunk/debian/patches/db_credentials 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/patches/db_credentials 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,47 +0,0 @@
-Description: This patch sets the dbconfig placeholders in config.inc.php.
-Forwarded: not-needed
-Author: Norman Messtorff <no...@no...>
-Last-Update: 2012-05-28
-
-Index: postfixadmin/config.inc.php
-===================================================================
---- postfixadmin.orig/config.inc.php 2015-09-26 15:03:05.000000000 +0100
-+++ postfixadmin/config.inc.php 2015-09-26 15:03:16.000000000 +0100
-@@ -15,6 +15,11 @@
- * Contains configuration options.
- */
-
-+// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
-+require_once('/etc/postfixadmin/dbconfig.inc.php');
-+if (!isset($dbserver) || empty($dbserver))
-+ $dbserver='localhost';
-+
- /*****************************************************************
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * You have to set $CONF['configured'] = true; before the
-@@ -22,7 +27,7 @@
- * Doing this implies you have changed this file as required.
- * i.e. configuring database etc; specifying setup.php password etc.
- */
--$CONF['configured'] = false;
-+$CONF['configured'] = true;
-
- // In order to setup Postfixadmin, you MUST specify a hashed password here.
- // To create the hash, visit setup.php in a browser and type a password into the field,
-@@ -80,11 +85,11 @@
- // mysql = MySQL 3.23 and 4.0, 4.1 or 5
- // mysqli = MySQL 4.1+ or MariaDB
- // pgsql = PostgreSQL
--$CONF['database_type'] = 'mysqli';
--$CONF['database_host'] = 'localhost';
--$CONF['database_user'] = 'postfix';
--$CONF['database_password'] = 'postfixadmin';
--$CONF['database_name'] = 'postfix';
-+$CONF['database_type'] = $dbtype;
-+$CONF['database_host'] = $dbserver;
-+$CONF['database_user'] = $dbuser;
-+$CONF['database_password'] = $dbpass;
-+$CONF['database_name'] = $dbname;
- // If you need to specify a different port for a MYSQL database connection, use e.g.
- // $CONF['database_host'] = '172.30.33.66:3308';
- // If you need to specify a different port for POSTGRESQL database connection
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/patches/series 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1 +1,2 @@
-db_credentials
+0001-db_credentials.patch
+0002-dovecotpw.patch
Added: trunk/debian/postfixadmin.apache2
===================================================================
--- trunk/debian/postfixadmin.apache2 (rev 0)
+++ trunk/debian/postfixadmin.apache2 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1 @@
+conf debian/apache/postfixadmin.conf
\ No newline at end of file
Modified: trunk/debian/postfixadmin.config
===================================================================
--- trunk/debian/postfixadmin.config 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.config 2016-05-22 18:50:03 UTC (rev 1848)
@@ -2,9 +2,6 @@
set -e
. /usr/share/debconf/confmodule
-db_version 2.0
-db_input high postfixadmin/reconfigure-webserver || true
-db_go || true
if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
# we support mysql and pgsql
Modified: trunk/debian/postfixadmin.dirs
===================================================================
--- trunk/debian/postfixadmin.dirs 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.dirs 2016-05-22 18:50:03 UTC (rev 1848)
@@ -2,4 +2,3 @@
usr/share/postfixadmin/css
usr/share/doc/postfixadmin
etc/postfixadmin
-etc/apache2/conf.d
Modified: trunk/debian/postfixadmin.install
===================================================================
--- trunk/debian/postfixadmin.install 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.install 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,14 +1,9 @@
*.php usr/share/postfixadmin
-*.js usr/share/postfixadmin
-configs usr/share/postfixadmin
+admin usr/share/postfixadmin
css usr/share/postfixadmin
images usr/share/postfixadmin
languages usr/share/postfixadmin
model usr/share/postfixadmin
-scripts usr/share/postfixadmin
-smarty usr/share/postfixadmin
templates usr/share/postfixadmin
-templates_c usr/share/postfixadmin
users usr/share/postfixadmin
-debian/apache.conf etc/postfixadmin
-debian/lighttpd.conf etc/postfixadmin
+debian/lighttpd/90-postfixadmin.conf etc/lighttpd/conf-available
Added: trunk/debian/postfixadmin.maintscript
===================================================================
--- trunk/debian/postfixadmin.maintscript (rev 0)
+++ trunk/debian/postfixadmin.maintscript 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,3 @@
+# move webserver configuration files
+mv_conffile /etc/postfixadmin/apache.conf /etc/apache2/conf-available/postfixadmin.conf 2.3.7-1~
+mv_conffile /etc/postfixadmin/lighttpd.conf /etc/lighttpd/conf-available/postfixadmin.conf 2.3.7-1~
Modified: trunk/debian/postfixadmin.postinst
===================================================================
--- trunk/debian/postfixadmin.postinst 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.postinst 2016-05-22 18:50:03 UTC (rev 1848)
@@ -8,24 +8,17 @@
. /usr/share/debconf/confmodule
. /usr/share/dbconfig-common/dpkg/postinst
dbc_go postfixadmin $@
-
- # configure webserver stuff
- db_get postfixadmin/reconfigure-webserver
- servers="$RET"
- restart="$servers"
- linkdestination_apache="../../postfixadmin/apache.conf"
- linkdestination_lighttpd="../../postfixadmin/lighttpd.conf"
- linkname="postfixadmin"
- if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then
- . /usr/share/wwwconfig-common/confd-link.sh
- else
- . /usr/share/postfixadmin/confd-link.sh
- fi
- . /usr/share/wwwconfig-common/restart.sh
fi
+# remove legacy apache and lighthttpd configuration symlink,
+# conf.d is no longer supported with Apache 2.4
+if [ "$(readlink /etc/apache2/conf.d/postfixadmin)" = "../../postfixadmin/apache.conf" ]; then
+ rm -f /etc/apache2/conf.d/postfixadmin
+fi
+if [ "$(readlink /etc/lighttpd/conf-available/postfixadmin)" = "../../postfixadmin/lighttpd.conf" ]; then
+ rm -f /etc/lighttpd/conf-available/postfixadmin
+fi
+
#DEBHELPER#
-chown www-data /usr/share/postfixadmin/templates_c
-
exit 0
Modified: trunk/debian/postfixadmin.postrm
===================================================================
--- trunk/debian/postfixadmin.postrm 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.postrm 2016-05-22 18:50:03 UTC (rev 1848)
@@ -6,16 +6,6 @@
. /usr/share/debconf/confmodule
db_version 2.0
- # restart the webserver only if we know which one was configured.
- if db_get postfixadmin/reconfigure-webserver; then
- servers="$RET"
- restart=$servers
- linkname="postfixadmin"
- if [ -e /usr/share/wwwconfig-common/restart.sh ]; then
- . /usr/share/wwwconfig-common/restart.sh
- fi
- fi
-
if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
. /usr/share/dbconfig-common/dpkg/postrm
dbc_go postfixadmin $@
Modified: trunk/debian/postfixadmin.prerm
===================================================================
--- trunk/debian/postfixadmin.prerm 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.prerm 2016-05-22 18:50:03 UTC (rev 1848)
@@ -8,17 +8,4 @@
dbc_go postfixadmin $@
fi
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
- db_get postfixadmin/reconfigure-webserver
- servers="$RET"
- linkname="postfixadmin"
- if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then
- . /usr/share/wwwconfig-common/confd-link.sh
- else
- . /usr/share/postfixadmin/confd-link.sh
- fi
-fi
-
#DEBHELPER#
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/rules 2016-05-22 18:50:03 UTC (rev 1848)
@@ -7,6 +7,7 @@
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/-.*//")
+
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
@@ -14,16 +15,10 @@
dh_testdir
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=$(notdir ${CURDIR})/debian --exclude=$(notdir ${CURDIR})/.pc -cvzf postfixadmin_${DEBVERSION}.orig.tar.gz $(notdir ${CURDIR})
-
clean:
dh_testdir
dh_testroot
dh_clean
- debconf-updatepo
install: build
dh_testdir
@@ -31,13 +26,10 @@
dh_prep
dh_installdirs
dh_install
+ dh_apache2
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
- chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli
- chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli.php
- chown www-data debian/postfixadmin/usr/share/postfixadmin/templates_c
-
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
Added: trunk/debian/stamp-patched
===================================================================
Deleted: trunk/debian/templates
===================================================================
--- trunk/debian/templates 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/templates 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,6 +0,0 @@
-Template: postfixadmin/reconfigure-webserver
-Type: multiselect
-Choices: apache2, apache, apache-ssl, apache-perl, lighttpd
-_Description: Web server to reconfigure automatically:
- Please choose the web server that should be automatically configured
- to run postfixadmin.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X