[Pkg-fedora-ds-maintainers] 389-admin: Changes to 'master'

Thu May 28 07:56:32 UTC 2015

debian/389-admin.install                |    4 +--
 debian/changelog                        |    8 +++++++
 debian/control                          |   35 ++++++++++++++++++--------------
 debian/patches/fix-mime-magic-path.diff |   22 ++++++++++++++++++++
 debian/patches/series                   |    1 
 5 files changed, 53 insertions(+), 17 deletions(-)

New commits:
commit f7dd172194b1a30002b857dafcd65fba8f28285b
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu May 28 09:55:38 2015 +0300

    releasing package 389-admin version 1.1.38-2

diff --git a/debian/changelog b/debian/changelog
index e6c94b3..1be10ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-389-admin (1.1.38-2) UNRELEASED; urgency=medium
+389-admin (1.1.38-2) unstable; urgency=medium
 
   * fix-mime-magic-path.diff: Hardcode path to MIMEMagicFile.
   * control: Run wrap-and-sort.
   * control: Add mime-support to build-depends.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 28 May 2015 09:49:11 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 28 May 2015 09:55:27 +0300
 
 389-admin (1.1.38-1) unstable; urgency=medium
 

commit 082d23325471ff20b49acedf4e47032f964a5b0c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu May 28 09:55:25 2015 +0300

    control: Add mime-support to build-depends.

diff --git a/debian/changelog b/debian/changelog
index bcb2732..e6c94b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@
 
   * fix-mime-magic-path.diff: Hardcode path to MIMEMagicFile.
   * control: Run wrap-and-sort.
+  * control: Add mime-support to build-depends.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 28 May 2015 09:49:11 +0300
 
diff --git a/debian/control b/debian/control
index 5865844..5c772b6 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
  libnss3-dev,
  libperl-dev,
  libsasl2-dev,
+ mime-support,
  pkg-config,
  po-debconf,
  quilt

commit 94b779270cb73b1c59d115d51c8f2d0f7875fea5
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu May 28 09:54:35 2015 +0300

    control: Run wrap-and-sort.

diff --git a/debian/389-admin.install b/debian/389-admin.install
index 894c85e..92461ce 100644
--- a/debian/389-admin.install
+++ b/debian/389-admin.install
@@ -1,6 +1,6 @@
-etc/dirsrv/admin-serv/*.conf
 etc/default/dirsrv-admin
+etc/dirsrv/admin-serv/*.conf
+usr/lib/*/dirsrv/*
 usr/sbin/*
 usr/share/dirsrv/*
-usr/lib/*/dirsrv/*
 usr/share/man/man8/*
diff --git a/debian/changelog b/debian/changelog
index 77b2c1f..bcb2732 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 389-admin (1.1.38-2) UNRELEASED; urgency=medium
 
   * fix-mime-magic-path.diff: Hardcode path to MIMEMagicFile.
+  * control: Run wrap-and-sort.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 28 May 2015 09:49:11 +0300
 
diff --git a/debian/control b/debian/control
index 5278b26..5865844 100644
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,23 @@ Section: net
 Priority: optional
 Maintainer: Debian 389ds Team <pkg-fedora-ds-maintainers at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at debian.org>
-Build-Depends: quilt, debhelper (>= 9),
+Build-Depends:
+ 389-ds-base-dev,
+ apache2-dev,
+ debconf-utils,
+ debhelper (>= 9),
  dh-autoreconf,
+ libadminutil-dev,
+ libapache2-mod-nss,
+ libicu-dev,
+ libldap2-dev (>= 2.4.28-1~),
  libnspr4-dev,
  libnss3-dev,
+ libperl-dev,
  libsasl2-dev,
- libldap2-dev (>= 2.4.28-1~),
- libicu-dev,
  pkg-config,
- debconf-utils,
- libperl-dev,
  po-debconf,
- 389-ds-base-dev,
- apache2-dev,
- libadminutil-dev,
- libapache2-mod-nss,
+ quilt
 Standards-Version: 3.9.6
 Homepage: http://directory.fedoraproject.org
 Vcs-Git: git://anonscm.debian.org/pkg-fedora-ds/389-admin.git
@@ -27,7 +29,7 @@ Package: libds-admin-serv0
 Section: libs
 Architecture: any
 Pre-Depends: debconf (>= 0.5) | debconf-2.0, ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Multi-Arch: same
 Description: Libraries for the 389 Directory Administration Server
  389 Directory Administration Server is an HTTP agent that provides
@@ -41,13 +43,15 @@ Description: Libraries for the 389 Directory Administration Server
 Package: 389-admin
 Architecture: any
 Pre-Depends: debconf (>= 0.5) | debconf-2.0, ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends},
- libds-admin-serv0 (= ${binary:Version}),
- libnss3-tools,
- libmozilla-ldap-perl,
- libapache2-mod-nss,
+Depends:
  389-ds-base,
  apache2,
+ libapache2-mod-nss,
+ libds-admin-serv0 (= ${binary:Version}),
+ libmozilla-ldap-perl,
+ libnss3-tools,
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: 389 Directory Administration Server
  389 Directory Administration Server is an HTTP agent that provides
  management features for 389 Directory Server. It provides some

commit bcffc9d96981040ccee7eeee8c48776a0837565a
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu May 28 09:49:28 2015 +0300

    fix-mime-magic-path.diff: Hardcode path to MIMEMagicFile.

diff --git a/debian/changelog b/debian/changelog
index 6731386..77b2c1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+389-admin (1.1.38-2) UNRELEASED; urgency=medium
+
+  * fix-mime-magic-path.diff: Hardcode path to MIMEMagicFile.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 28 May 2015 09:49:11 +0300
+
 389-admin (1.1.38-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/fix-mime-magic-path.diff b/debian/patches/fix-mime-magic-path.diff
new file mode 100644
index 0000000..d05f2ae
--- /dev/null
+++ b/debian/patches/fix-mime-magic-path.diff
@@ -0,0 +1,22 @@
+diff --git a/m4/httpd.m4 b/m4/httpd.m4
+index b72054c..752eaa7 100644
+--- a/m4/httpd.m4
++++ b/m4/httpd.m4
+@@ -61,11 +61,12 @@ esac
+ 
+ httpdconf=${httpd_root}/${httpd_conf_rel}
+ 
+-mimemagic=`awk '"MIMEMagicFile" == $1" {print $2}' $httpdconf`
+-if test ! -f "$mimemagic" ; then
+-# assume relative to root
+-    mimemagic=${httpd_root}/${mimemagic}
+-fi
++mimemagic=/etc/apache2/magic
++#mimemagic=`awk '"MIMEMagicFile" == $1" {print $2}' $httpdconf`
++#if test ! -f "$mimemagic" ; then
++## assume relative to root
++#    mimemagic=${httpd_root}/${mimemagic}
++#fi
+ 
+ # check for mime.types file
+ httpdconfdir=`dirname $httpdconf`
diff --git a/debian/patches/series b/debian/patches/series
index 94a7418..b77f98a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-typos.patch
 fix-hyphen-used-as-minus-sign.patch
 fix-group-name.patch
 add-softokn-ldlibpath.diff
+fix-mime-magic-path.diff

