[pkg-horde] [SCM] Debian Horde Packages repository: horde3 package branch, debian-sid, updated. debian/3.3.6+debian0-2-19-g2792761

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 97b446c2c5807a650f868eaf5552766fc6b0c611
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat Jan 7 12:12:08 2012 +0100

    Switch to 3.0 (quilt) and housekeeping
    
    Don't use asterisks in NEWS.Debian
    Switch to dpkg-source 3.0 (quilt) format
    Remove conflict on horde and old turba2 (very old packages)

diff --git a/debian/NEWS b/debian/NEWS
index 035fbc2..f721fda 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,10 +1,10 @@
 horde3 (3.2.1+debian0-2) unstable; urgency=low
 
-  * All Horde components are now inactive by default! If you want to use a
-    component (IMP, Turba, Kronolith, etcetera.): configure it and active it
-    in /etc/horde/horde3/registry.php file (set 'status' => 'active').
+  All Horde components are now inactive by default! If you want to use a
+  component (IMP, Turba, Kronolith, etcetera.): configure it and active it
+  in /etc/horde/horde3/registry.php file (set 'status' => 'active').
 
-  * /etc/horde directory is now restricted to root:www-data. Be sure that your
-    httpd server is running under the group www-data.
+  /etc/horde directory is now restricted to root:www-data. Be sure that your
+  httpd server is running under the group www-data.
 
  -- Gregory Colpart (evolix) <reg at evolix.fr>  Mon, 21 Jul 2008 03:23:51 +0200
diff --git a/debian/changelog b/debian/changelog
index d4ece21..3e7b76a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ horde3 (3.3.12+debian0-1) UNRELEASED; urgency=low
   * Housekeeping (thanks to lintian):
     - spelling error in README.Debian (writeable writable)
     - Update to standards version 3.9.2, no change required
+    - Don't use asterisks in NEWS.Debian
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Remove conflict on horde and old turba2 (very old packages)
 
  -- Mathieu Parent <sathieu at debian.org>  Sat, 07 Jan 2012 10:55:38 +0100
 
diff --git a/debian/control b/debian/control
index bcb0c88..e96abdf 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-php5 | libapache2-mod-php4 (>= 4:4.3.10) | php5-cgi | php4-cgi (>= 4:4.3.10), libapache2-mod-php5 | php5-cgi | php4-domxml, php5-gd, php5-mcrypt, php-log, php-mail, php-mail-mime, apache2 | httpd, libjs-scriptaculous
 Recommends: php5-mysql | php5-pgsql | php5-ldap, php5-cli, logrotate, php-file, php-date, php-services-weather (>= 1.3.1), php-db (>= 1.7.8), php-mdb2, php-mdb2-driver-mysql | php-mdb2-driver-pgsql | php-mdb2-driver-sqlite, locales, fckeditor, tinymce2 | tinymce (<< 3)
 Suggests: imp4, turba2, gollem, chora2, kronolith2, mnemo2, webcpp, xlhtml, ppthtml, wv, source-highlight, enscript, rpm, php5-mhash, gettext, php-net-imap, libgeoip1, unrtf, libwpd-tools, php5-auth-pam
-Conflicts: horde, turba2 (<< 2.1)
 Description: horde web application framework
  The Horde Framework is written in PHP, and provides the common
  tools a Web application requires: classes for dealing with preferences,
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Debian Horde Packages repository: horde3 package