| Index: trunk/debs/wikimedia-task-appserver/debian/dirs |
| — | — | @@ -2,3 +2,4 @@ |
| 3 | 3 | etc/apache2 |
| 4 | 4 | usr/local/apache |
| 5 | 5 | etc/php5/apache2/ |
| | 6 | +usr/share/php5 |
| Index: trunk/debs/wikimedia-task-appserver/debian/postrm |
| — | — | @@ -31,7 +31,8 @@ |
| 32 | 32 | purge) |
| 33 | 33 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/apache2.conf |
| 34 | 34 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/php5/apache2/php.ini |
| 35 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/sudoers |
| | 35 | + dpkg-divert --package wikimedia-task-appserver --rename --remove /usr/share/php5/php.ini-dist |
| | 36 | + dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/sudoers |
| 36 | 37 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/envvars |
| 37 | 38 | ;; |
| 38 | 39 | remove) |
| Index: trunk/debs/wikimedia-task-appserver/debian/preinst |
| — | — | @@ -22,6 +22,8 @@ |
| 23 | 23 | dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 24 | 24 | --divert /etc/php5/apache2/php.ini.default /etc/php5/apache2/php.ini |
| 25 | 25 | dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 26 | + --divert /usr/share/php5/php.ini-dist.default /usr/share/php5/php.ini-dist |
| | 27 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 26 | 28 | --divert /etc/sudoers.default /etc/sudoers |
| 27 | 29 | dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 28 | 30 | --divert /etc/apache2/envvars.default /etc/apache2/envvars |
| Index: trunk/debs/wikimedia-task-appserver/debian/changelog |
| — | — | @@ -1,3 +1,16 @@ |
| | 2 | +wikimedia-task-appserver (1.20) feisty; urgency=low |
| | 3 | + |
| | 4 | + * Alternate approach to solving the ucf conflict: replace ucf master file as |
| | 5 | + well |
| | 6 | + |
| | 7 | + -- Mark Bergsma <mark@wikimedia.org> Thu, 30 Aug 2007 13:43:50 +0000 |
| | 8 | + |
| | 9 | +wikimedia-task-appserver (1.19) feisty; urgency=low |
| | 10 | + |
| | 11 | + * divert ucf files as well to avoid prompting |
| | 12 | + |
| | 13 | + -- Mark Bergsma <mark@wikimedia.org> Thu, 30 Aug 2007 13:34:04 +0000 |
| | 14 | + |
| 2 | 15 | wikimedia-task-appserver (1.18) feisty; urgency=low |
| 3 | 16 | |
| 4 | 17 | * Put the Mediawiki sync scripts in the postinst |
| Index: trunk/debs/wikimedia-task-appserver/debian/rules |
| — | — | @@ -51,6 +51,7 @@ |
| 52 | 52 | install -m 0644 apache2.conf $(DESTDIR)/etc/apache2 |
| 53 | 53 | install -m 0644 envvars $(DESTDIR)/etc/apache2 |
| 54 | 54 | install -m 0644 php.ini $(DESTDIR)/etc/php5/apache2 |
| | 55 | + install -m 0644 php.ini $(DESTDIR)/usr/share/php5/php.ini-dist |
| 55 | 56 | install -m 0400 sudoers $(DESTDIR)/etc/ |
| 56 | 57 | |
| 57 | 58 | # Build architecture-independent files here. |