SF.net SVN: postfixadmin:[844] branches/postfixadmin-2.3/debian
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[844] branches/postfixadmin-2.3/debian
|
From: <Gin...@us...> - 2010-07-08 21:31:13
|
Revision: 844
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=844&view=rev
Author: GingerDog
Date: 2010-07-08 21:31:07 +0000 (Thu, 08 Jul 2010)
Log Message:
-----------
merge in changes from trunk (-r740:HEAD) into the 3.2 branch for /debian only
Modified Paths:
--------------
branches/postfixadmin-2.3/debian/changelog
branches/postfixadmin-2.3/debian/control
branches/postfixadmin-2.3/debian/patches/series
branches/postfixadmin-2.3/debian/postfixadmin.docs
branches/postfixadmin-2.3/debian/postfixadmin.examples
branches/postfixadmin-2.3/debian/postfixadmin.install
Added Paths:
-----------
branches/postfixadmin-2.3/debian/README.source
branches/postfixadmin-2.3/debian/patches/20100221_db-credentials
Removed Paths:
-------------
branches/postfixadmin-2.3/debian/patches/01-20090509_database-credentials
branches/postfixadmin-2.3/debian/watch
Property Changed:
----------------
branches/postfixadmin-2.3/debian/
branches/postfixadmin-2.3/debian/apache.conf
branches/postfixadmin-2.3/debian/postfixadmin.docs
Property changes on: branches/postfixadmin-2.3/debian
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/debian:741-843
Copied: branches/postfixadmin-2.3/debian/README.source (from rev 805, trunk/debian/README.source)
===================================================================
--- branches/postfixadmin-2.3/debian/README.source (rev 0)
+++ branches/postfixadmin-2.3/debian/README.source 2010-07-08 21:31:07 UTC (rev 844)
@@ -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.
Property changes on: branches/postfixadmin-2.3/debian/apache.conf
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/debian/apache.conf:829-830,833-836
Modified: branches/postfixadmin-2.3/debian/changelog
===================================================================
--- branches/postfixadmin-2.3/debian/changelog 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/changelog 2010-07-08 21:31:07 UTC (rev 844)
@@ -1,25 +1,13 @@
-postfixadmin (2.3) unstable; urgency=low
+postfixadmin (2.3.1) unstable; urgency=low
- * New 'upstream' release.
+ * New upstream release
+ * Updated .deb standards (thanks normes)
- -- David Goodwin <dav...@pa...> Mon, 27 Jul 2009 22:08:26 +0100
+ -- David Goodwin <dav...@pa...> Thu, 08 Jul 2010 22:20:14 +0100
-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: branches/postfixadmin-2.3/debian/control
===================================================================
--- branches/postfixadmin-2.3/debian/control 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/control 2010-07-08 21:31:07 UTC (rev 844)
@@ -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: branches/postfixadmin-2.3/debian/patches/01-20090509_database-credentials
===================================================================
--- branches/postfixadmin-2.3/debian/patches/01-20090509_database-credentials 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/patches/01-20090509_database-credentials 2010-07-08 21:31:07 UTC (rev 844)
@@ -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.
Copied: branches/postfixadmin-2.3/debian/patches/20100221_db-credentials (from rev 805, trunk/debian/patches/20100221_db-credentials)
===================================================================
--- branches/postfixadmin-2.3/debian/patches/20100221_db-credentials (rev 0)
+++ branches/postfixadmin-2.3/debian/patches/20100221_db-credentials 2010-07-08 21:31:07 UTC (rev 844)
@@ -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: branches/postfixadmin-2.3/debian/patches/series
===================================================================
--- branches/postfixadmin-2.3/debian/patches/series 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/patches/series 2010-07-08 21:31:07 UTC (rev 844)
@@ -1 +1 @@
-01-20090509_database-credentials -p0
+20100221_db-credentials
Modified: branches/postfixadmin-2.3/debian/postfixadmin.docs
===================================================================
--- branches/postfixadmin-2.3/debian/postfixadmin.docs 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/postfixadmin.docs 2010-07-08 21:31:07 UTC (rev 844)
@@ -1,5 +1,2 @@
DOCUMENTS
CHANGELOG.TXT
-GPL-LICENSE.TXT
-INSTALL.TXT
-LICENSE.TXT
Property changes on: branches/postfixadmin-2.3/debian/postfixadmin.docs
___________________________________________________________________
Deleted: svn:mergeinfo
- /trunk/debian/postfixadmin.docs:829-830,833-836
Modified: branches/postfixadmin-2.3/debian/postfixadmin.examples
===================================================================
--- branches/postfixadmin-2.3/debian/postfixadmin.examples 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/postfixadmin.examples 2010-07-08 21:31:07 UTC (rev 844)
@@ -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: branches/postfixadmin-2.3/debian/postfixadmin.install
===================================================================
--- branches/postfixadmin-2.3/debian/postfixadmin.install 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/postfixadmin.install 2010-07-08 21:31:07 UTC (rev 844)
@@ -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: branches/postfixadmin-2.3/debian/watch
===================================================================
--- branches/postfixadmin-2.3/debian/watch 2010-07-08 21:07:18 UTC (rev 843)
+++ branches/postfixadmin-2.3/debian/watch 2010-07-08 21:31:07 UTC (rev 844)
@@ -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.
|