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

Last commit made on 2014-05-02
Get this branch:
git clone -b applied/ubuntu/utopic-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/utopic-proposed
Repository:
lp:ubuntu/+source/phpldapadmin

Recent commits

94d32af... by Andrew Starr-Bochicchio on 2014-05-02

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

Imported using git-ubuntu import.

Changelog parent: f02cc584ea05e12e7c5dcf6bf5fdbba7ceaf8b37
Unapplied parent: a748afb884378e42ba7ac52e9eda26f92451c4f3

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

a748afb... 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.

06446be... 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.

736d9f4... by Andrew Starr-Bochicchio on 2014-05-02

upstream-XSS.patch

No DEP3 Subject or Description header found

Gbp-Pq: upstream-XSS.patch.

92d0bbf... by Andrew Starr-Bochicchio on 2014-05-02

Import patches-unapplied version 1.2.2-5.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 2593a5d24f7488a9511b1071cbec47b2250c2960

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

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)

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

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

Imported using git-ubuntu import.

Changelog parent: 5d8868485169d4f131682f20f7e9c4afc5dd0cdf

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

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

upstream-XSS-2.patch

No DEP3 Subject or Description header found

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

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

upstream-XSS.patch

No DEP3 Subject or Description header found

Gbp-Pq: upstream-XSS.patch.

4fb4c9f... by Fabio Tranchitella on 2012-03-12

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

Imported using git-ubuntu import.

Changelog parent: 43e186a25c384914df9aad44c7fa1c9187bf72c6
Unapplied parent: 5e42d638075f69dbc65a8dd899753508afc5d9f4

New changelog entries:
  * Debconf translations:
    - Dutch (Jeroen Schot). Closes: #661681
    - Swedish (Martin Bagge). Closes: #661350
    - Brazilian Portugese (J.S.Júnior). Closes: #661206