lp://qastaging/~lynxman/ubuntu/oneiric/apache2/fixeddefaultsite

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/ubuntu/oneiric/apache2

James Page: Disapprove on 2011-08-30

Ubuntu branches: Pending requested 2011-08-19

Diff: 30 lines (+12/-1)

2 files modified

debian/changelog (+11/-0)
debian/config-dir/sites-available/default (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

71. By Marc Cluet on 2011-08-19

* Expanded changelog to explain more in depth the problem we solved with this fix

70. By Marc Cluet on 2011-08-19

  * Changed default website config (LP: #820936)
    - debian/config-dir/sites-available/default: Changed Virtualhost
    definition to avoid bug LP: #820936

69. By Andres Rodriguez on 2011-05-23

* Merge from debian unstable (LP: #787013). Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debian/apache2.py, debian/apache2.2-common.install: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase.

68. By Chuck Short on 2011-04-11

* Merge from debian unstable. Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debain/apache2.py, debian/apache2.2-common.isntall: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase.

67. By Chuck Short on 2011-02-22

* Merge from debian unstable, remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debain/apache2.py, debian/apache2.2-common.isntall: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase.

66. By Chuck Short on 2011-02-01

debian/rules: Don't use "-fno-strict-aliasing" since it causes
apache FTBFS on amd64. (LP: #711293)

65. By Chuck Short on 2011-01-25

debian/rules: Use "-fno-strict-aliasing" to work around a gcc bug.
(LP: #697105)

64. By Chuck Short on 2011-01-02

* Merge from debian unstable. Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debain/apache2.py, debian/apache2.2-common.isntall: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase.

63. By Chuck Short on 2010-11-22

[Clint Byrum]
* Adding plymouth aware passphrase dialog program ask-for-passphrase.
  (LP: #582963)
  + debian/control: apache2.2-common depends on bash for ask-for-passphrase
  + debian/config-dir/mods-available/ssl.conf:
    - SSLPassPhraseDialog now uses exec:/usr/share/apache2/ask-for-passhrase

[Chuck Short]
* Add apport hook. (LP: #609177)
  + debian/apache2.py, debian/apache2.2-common.install

62. By Chuck Short on 2010-11-14

* Merge from debian unstable. Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree