lp://qastaging/~ubuntu-branches/ubuntu/oneiric/zabbix/oneiric-201106091218
- Get this branch:
- bzr branch lp://qastaging/~ubuntu-branches/ubuntu/oneiric/zabbix/oneiric-201106091218
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 2094 lines (+1844/-17) (has conflicts)19 files modified.pc/ldap-linker-lp722300.patch/configure.in (+1494/-0)
.pc/ldap-linker-lp722300.patch/m4/ax_lib_postgresql.m4 (+182/-0)
.pc/ldap-linker-lp722300.patch/m4/ldap.m4 (+97/-0)
debian/patches/ldap-linker-lp722300.patch (+54/-0)
debian/po/cs.po (+1/-1)
debian/po/de.po (+1/-1)
debian/po/es.po (+1/-1)
debian/po/eu.po (+1/-1)
debian/po/fi.po (+1/-1)
debian/po/fr.po (+1/-1)
debian/po/it.po (+1/-1)
debian/po/ja.po (+1/-1)
debian/po/nb.po (+1/-1)
debian/po/nl.po (+1/-1)
debian/po/pl.po (+1/-1)
debian/po/pt.po (+1/-1)
debian/po/pt_BR.po (+1/-1)
debian/po/ru.po (+3/-3)
debian/po/sv.po (+1/-1)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 36. By Daniel Holbach
-
* Merge from debian unstable (LP: #721707). Remaining changes:
- update build depend for mysql-transition
* ldap-linker-lp722300. patch: Fix FTBFS issues due to incorrect placement of
linker arguments. (LP: #722300) (Debian bug 556770)
* New upstream release
* Ignore release candidates via 'uscan' in debian/watch
(closes: #599921)
* Added --with-ssh2 for SSH2 support during ./configure
(closes: #609744)
* Fixed typo in debian/rules to properly build with libcurl support
(closes: #613322)
* New upstream release
* Packaging repository moved to git.debian.org
* zabbix-proxy-pgsql and -mysql: Fix package description (Closes: #586961)
* debian/po/da.po: added (Closes: #585485) - 35. By Bhavani Shankar
-
* Merge from debian unstable. Remaining changes:
- update build depend for mysql-transition - 34. By Jean-Louis Dupond
-
* Merge from debian unstable. (LP: #593104) Remaining changes:
- Mysql translation. - 32. By Christoph Haas <email address hidden>
-
* New upstream release
* Javascript library path fixed (Closes: #564029) - 31. By Fabio Tranchitella
-
[ Christoph Haas ]
* New upstream release; it fixes the following vulnerabilities:
- https://support. zabbix. com/browse/ ZBX-1030
- https://support. zabbix. com/browse/ ZBX-1031
- https://support. zabbix. com/browse/ ZBX-993
- https://support. zabbix. com/browse/ ZBX-1355
(Closes: #562613)[ Fabio Tranchitella ]
* debian/watch: updated for the 1.8 branch.
* debian/*.init: rewrote init scripts to use the "--retry N" option from
start-stop-daemon; this should fix the timing issues.
(Closes: #557760, #473911)
* debian/rules:
- do not ship usr/share/zabbix/ fonts/DejaVuSan s.ttf, link it from the
ttf-dejavu-core package instead.
- do not ship the database upgrade scripts for dbconfig-common, they
contains errors that dbconfig-common cannot ignore.
* debian/zabbix- server- {pgsql, mysql}. postinst: if upgrading from a pre-1.8
version, show a debconf note to inform the user that a manual upgrade is
needed for the SQL database. - 30. By Fabio Tranchitella
-
Set Default-Start to "2 3 4 5" and Default-Stop to "0 1 6" for all the init
scripts. - 29. By Christoph Haas <email address hidden>
-
* debian/po/ja.po updated (Closes: #548651)
* debian/po/cs.po updated (Closes: #548675)
* debian/po/sv.po updated (Closes: #548796)
* debian/po/de.po updated (Closes: #549248)
* debian/po/it.po updated (Closes: #549579)
* debian/po/pt.po updated (Closes: #550087)
* debian/po/ru.po updated (Closes: #550102)
* debian/po/es.po updated (Closes: #550173)
* debian/po/fr.po updated (Closes: #550315)
* Manpages for zabbix_server and zabbix_agent added (Closes: #496696)
* Added hint about the difference of the zabbix_agent.conf and
zabbix_agentd. conf in each config file as a comment. (Closes: #548701) - 28. By Fabio Tranchitella
-
* New upstream release.
* debian/control: fixed typos in the package descriptions. (Closes: #546638)
* debian/po/ja.po: updated. (Closes: #538223, #545399)
* debian/zabbix- agent.initd: added the status action. (Closes: #524205)
* debian/zabbix- server- {pgsql, mysql}. zabbix- server. init: improved the init
scripts (fail if the daemon is not executable, do not remove the pid file
while starting up the server). (Closes: #450528, 530577)
* debian/zabbix- frontend- php.templates: updated, thanks Christian.
(Closes: #522880)
* debian/control: bumped Standards-Version to 3.8.3, no changed needed.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu/oneiric/zabbix