ubuntu/+source/phpldapadmin:applied/ubuntu/trusty-proposed

Last commit made on 2014-05-12
Get this branch:
git clone -b applied/ubuntu/trusty-proposed https://git.launchpad.net/ubuntu/+source/phpldapadmin
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/trusty-proposed
Repository:
lp:ubuntu/+source/phpldapadmin

Recent commits

0e0725b... by Andrew Starr-Bochicchio on 2014-05-02

Import patches-applied version 1.2.2-5ubuntu1.1 to applied/ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: d8f3dfeb7b579b528fbae846474052957269295b
Unapplied parent: 4760f4cd4c9d860976da285383457c8d47d7b8c6

New changelog entries:
  * Adjust installation of conf file for Apache 2.4 (LP: #1246170).
   - Thanks to Geliy Sokolov!
  * Cherrypick patch from upstream bug tracker fixing compatibility
    with php 5.5 (LP: #1241425).

4760f4c... by Andrew Starr-Bochicchio on 2014-05-02

[PATCH] Fixed two issues to get phpLdapAdmin to work under PHP 5.5.x

Gbp-Pq: php-5.5-compat.patch.

b6493a5... by Andrew Starr-Bochicchio on 2014-05-02

upstream-XSS-2.patch

No DEP3 Subject or Description header found

Gbp-Pq: upstream-XSS-2.patch.

122b89f... by Andrew Starr-Bochicchio on 2014-05-02

upstream-XSS.patch

No DEP3 Subject or Description header found

Gbp-Pq: upstream-XSS.patch.

bebb016... by Andrew Starr-Bochicchio on 2014-05-02

Import patches-unapplied version 1.2.2-5ubuntu1.1 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 0e572b27bfa550efe2a90e473e9ff2032b96b8da

New changelog entries:
  * Adjust installation of conf file for Apache 2.4 (LP: #1246170).
   - Thanks to Geliy Sokolov!
  * Cherrypick patch from upstream bug tracker fixing compatibility
    with php 5.5 (LP: #1241425).

d8f3dfe... by Logan Rosen on 2012-12-02

Import patches-applied version 1.2.2-5ubuntu1 to applied/ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: f02cc584ea05e12e7c5dcf6bf5fdbba7ceaf8b37
Unapplied parent: f677fe4a596a0f884ccc873edc77e376fca6d557

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - Merged call to dh_install to install debian/additional-templates/*
    - added groupOfNames.xml
    - Adds php_value memory_limit 32M to the apache.conf.

0e572b2... by Logan Rosen on 2012-12-02

Import patches-unapplied version 1.2.2-5ubuntu1 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 2593a5d24f7488a9511b1071cbec47b2250c2960

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - Merged call to dh_install to install debian/additional-templates/*
    - added groupOfNames.xml
    - Adds php_value memory_limit 32M to the apache.conf.

f677fe4... by Logan Rosen on 2012-12-02

upstream-XSS-2.patch

No DEP3 Subject or Description header found

Gbp-Pq: upstream-XSS-2.patch.

3b81219... by Logan Rosen on 2012-12-02

upstream-XSS.patch

No DEP3 Subject or Description header found

Gbp-Pq: upstream-XSS.patch.

f02cc58... by Marcus Osdoba <email address hidden> on 2012-07-19

Import patches-applied version 1.2.2-5 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 4fb4c9fde1704b3d61c754512c419fb452daaf5d
Unapplied parent: 38bec56a69c498f288b76558732b0c03473d4a64

New changelog entries:
  * Debconf translations:
    - Spanish (Omar Campagne). Closes: #678119
    - Slovak (Ivan Mas├ír). Closes: #681531
  * Bump standards to 3.9.3 (no changes)