Merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335 into lp://qastaging/ubuntu/lucid/zabbix
- Lucid (10.04)
- lucid-201002122335
- Merge into lucid
Proposed by
James Westby
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335 |
| Merge into: | lp://qastaging/ubuntu/lucid/zabbix |
| Diff against target: |
465 lines (+284/-0) (has conflicts) 15 files modified
debian/NEWS.Debian (+15/-0) debian/README.source (+10/-0) debian/changelog (+29/-0) debian/control (+4/-0) debian/po/cs.po (+4/-0) debian/po/es.po (+4/-0) debian/po/fr.po (+4/-0) debian/po/it.po (+4/-0) debian/po/pt.po (+4/-0) debian/po/ru.po (+4/-0) debian/po/sv.po (+4/-0) debian/po/templates.pot (+4/-0) debian/zabbix-frontend-php.links (+4/-0) debian/zabbix-server-mysql.zabbix-server.init (+95/-0) debian/zabbix-server-pgsql.zabbix-server.init (+95/-0) Text conflict in debian/NEWS.Debian Text conflict in debian/README.source Text conflict in debian/changelog Text conflict in debian/control Text conflict in debian/po/cs.po Text conflict in debian/po/es.po Text conflict in debian/po/fr.po Text conflict in debian/po/it.po Text conflict in debian/po/pt.po Text conflict in debian/po/ru.po Text conflict in debian/po/sv.po Text conflict in debian/po/templates.pot Text conflict in debian/zabbix-frontend-php.links Text conflict in debian/zabbix-server-mysql.zabbix-server.init Text conflict in debian/zabbix-server-pgsql.zabbix-server.init |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335 |
| Related bugs: |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 24. By Fabio Tranchitella
-
Set Default-Start to "2 3 4 5" and Default-Stop to "0 1 6" for all the init
scripts.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'debian/NEWS.Debian' | |||
| 2 | --- debian/NEWS.Debian 2010-01-28 10:42:04 +0000 | |||
| 3 | +++ debian/NEWS.Debian 2010-02-12 23:42:15 +0000 | |||
| 4 | @@ -1,3 +1,4 @@ | |||
| 5 | 1 | <<<<<<< TREE | ||
| 6 | 1 | zabbix (1:1.8.1-1) unstable; urgency=low | 2 | zabbix (1:1.8.1-1) unstable; urgency=low |
| 7 | 2 | 3 | ||
| 8 | 3 | The Zabbix developers note that if Zabbix 1.8 is used with a node-based | 4 | The Zabbix developers note that if Zabbix 1.8 is used with a node-based |
| 9 | @@ -35,3 +36,17 @@ | |||
| 10 | 35 | 36 | ||
| 11 | 36 | -- Christoph Haas <haas@debian.org> Thu, 29 Oct 2009 21:28:03 +0100 | 37 | -- Christoph Haas <haas@debian.org> Thu, 29 Oct 2009 21:28:03 +0100 |
| 12 | 37 | 38 | ||
| 13 | 39 | ======= | ||
| 14 | 40 | zabbix (1:1.6.6-4) unstable; urgency=low | ||
| 15 | 41 | |||
| 16 | 42 | The zabbix_agent has been removed which could be used to start the Zabbix | ||
| 17 | 43 | agent from inetd or xinetd. It is recommended to use the zabbix_agentd | ||
| 18 | 44 | instead which is a standalone agent process running permanently which is | ||
| 19 | 45 | started from /etc/init.d/zabbix-agent by default. | ||
| 20 | 46 | |||
| 21 | 47 | It is safe to remove the /etc/zabbix/zabbix_agent.conf. The standalone | ||
| 22 | 48 | zabbix_agentd process only uses the /etc/zabbix/zabbix_agentd.conf file. | ||
| 23 | 49 | |||
| 24 | 50 | -- Christoph Haas <haas@debian.org> Thu, 29 Oct 2009 21:28:03 +0100 | ||
| 25 | 51 | |||
| 26 | 52 | >>>>>>> MERGE-SOURCE | ||
| 27 | 38 | 53 | ||
| 28 | === modified file 'debian/README.source' | |||
| 29 | --- debian/README.source 2009-12-30 18:46:34 +0000 | |||
| 30 | +++ debian/README.source 2010-02-12 23:42:15 +0000 | |||
| 31 | @@ -1,3 +1,4 @@ | |||
| 32 | 1 | <<<<<<< TREE | ||
| 33 | 1 | This package uses 'dpatch' to add patches. See | 2 | This package uses 'dpatch' to add patches. See |
| 34 | 2 | /usr/share/doc/dpatch/README.source.gz on how this works. | 3 | /usr/share/doc/dpatch/README.source.gz on how this works. |
| 35 | 3 | 4 | ||
| 36 | @@ -22,3 +23,12 @@ | |||
| 37 | 22 | [ ] currently the resulting .diff.gz is huge due to the relibtoolizing | 23 | [ ] currently the resulting .diff.gz is huge due to the relibtoolizing |
| 38 | 23 | 24 | ||
| 39 | 24 | [X] use the font from the appropriate Debian package (lintian warning) | 25 | [X] use the font from the appropriate Debian package (lintian warning) |
| 40 | 26 | ======= | ||
| 41 | 27 | This package uses 'dpatch' to add patches. See | ||
| 42 | 28 | /usr/share/doc/dpatch/README.source.gz on how this works. | ||
| 43 | 29 | |||
| 44 | 30 | Currently we use it to avoid building with libssl. The libssl | ||
| 45 | 31 | license is not GPL compatible and thus linking against it is | ||
| 46 | 32 | a GPL violation. | ||
| 47 | 33 | |||
| 48 | 34 | >>>>>>> MERGE-SOURCE | ||
| 49 | 25 | 35 | ||
| 50 | === modified file 'debian/changelog' | |||
| 51 | --- debian/changelog 2010-01-28 10:42:04 +0000 | |||
| 52 | +++ debian/changelog 2010-02-12 23:42:15 +0000 | |||
| 53 | @@ -1,3 +1,4 @@ | |||
| 54 | 1 | <<<<<<< TREE | ||
| 55 | 1 | zabbix (1:1.8.1-1) unstable; urgency=low | 2 | zabbix (1:1.8.1-1) unstable; urgency=low |
| 56 | 2 | 3 | ||
| 57 | 3 | * New upstream release | 4 | * New upstream release |
| 58 | @@ -64,6 +65,34 @@ | |||
| 59 | 64 | 65 | ||
| 60 | 65 | -- Christoph Haas <haas@debian.org> Sun, 11 Oct 2009 12:51:45 +0200 | 66 | -- Christoph Haas <haas@debian.org> Sun, 11 Oct 2009 12:51:45 +0200 |
| 61 | 66 | 67 | ||
| 62 | 68 | ======= | ||
| 63 | 69 | zabbix (1:1.6.6-5) unstable; urgency=low | ||
| 64 | 70 | |||
| 65 | 71 | * Set Default-Start to "2 3 4 5" and Default-Stop to "0 1 6" for all the init | ||
| 66 | 72 | scripts. | ||
| 67 | 73 | |||
| 68 | 74 | -- Fabio Tranchitella <kobold@debian.org> Thu, 05 Nov 2009 14:07:01 +0100 | ||
| 69 | 75 | |||
| 70 | 76 | zabbix (1:1.6.6-4) unstable; urgency=low | ||
| 71 | 77 | |||
| 72 | 78 | * Added README.source describing the patch and used. | ||
| 73 | 79 | * Removed zabbix_agent. By default the zabbix_agentd is used | ||
| 74 | 80 | by default anyway. | ||
| 75 | 81 | * Added manpage for zabbix_sender. | ||
| 76 | 82 | * Using the prototype.js from the libjs-prototype package. | ||
| 77 | 83 | * Typo in init.d scripts for zabbix-server-mysql and zabbix-server-pgsql | ||
| 78 | 84 | fixed to remove"/etc/init.d/zabbix-server: line 112: running_name: | ||
| 79 | 85 | command not found" warning when starting the server. | ||
| 80 | 86 | |||
| 81 | 87 | -- Christoph Haas <haas@debian.org> Thu, 29 Oct 2009 21:28:03 +0100 | ||
| 82 | 88 | |||
| 83 | 89 | zabbix (1:1.6.6-3) unstable; urgency=low | ||
| 84 | 90 | |||
| 85 | 91 | * debian/po/fi.po updated (Closes: #549855) | ||
| 86 | 92 | |||
| 87 | 93 | -- Christoph Haas <haas@debian.org> Sun, 11 Oct 2009 12:51:45 +0200 | ||
| 88 | 94 | |||
| 89 | 95 | >>>>>>> MERGE-SOURCE | ||
| 90 | 67 | zabbix (1:1.6.6-2) unstable; urgency=low | 96 | zabbix (1:1.6.6-2) unstable; urgency=low |
| 91 | 68 | 97 | ||
| 92 | 69 | * debian/po/ja.po updated (Closes: #548651) | 98 | * debian/po/ja.po updated (Closes: #548651) |
| 93 | 70 | 99 | ||
| 94 | === modified file 'debian/control' | |||
| 95 | --- debian/control 2010-01-28 10:42:04 +0000 | |||
| 96 | +++ debian/control 2010-02-12 23:42:15 +0000 | |||
| 97 | @@ -70,7 +70,11 @@ | |||
| 98 | 70 | 70 | ||
| 99 | 71 | Package: zabbix-frontend-php | 71 | Package: zabbix-frontend-php |
| 100 | 72 | Architecture: all | 72 | Architecture: all |
| 101 | 73 | <<<<<<< TREE | ||
| 102 | 73 | Depends: ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, ucf, dbconfig-common (>= 1.8.19), libjs-prototype (>= 1.6.0.3), libjs-scriptaculous (>= 1.8.2), ttf-dejavu-core | 74 | Depends: ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, ucf, dbconfig-common (>= 1.8.19), libjs-prototype (>= 1.6.0.3), libjs-scriptaculous (>= 1.8.2), ttf-dejavu-core |
| 103 | 75 | ======= | ||
| 104 | 76 | Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, ucf, dbconfig-common (>= 1.8.19), libjs-prototype (>= 1.6.0.2), ${misc:Depends} | ||
| 105 | 77 | >>>>>>> MERGE-SOURCE | ||
| 106 | 74 | Recommends: zabbix-server-mysql | zabbix-server-pgsql, mysql-server (>= 4.0.16-2) | postgresql | 78 | Recommends: zabbix-server-mysql | zabbix-server-pgsql, mysql-server (>= 4.0.16-2) | postgresql |
| 107 | 75 | Description: network monitoring solution - PHP front-end | 79 | Description: network monitoring solution - PHP front-end |
| 108 | 76 | Zabbix is a server/client network monitoring system with many features. | 80 | Zabbix is a server/client network monitoring system with many features. |
| 109 | 77 | 81 | ||
| 110 | === modified file 'debian/po/cs.po' | |||
| 111 | --- debian/po/cs.po 2009-12-30 18:46:34 +0000 | |||
| 112 | +++ debian/po/cs.po 2010-02-12 23:42:15 +0000 | |||
| 113 | @@ -7,7 +7,11 @@ | |||
| 114 | 7 | msgstr "" | 7 | msgstr "" |
| 115 | 8 | "Project-Id-Version: zabbix 1:1.1.1-3\n" | 8 | "Project-Id-Version: zabbix 1:1.1.1-3\n" |
| 116 | 9 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 9 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 117 | 10 | <<<<<<< TREE | ||
| 118 | 10 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" | 11 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" |
| 119 | 12 | ======= | ||
| 120 | 13 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 121 | 14 | >>>>>>> MERGE-SOURCE | ||
| 122 | 11 | "PO-Revision-Date: 2009-09-28 08:03+0200\n" | 15 | "PO-Revision-Date: 2009-09-28 08:03+0200\n" |
| 123 | 12 | "Last-Translator: Martin Sin <martin.sin@zshk.cz>\n" | 16 | "Last-Translator: Martin Sin <martin.sin@zshk.cz>\n" |
| 124 | 13 | "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" | 17 | "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" |
| 125 | 14 | 18 | ||
| 126 | === modified file 'debian/po/es.po' | |||
| 127 | --- debian/po/es.po 2009-12-30 18:46:34 +0000 | |||
| 128 | +++ debian/po/es.po 2010-02-12 23:42:15 +0000 | |||
| 129 | @@ -28,7 +28,11 @@ | |||
| 130 | 28 | msgstr "" | 28 | msgstr "" |
| 131 | 29 | "Project-Id-Version: zabbix 1:1.6.6-1\n" | 29 | "Project-Id-Version: zabbix 1:1.6.6-1\n" |
| 132 | 30 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 30 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 133 | 31 | <<<<<<< TREE | ||
| 134 | 31 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" | 32 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" |
| 135 | 33 | ======= | ||
| 136 | 34 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 137 | 35 | >>>>>>> MERGE-SOURCE | ||
| 138 | 32 | "PO-Revision-Date: 2009-09-28 08:48+0100\n" | 36 | "PO-Revision-Date: 2009-09-28 08:48+0100\n" |
| 139 | 33 | "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" | 37 | "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" |
| 140 | 34 | "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" | 38 | "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" |
| 141 | 35 | 39 | ||
| 142 | === modified file 'debian/po/fr.po' | |||
| 143 | --- debian/po/fr.po 2009-12-30 18:46:34 +0000 | |||
| 144 | +++ debian/po/fr.po 2010-02-12 23:42:15 +0000 | |||
| 145 | @@ -9,7 +9,11 @@ | |||
| 146 | 9 | msgstr "" | 9 | msgstr "" |
| 147 | 10 | "Project-Id-Version: zabbix\n" | 10 | "Project-Id-Version: zabbix\n" |
| 148 | 11 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 11 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 149 | 12 | <<<<<<< TREE | ||
| 150 | 12 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" | 13 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" |
| 151 | 14 | ======= | ||
| 152 | 15 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 153 | 16 | >>>>>>> MERGE-SOURCE | ||
| 154 | 13 | "PO-Revision-Date: 2009-09-28 19:56+0100\n" | 17 | "PO-Revision-Date: 2009-09-28 19:56+0100\n" |
| 155 | 14 | "Last-Translator: Guillaume Delacour <gui@iroqwa.org>\n" | 18 | "Last-Translator: Guillaume Delacour <gui@iroqwa.org>\n" |
| 156 | 15 | "Language-Team: French <debian-l10n-french@lists.debian.org>\n" | 19 | "Language-Team: French <debian-l10n-french@lists.debian.org>\n" |
| 157 | 16 | 20 | ||
| 158 | === modified file 'debian/po/it.po' | |||
| 159 | --- debian/po/it.po 2009-12-30 18:46:34 +0000 | |||
| 160 | +++ debian/po/it.po 2010-02-12 23:42:15 +0000 | |||
| 161 | @@ -7,7 +7,11 @@ | |||
| 162 | 7 | msgstr "" | 7 | msgstr "" |
| 163 | 8 | "Project-Id-Version: zabbix 1:1.6.6 italian debconf templates\n" | 8 | "Project-Id-Version: zabbix 1:1.6.6 italian debconf templates\n" |
| 164 | 9 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 9 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 165 | 10 | <<<<<<< TREE | ||
| 166 | 10 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" | 11 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" |
| 167 | 12 | ======= | ||
| 168 | 13 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 169 | 14 | >>>>>>> MERGE-SOURCE | ||
| 170 | 11 | "PO-Revision-Date: 2009-10-04 15:51+0200\n" | 15 | "PO-Revision-Date: 2009-10-04 15:51+0200\n" |
| 171 | 12 | "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" | 16 | "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n" |
| 172 | 13 | "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" | 17 | "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" |
| 173 | 14 | 18 | ||
| 174 | === modified file 'debian/po/pt.po' | |||
| 175 | --- debian/po/pt.po 2009-12-30 18:46:34 +0000 | |||
| 176 | +++ debian/po/pt.po 2010-02-12 23:42:15 +0000 | |||
| 177 | @@ -7,7 +7,11 @@ | |||
| 178 | 7 | msgstr "" | 7 | msgstr "" |
| 179 | 8 | "Project-Id-Version: zabbix 1.1.3-1\n" | 8 | "Project-Id-Version: zabbix 1.1.3-1\n" |
| 180 | 9 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 9 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 181 | 10 | <<<<<<< TREE | ||
| 182 | 10 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" | 11 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" |
| 183 | 12 | ======= | ||
| 184 | 13 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 185 | 14 | >>>>>>> MERGE-SOURCE | ||
| 186 | 11 | "PO-Revision-Date: 2009-10-07 10:00+0100\n" | 15 | "PO-Revision-Date: 2009-10-07 10:00+0100\n" |
| 187 | 12 | "Last-Translator: Tiago Fernandes <tjg.fernandes@gmail.com>\n" | 16 | "Last-Translator: Tiago Fernandes <tjg.fernandes@gmail.com>\n" |
| 188 | 13 | "Language-Team: Portuguese <traduz@debianpt.org>\n" | 17 | "Language-Team: Portuguese <traduz@debianpt.org>\n" |
| 189 | 14 | 18 | ||
| 190 | === modified file 'debian/po/ru.po' | |||
| 191 | --- debian/po/ru.po 2009-12-30 18:46:34 +0000 | |||
| 192 | +++ debian/po/ru.po 2010-02-12 23:42:15 +0000 | |||
| 193 | @@ -9,7 +9,11 @@ | |||
| 194 | 9 | msgstr "" | 9 | msgstr "" |
| 195 | 10 | "Project-Id-Version: zabbix 1:1.6.6-1\n" | 10 | "Project-Id-Version: zabbix 1:1.6.6-1\n" |
| 196 | 11 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 11 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 197 | 12 | <<<<<<< TREE | ||
| 198 | 12 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" | 13 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" |
| 199 | 14 | ======= | ||
| 200 | 15 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 201 | 16 | >>>>>>> MERGE-SOURCE | ||
| 202 | 13 | "PO-Revision-Date: 2009-10-04 13:02+0400\n" | 17 | "PO-Revision-Date: 2009-10-04 13:02+0400\n" |
| 203 | 14 | "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n" | 18 | "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n" |
| 204 | 15 | "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" | 19 | "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" |
| 205 | 16 | 20 | ||
| 206 | === modified file 'debian/po/sv.po' | |||
| 207 | --- debian/po/sv.po 2009-12-30 18:46:34 +0000 | |||
| 208 | +++ debian/po/sv.po 2010-02-12 23:42:15 +0000 | |||
| 209 | @@ -9,7 +9,11 @@ | |||
| 210 | 9 | msgstr "" | 9 | msgstr "" |
| 211 | 10 | "Project-Id-Version: zabbix debconf\n" | 10 | "Project-Id-Version: zabbix debconf\n" |
| 212 | 11 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 11 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 213 | 12 | <<<<<<< TREE | ||
| 214 | 12 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" | 13 | "POT-Creation-Date: 2009-12-30 18:48+0100\n" |
| 215 | 14 | ======= | ||
| 216 | 15 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 217 | 16 | >>>>>>> MERGE-SOURCE | ||
| 218 | 13 | "PO-Revision-Date: 2009-09-28 22:13+0100\n" | 17 | "PO-Revision-Date: 2009-09-28 22:13+0100\n" |
| 219 | 14 | "Last-Translator: Martin Bagge <brother@bsnet.se>\n" | 18 | "Last-Translator: Martin Bagge <brother@bsnet.se>\n" |
| 220 | 15 | "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" | 19 | "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" |
| 221 | 16 | 20 | ||
| 222 | === modified file 'debian/po/templates.pot' | |||
| 223 | --- debian/po/templates.pot 2010-01-28 10:42:04 +0000 | |||
| 224 | +++ debian/po/templates.pot 2010-02-12 23:42:15 +0000 | |||
| 225 | @@ -8,7 +8,11 @@ | |||
| 226 | 8 | msgstr "" | 8 | msgstr "" |
| 227 | 9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
| 228 | 10 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" | 10 | "Report-Msgid-Bugs-To: zabbix@packages.debian.org\n" |
| 229 | 11 | <<<<<<< TREE | ||
| 230 | 11 | "POT-Creation-Date: 2010-01-28 11:58+0100\n" | 12 | "POT-Creation-Date: 2010-01-28 11:58+0100\n" |
| 231 | 13 | ======= | ||
| 232 | 14 | "POT-Creation-Date: 2009-11-05 14:09+0100\n" | ||
| 233 | 15 | >>>>>>> MERGE-SOURCE | ||
| 234 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 16 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
| 235 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 17 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
| 236 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 18 | "Language-Team: LANGUAGE <LL@li.org>\n" |
| 237 | 15 | 19 | ||
| 238 | === modified file 'debian/zabbix-agent.init' | |||
| 239 | === modified file 'debian/zabbix-frontend-php.links' | |||
| 240 | --- debian/zabbix-frontend-php.links 2010-01-28 10:42:04 +0000 | |||
| 241 | +++ debian/zabbix-frontend-php.links 2010-02-12 23:42:15 +0000 | |||
| 242 | @@ -1,5 +1,9 @@ | |||
| 243 | 1 | <<<<<<< TREE | ||
| 244 | 1 | usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/zabbix/fonts/DejaVuSans.ttf | 2 | usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/zabbix/fonts/DejaVuSans.ttf |
| 245 | 2 | usr/share/javascript/prototype/prototype.js usr/share/zabbix/js/prototype.js | 3 | usr/share/javascript/prototype/prototype.js usr/share/zabbix/js/prototype.js |
| 246 | 3 | usr/share/javascript/scriptaculous/scriptaculous.js usr/share/zabbix/js/scriptaculous.js | 4 | usr/share/javascript/scriptaculous/scriptaculous.js usr/share/zabbix/js/scriptaculous.js |
| 247 | 4 | usr/share/javascript/scriptaculous/dragdrop.js usr/share/zabbix/js/dragdrop.js | 5 | usr/share/javascript/scriptaculous/dragdrop.js usr/share/zabbix/js/dragdrop.js |
| 248 | 5 | usr/share/javascript/scriptaculous/effects.js usr/share/zabbix/js/effects.js | 6 | usr/share/javascript/scriptaculous/effects.js usr/share/zabbix/js/effects.js |
| 249 | 7 | ======= | ||
| 250 | 8 | usr/share/javascript/prototype/prototype.js usr/share/zabbix/js/prototype.js | ||
| 251 | 9 | >>>>>>> MERGE-SOURCE | ||
| 252 | 6 | 10 | ||
| 253 | === modified file 'debian/zabbix-proxy-mysql.zabbix-proxy.init' | |||
| 254 | === modified file 'debian/zabbix-proxy-pgsql.zabbix-proxy.init' | |||
| 255 | === modified file 'debian/zabbix-server-mysql.zabbix-server.init' | |||
| 256 | --- debian/zabbix-server-mysql.zabbix-server.init 2009-12-30 18:46:34 +0000 | |||
| 257 | +++ debian/zabbix-server-mysql.zabbix-server.init 2010-02-12 23:42:15 +0000 | |||
| 258 | @@ -25,6 +25,101 @@ | |||
| 259 | 25 | chown -R zabbix:zabbix "$DIR" | 25 | chown -R zabbix:zabbix "$DIR" |
| 260 | 26 | fi | 26 | fi |
| 261 | 27 | 27 | ||
| 262 | 28 | <<<<<<< TREE | ||
| 263 | 29 | ======= | ||
| 264 | 30 | set -e | ||
| 265 | 31 | |||
| 266 | 32 | # Check if a given process pid's cmdline matches a given name | ||
| 267 | 33 | running() | ||
| 268 | 34 | { | ||
| 269 | 35 | # No pidfile, probably no daemon present | ||
| 270 | 36 | [ ! -f "$PIDFILE" ] && return 1 | ||
| 271 | 37 | pid=`cat $PIDFILE` | ||
| 272 | 38 | |||
| 273 | 39 | # No pid, probably no daemon present | ||
| 274 | 40 | [ -z "$pid" ] && return 1 | ||
| 275 | 41 | |||
| 276 | 42 | [ ! -d /proc/$pid ] && return 1 | ||
| 277 | 43 | cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` | ||
| 278 | 44 | # Is this the expected child? | ||
| 279 | 45 | [ "$cmd" != "$DAEMON" ] && return 1 | ||
| 280 | 46 | |||
| 281 | 47 | return 0 | ||
| 282 | 48 | } | ||
| 283 | 49 | |||
| 284 | 50 | # Check if a given process' childrens are running | ||
| 285 | 51 | running_child() | ||
| 286 | 52 | { | ||
| 287 | 53 | [ -z "$NAME" ] && return 1 | ||
| 288 | 54 | if ps -eo ppid,pid,comm |grep -q $NAME; then | ||
| 289 | 55 | return 0 | ||
| 290 | 56 | fi | ||
| 291 | 57 | return 1 | ||
| 292 | 58 | } | ||
| 293 | 59 | |||
| 294 | 60 | |||
| 295 | 61 | |||
| 296 | 62 | force_stop() { | ||
| 297 | 63 | [ ! -e "$PIDFILE" ] && return | ||
| 298 | 64 | if running ; then | ||
| 299 | 65 | pid=`cat $PIDFILE` | ||
| 300 | 66 | kill -15 $pid | ||
| 301 | 67 | # Is it really dead? | ||
| 302 | 68 | [ -n "$DODTIME" ] && sleep "$DODTIME"s | ||
| 303 | 69 | if running ; then | ||
| 304 | 70 | kill -9 $pid | ||
| 305 | 71 | [ -n "$DODTIME" ] && sleep "$DODTIME"s | ||
| 306 | 72 | if running ; then | ||
| 307 | 73 | echo "Cannot kill $DESC (pid=$pid)!" | ||
| 308 | 74 | exit 1 | ||
| 309 | 75 | fi | ||
| 310 | 76 | fi | ||
| 311 | 77 | fi | ||
| 312 | 78 | rm -f $PIDFILE | ||
| 313 | 79 | } | ||
| 314 | 80 | |||
| 315 | 81 | # Maybe the process is not running, but its children are | ||
| 316 | 82 | force_child_stop() | ||
| 317 | 83 | { | ||
| 318 | 84 | # Kill the children by name, it's safer not to use a variable here | ||
| 319 | 85 | killall -15 zabbix_server | ||
| 320 | 86 | } | ||
| 321 | 87 | |||
| 322 | 88 | # Checks if the process is properly dead | ||
| 323 | 89 | check_death() | ||
| 324 | 90 | { | ||
| 325 | 91 | [ -n "$DODTIME" ] && DODTIME=2 | ||
| 326 | 92 | [ -n "$MAX_DIETIME" ] && MAX_DIETIME=15 | ||
| 327 | 93 | sleep "$DODTIME"s | ||
| 328 | 94 | if running; then | ||
| 329 | 95 | echo "$DESC did not stop in $DODTIME seconds, forcing it to stop" | ||
| 330 | 96 | force_stop | ||
| 331 | 97 | fi | ||
| 332 | 98 | if running; then | ||
| 333 | 99 | echo "ERROR: $DESC did not die in the expected time, consider increasing DODTIME (currently $DODTIME)" | ||
| 334 | 100 | exit 1 | ||
| 335 | 101 | fi | ||
| 336 | 102 | # Wait for the children to stop | ||
| 337 | 103 | if running_child; then | ||
| 338 | 104 | echo -n "Waiting for child processes to die" | ||
| 339 | 105 | force_child_stop | ||
| 340 | 106 | for wait in `seq $MAX_DIETIME`; do | ||
| 341 | 107 | if ! running_child; then break ; fi | ||
| 342 | 108 | echo -n "." | ||
| 343 | 109 | force_child_stop | ||
| 344 | 110 | sleep $wait | ||
| 345 | 111 | done | ||
| 346 | 112 | echo | ||
| 347 | 113 | fi | ||
| 348 | 114 | if running_child; then | ||
| 349 | 115 | echo "ERROR: $DESC's children processes did not die in the expected time, consider increasing MAX_DIETIME (currently $MAX_DIETIME)" | ||
| 350 | 116 | exit 1 | ||
| 351 | 117 | fi | ||
| 352 | 118 | } | ||
| 353 | 119 | |||
| 354 | 120 | |||
| 355 | 121 | |||
| 356 | 122 | >>>>>>> MERGE-SOURCE | ||
| 357 | 28 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" | 123 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" |
| 358 | 29 | 124 | ||
| 359 | 30 | # define LSB log_* functions. | 125 | # define LSB log_* functions. |
| 360 | 31 | 126 | ||
| 361 | === modified file 'debian/zabbix-server-pgsql.zabbix-server.init' | |||
| 362 | --- debian/zabbix-server-pgsql.zabbix-server.init 2009-12-30 18:46:34 +0000 | |||
| 363 | +++ debian/zabbix-server-pgsql.zabbix-server.init 2010-02-12 23:42:15 +0000 | |||
| 364 | @@ -25,6 +25,101 @@ | |||
| 365 | 25 | chown -R zabbix:zabbix "$DIR" | 25 | chown -R zabbix:zabbix "$DIR" |
| 366 | 26 | fi | 26 | fi |
| 367 | 27 | 27 | ||
| 368 | 28 | <<<<<<< TREE | ||
| 369 | 29 | ======= | ||
| 370 | 30 | set -e | ||
| 371 | 31 | |||
| 372 | 32 | # Check if a given process pid's cmdline matches a given name | ||
| 373 | 33 | running() | ||
| 374 | 34 | { | ||
| 375 | 35 | # No pidfile, probably no daemon present | ||
| 376 | 36 | [ ! -f "$PIDFILE" ] && return 1 | ||
| 377 | 37 | pid=`cat $PIDFILE` | ||
| 378 | 38 | |||
| 379 | 39 | # No pid, probably no daemon present | ||
| 380 | 40 | [ -z "$pid" ] && return 1 | ||
| 381 | 41 | |||
| 382 | 42 | [ ! -d /proc/$pid ] && return 1 | ||
| 383 | 43 | cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` | ||
| 384 | 44 | # Is this the expected child? | ||
| 385 | 45 | [ "$cmd" != "$DAEMON" ] && return 1 | ||
| 386 | 46 | |||
| 387 | 47 | return 0 | ||
| 388 | 48 | } | ||
| 389 | 49 | |||
| 390 | 50 | # Check if a given process' childrens are running | ||
| 391 | 51 | running_child() | ||
| 392 | 52 | { | ||
| 393 | 53 | [ -z "$NAME" ] && return 1 | ||
| 394 | 54 | if ps -eo ppid,pid,comm |grep -q $NAME; then | ||
| 395 | 55 | return 0 | ||
| 396 | 56 | fi | ||
| 397 | 57 | return 1 | ||
| 398 | 58 | } | ||
| 399 | 59 | |||
| 400 | 60 | |||
| 401 | 61 | |||
| 402 | 62 | force_stop() { | ||
| 403 | 63 | [ ! -e "$PIDFILE" ] && return | ||
| 404 | 64 | if running ; then | ||
| 405 | 65 | pid=`cat $PIDFILE` | ||
| 406 | 66 | kill -15 $pid | ||
| 407 | 67 | # Is it really dead? | ||
| 408 | 68 | [ -n "$DODTIME" ] && sleep "$DODTIME"s | ||
| 409 | 69 | if running ; then | ||
| 410 | 70 | kill -9 $pid | ||
| 411 | 71 | [ -n "$DODTIME" ] && sleep "$DODTIME"s | ||
| 412 | 72 | if running ; then | ||
| 413 | 73 | echo "Cannot kill $DESC (pid=$pid)!" | ||
| 414 | 74 | exit 1 | ||
| 415 | 75 | fi | ||
| 416 | 76 | fi | ||
| 417 | 77 | fi | ||
| 418 | 78 | rm -f $PIDFILE | ||
| 419 | 79 | } | ||
| 420 | 80 | |||
| 421 | 81 | # Maybe the process is not running, but its children are | ||
| 422 | 82 | force_child_stop() | ||
| 423 | 83 | { | ||
| 424 | 84 | # Kill the children by name, it's safer not to use a variable here | ||
| 425 | 85 | killall -15 zabbix_server | ||
| 426 | 86 | } | ||
| 427 | 87 | |||
| 428 | 88 | # Checks if the process is properly dead | ||
| 429 | 89 | check_death() | ||
| 430 | 90 | { | ||
| 431 | 91 | [ -n "$DODTIME" ] && DODTIME=2 | ||
| 432 | 92 | [ -n "$MAX_DIETIME" ] && MAX_DIETIME=15 | ||
| 433 | 93 | sleep "$DODTIME"s | ||
| 434 | 94 | if running; then | ||
| 435 | 95 | echo "$DESC did not stop in $DODTIME seconds, forcing it to stop" | ||
| 436 | 96 | force_stop | ||
| 437 | 97 | fi | ||
| 438 | 98 | if running; then | ||
| 439 | 99 | echo "ERROR: $DESC did not die in the expected time, consider increasing DODTIME (currently $DODTIME)" | ||
| 440 | 100 | exit 1 | ||
| 441 | 101 | fi | ||
| 442 | 102 | # Wait for the children to stop | ||
| 443 | 103 | if running_child; then | ||
| 444 | 104 | echo -n "Waiting for child processes to die" | ||
| 445 | 105 | force_child_stop | ||
| 446 | 106 | for wait in `seq $MAX_DIETIME`; do | ||
| 447 | 107 | if ! running_child; then break ; fi | ||
| 448 | 108 | echo -n "." | ||
| 449 | 109 | force_child_stop | ||
| 450 | 110 | sleep $wait | ||
| 451 | 111 | done | ||
| 452 | 112 | echo | ||
| 453 | 113 | fi | ||
| 454 | 114 | if running_child; then | ||
| 455 | 115 | echo "ERROR: $DESC's children processes did not die in the expected time, consider increasing MAX_DIETIME (currently $MAX_DIETIME)" | ||
| 456 | 116 | exit 1 | ||
| 457 | 117 | fi | ||
| 458 | 118 | } | ||
| 459 | 119 | |||
| 460 | 120 | |||
| 461 | 121 | |||
| 462 | 122 | >>>>>>> MERGE-SOURCE | ||
| 463 | 28 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" | 123 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" |
| 464 | 29 | 124 | ||
| 465 | 30 | # define LSB log_* functions. | 125 | # define LSB log_* functions. |
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/zabbix now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335. A merge should be performed if necessary.