lp://staging/~logan/ubuntu/raring/phpldapadmin/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/raring/phpldapadmin at revision 31

Ubuntu branches: Pending requested 2012-12-02

Diff: 423 lines (+219/-44)

6 files modified

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
debian/changelog (+18/-0)
debian/control (+1/-1)
debian/po/es.po (+29/-43)
debian/po/sk.po (+169/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

31. By Logan Rosen on 2012-12-02

* 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.
* Debconf translations:
  - Spanish (Omar Campagne). Closes: #678119
  - Slovak (Ivan Masár). Closes: #681531
* Bump standards to 3.9.3 (no changes)

30. By Andrew Mitchell on 2012-03-24

* Merge from Debian testing. 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.

29. By Andrew Mitchell on 2012-02-28

* Merge from Debian testing. 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.

28. By Bhavani Shankar on 2011-11-13

* Merge from Debian testing. 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.

27. By Bhavani Shankar on 2010-10-21

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

26. By Bhavani Shankar on 2010-07-30

* Merge from debian unstable(LP: #611580). 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.

25. By Stefan Lesicnik on 2010-05-10

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

24. By Chuck Short on 2010-04-01

debian/patches/fix-ajax-estrict-declaration.dpatch: Fix E_STRICT
warning when loading phpldapadmin interface. (LP: #446669)

23. By Stephan Rügamer on 2010-02-17

* Merge from debian testing. Remaining changes:
  - Merged call to dh_install to install debian/additional-templates/*
  - Adds php_value memory_limit 32M to the apache.conf.

22. By Adam Sommer on 2009-05-14

[ Adam Sommer ]
* Merge from debian unstable, remaining changes (LP: #376766):
  - Merged call to dh_install to install debian/additional-templates/*
  - Adds php_value memory_limit 32M to the apache.conf.
* Configuration error fix. (LP: #333620)
* Alias objects now work. (LP: #223842)