Merge lp:~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335 into lp:ubuntu/lucid/zabbix

Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335
Merge into: lp: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:~ubuntu-branches/ubuntu/lucid/zabbix/lucid-201002122335
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

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.

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

Subscribers

People subscribed via source and target branches

to all changes: