ubuntu/+source/asterisk:ubuntu/dapper

Last commit made on 2006-05-26
Get this branch:
git clone -b ubuntu/dapper https://git.launchpad.net/ubuntu/+source/asterisk
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
ubuntu/dapper
Repository:
lp:ubuntu/+source/asterisk

Recent commits

03ae648... by Chuck Short on 2006-05-26

Import patches-unapplied version 1:1.2.7.1.dfsg-2ubuntu3 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 97b4b52f6013431b5c8f06e7c11a620e24767d38

New changelog entries:
  * debian/*.init:
    - Change the ownership of the pid file again.
      (Closes: Malone ##45952).

97b4b52... by Chuck Short on 2006-05-22

Import patches-unapplied version 1:1.2.7.1.dfsg-2ubuntu2 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: bfee664b859fd48e36ab5c17d9b0c40a4b58d9d5

New changelog entries:
  * debian/*.init
    - Change the ownership of the pid file.
      (Closes: Malone #45952).

bfee664... by Daniel Holbach on 2006-05-18

Import patches-unapplied version 1:1.2.7.1.dfsg-2ubuntu1 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 228048bbb640c563741aa5621977dfa5a37f8345

New changelog entries:
  * Resynchronized with Debian, only Ubuntu changes:
    - debian/*.init:
      - create /var/run/ directory if necessary.
  [ Kilian Krause ]
  * Urgency bumped since 1.2.7 is a security update [CVE-2006-1827]
    (Closes: #364195)
  [ Mark Purcell ]
  * Previous Upload also fixes:
    - cannot install - directories not created (Closes: #360233)
    - package uninstallable (Closes: #359970)
  * Update postinst to fix: fails to upgrade when /etc/asterisk/voicemail.conf
    is deleted (Closes: #360220)
  * Link debian/asterisk-bristuff.asterisk.{logrotate,init} &
    provide debian/asterisk-classic.asterisk.logfile
    - Fixes: init.d and logrotate.d conflicts (Closes: #360181)
  [ Tzafrir Cohen ]
  * New upstream release.
  * nomarch.dpatch: removed the patching to internal libgsm, as we don't use
    it (and it broke in this version)
  * bristuff.dpatch: based on the patch from bristuff-0.3.0-PRE1n
  * bristuff.dpatch: A small fix in chan_sip.c
  * bristuff.dpatch: Disabling "libgsm" until it is renamed
  * 30_ast-data-dir.dpatch: the symlink sounds/voicemail is now gone
  * rules: do fail if bristuff patching hasfailed
  * zap_restart.dpatch: allow restarting zaptel channel with "zap restart"
  * backport_playdtmf.dpatch: a harmless backport (no impact if not used)
  * completed the merge of logrotate and init.d scripts
  [ Lionel Elie Mamane ]
  * When not running asterisk, do it successfully, not by failure.
    (closes: #360234)
  * Create /var/log/asterisk/cdr-csv, not cdr-cvs.
  [ Mark Purcell ]
  * Update debian/control for asterisk-h323 package description
  * Create /var/spool/asterisk & /var/lib/asterisk in debian/*.postinst
  * New upstream release. Fixes:
    - Version 1.2.5 is out (Closes: #355299)
    - since 1.2.0 no chan_modem (Closes: #343232)
    - Undefined symbol in chan_zap.so (Closes: #339559)
    - Unapplying patches fail (Closes: #345676)
    - utils.c:619 tvfix: warning negative timestamp... (Closes: #347929)
    - creates /.asterisk_history on reboot (Closes: #307218)
  * h323 modules can be unstable so dont load my default
  * Cleanup debian/patches to remove obsolete/ old patches
  * New upstream release. (Closes: #355299)
  * correct_pid_display.dpatch: adjusted to 1.2.6
  * 30_ast-data-dir.dpatch: adjusted to 1.2.6
  * debian/control: Add adduser to depends of asterisk-config to shut up
    lintian.
  * rules: no need to copy config to the bristuff install
  * rules: but use cp -a for ast_config, as there may be subdirs.
  * Recompile to fix missing asterisk-config from last binNMU round
    (Closes: #356712, #358413, #355524, #358145)
  * postinstall: Add /var/spool/asterisk/meetme if nonexistant.
    (Closes: #355046)
  * asterisk.init: Install both asterisk-classic and asterisk-bristuff with
    /etc/init.d/asterisk (Closes: #354729)
  * logroate: create /var/log/asterisk/cdr-custom/ as well as cdr-csv
    (Closes: #355048)
  * logrotate: share location of logrotate file as /etc/logrotate.d/asterisk
    for both classic and bristuff version (Closes: #356712)
  * delete chan_capi modules from bristuff
  * Move postinstall and postrm to asterisk-classsic, asterisk-bristuff and
    asterisk-config. (Closes: #355524)
  * Add chan_h323 back with new Atlas_devel3 OpenH323.
  * Fix install of asterisk-bristuff with dh_install.
  * Create missing /var/spool/asterisk/voicemail in postinst (Closes: #352586)
  * Fix asterisk-bristuff install target to catch correct versions.
  * update to bristuff 0.3.0-PRE-1k
  [ Tzafrir Cohen ]
  * Fix PID display (Closes: #338646)
  * changes to the init.d script (Tzafrir)
  * debian/ast_config/ place here configurutaion files that will override
    the defaults from the source, though not get into the sample documentation
    dir
  * debian/ast_config/manager.conf: asterisk does listen onthe manager by
    default, but only on localhost. Other packages need not edit manager.conf
    to get a manager acount
  * bristuff 0.3.0-PRE-1f
  * option_detach.dpatch: Adds option -D: always daemonize (even with -v,-d)
    (conflicts with bristuff, though)
  * ukcid.dpatch: UK Caller ID patch for the X100P. (Closes: #302380)
  [ Kilian Krause ]
  * New upstream release. (Closes: #350905)
  * Bumping depends on libpri and zaptel to according 1.2 versions.
  * Build-Depends on libpri1.2 since new ABI caused new package name.
  * Removed alternatives from Build-Depends since sbuild will only take first
    anyway to ensure constant rebuilds.
  * Add a noload for chan_capi by default, so that we d not stop loading when
    no CAPI is installed. (Closes: #328835)
  * Include smsq by adding Build-Depends on libpopt-dev (Closes: #348090)

228048b... by Kilian Krause on 2006-01-02

Import patches-unapplied version 1:1.2.1.dfsg-3 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: ea0b606916772f9e8be88cbe3a3bee1c32330488

New changelog entries:
  * Remove -msoft-float from compile flags to fix compilation on arm.
    (Closes: #343154)
  * Provide nonexistant dirs before running chown on them. (Closes: #341810)
  * Depend on Perl module in libapache-dbi-perl or libdbi-perl or web-vmail
    (Closes: #337448)
  * Fix permissions on voicemail.conf. (Closes: #304615)
  * Build-Depend on gsfonts to have Helvetica font for doxygen
    (Closes: #343079)

ea0b606... by Tzafrir Cohen <email address hidden> on 2005-12-31

Import patches-unapplied version 1:1.2.1.dfsg-2 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 45cea0744f29f8e15c946f3bdfc82c3f46ba6623

New changelog entries:
  [ Tzafrir Cohen ]
  * bristuff 0.3.0-PRE-1d . Still disabled by default
  * libpri_bristuffed.dpatch: link chan_zap with libpri-bristuffed.so.1
  * Use asterisk(8) as a man page for rasterisk
  * Removing binary steroize: can be done with soxmix of package sox.
  * Removing binary streamplay: can be done with netcat

  [ Kilian Krause ]
  * Fix asterisk-dev to include asterisk.h

45cea07... by Mark Purcell on 2005-12-07

Import patches-unapplied version 1:1.2.1.dfsg-1 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: d387e112f7a6fa4611f210ad227358155411f21a

New changelog entries:
  * New upstream release
    - Please package asterisk 1.2.1 (Closes: #342463)
  * Temporary disable bristuff for upstream release
  * sip-1.914.dpatch merged upstream
  * Add Build-Depends: libcurl3-dev | libcurl-dev
    - Should build-depend on libcurl3-dev (Closes: #341363)
  * Add Build-Depends: doxygen
    - Missing build-dependency on doxygen (Closes: #341362)
  * Build-Depends: adduser (>= 3.63)
  * disable chan_zap building (in channels makefile) against old
    libmfcr2 (Closes: #342139)
  * seperate api docs and configuration samples (Closes: #341395)
  * Add sip-1.913.dpatch; SIP error 400 on outgoing calls (Closes: #340574)
  [ Tzafrir Cohen ]
  * Added bristuff 0.3.0-PRE1
  [ Mark Purcell ]
  * asterisk-sounds-main Replaces: asterisk-sounds-extra
    - asterisk-sounds-{main,extra}: file conflict (Closes: #339791)
  * Fix 50_debian-libgsm.dpatch to apply correctly
    - asterisk - FTBFS: Tries to build a i386 assembler file (Closes:
    #340102)
  * Remove -march to fix FTBFS. (Closes: #338753)
  * libreadline4-dev is superseeded by libreadline5-dev. Fixed build-depends.
  * New upstream release
  * New upstream release
  * New upstream release
  * Suggests: asterisk-rate-engine
  * debian/rules touch .cleancount (upstream bug?)
  * Fix debian/patches/30_ast-data-dir with /var/run/asterisk. Thanks
    Alessandro Polverini
  * Copyright audit into debian/copyright (Closes: #331318)
  * Please package 1.2 beta 2 (Closes: #336749)
  * New upstream release
  * Update Build-Depends: libpri1 >= 1.2.0-beta2
  * Remove Build-Depends: doxygen. Takes too long for experimental ;-)
  [ Tzafrir Cohen ]
  * recreated system_libgsm patch, http://bugs.digium.com/view.php?id=5434
  * Added public key from Junction Networks (pubkey_jnctn.dpatch).
    Any other keys for IAX providers we can add?
  * updating to a beta of Asterisk 1.2
  * added defaults_debian.dpatch to set pathes
  * BuildDepends on graphviz
  * disabled most patches: still need to review them
  * What about h323?
  * deleted from patches/00list a number of patches that should not go in
  [ Mark Purcell ]
  * Fix: old-fsf-address-in-copyright-file
  * Please package version 1.2 betas (Closes: #325268)
  * Fix memleak bug (http://bugs.digium.com/view.php?id=4318)
  * Fix depends to adduser 3.64 (Closes: #326198)
  [ Kilian Krause ]
  * debian/control: fix GCI to read CGI. (Closes: #311291)
  [ Mark Purcell ]
  * /var/lib/dpkg/info/asterisk.postinst: line 22: adduser: command not
    found (Closes: #322115)
  * debian/patches/chan-modem.dpatch from Simon Peter
    - chan_modem.c should set default read & write format (Closes:
    #303903)
  * apply patch from Jérôme Warnier
    - Asterisk autosupport script not recognized as such (Closes: #316799)
  * Updated debian/postrm:
    - 'apt-get --purge remove asterisk' removes configuration files from
    another package (Closes: #318455)
  * Cleanup bristuff to build under gcc4, thanks for the suggestions
    - Closes: #318337: FTBFS. channel.c:64: error: static declaration of
    'uniquelock' follows non-static declaration
  * Cleanup 70_debian-libpe-fe.dpatch to check in Makefile
  * Enable bristuff-0.2.0-RC8j.dpatch
  * Remove debian/patches/08_debian-zaptel.dpatch as it is no longer
    needed with new zaptel-source package
  * Cleanup debian/patches/
  * Conflicts: asterisk-oh323 (<= 0.6.6pre3-3)
    - Closes: #318189: asterisk-oh323: chan_oh323.so cannot find symbol
    and Asterisk crashes
    - Closes: #318216: chan_oh323.so symbols
  * Cleanup postinit error: adduser asterisk audio; adduser asterisk
    dialout
  * Incorporate suggestions from Tzafrir Cohen <email address hidden>
    - postinst script has an error
    - modified astdir patch, so it won't conflict with bristuff patch
    - typo in the debian/asterisk.default: s/exra/extra/
    - build-depends both on zaptel-source (>= 1.0.6) and simply
    on zaptel-source, The latter is probably unnecessary
    - man pages for the other executables in the package
  * Closes: #301490: Please add patch for Italian syntax
  * Closes: #305734: On PowerPC, hanging up on voicemail causes non-stop
    log messages

d387e11... by Mark Purcell on 2005-07-01

Import patches-unapplied version 1:1.0.9.dfsg-1 to ubuntu/breezy

Imported using git-ubuntu import.

Changelog parent: d6bc2a7fd320c119b15fcf59c450f4c42fa1da4c

New changelog entries:
  * New upstream release
    - Closes: #315578: New version of asterisk and bristuff released
  * Remove BRI patch while we work on it, to allow 1.0.9 to unstable
  * (NOT RELEASED YET) New upstream release
  * debian/control: fixed build-depends on sed's version greater than Woody.
    (Closes: #308885)
  * Jose Carlos
    + Fix a typo in NEWS.Readme
    + debian/postint: Add asterisk user to dialout group too. This is needed
      for asterisk to have enoug permissions to access zaptel devices.
    + debian/control: allow a local asterisk-config-local package to satisfy
      dependencies. Conflict with asterisk-config
  * Mark Purcell
    + Update debian/watch to use svn-upgrade
  * Kilian Krause
    + debian/asterisk.init: fixed restart problem with breaking up after stop.
    + debian/asterisk.init: fixed reference to WRAPPER_DEAMON which is only
      DEAMON for us. (Closes:#300707)
  * New upstream release (Ensure non-dfsg MOH is not included in orig.tar)
  * New upstream release. (Closes: #300403)
     + Fixed music on hold. (Closes: #300370)
  * Re-enabled speex codec. (Closes: #300373)
  * As asterisk-h323 is empty, we are no longer depending on openh323, so
    we don't have build conflicts between asterisk and zaptel. (Closes: #287260)
  * debian/rules: Fixed duplicate execution of configure and unrepresentable
    changes to source. (Closes: #299184)
  * debian/patches/80_skinny.dpatch: removed. Incorporated in the 1.0.7
    release.
  * debian/patches/97_bristuff.dpatch: fixed problems to build on AMD64 with
    gcc-4.0 (Closes: #297561)

d6bc2a7... by Kilian Krause on 2005-03-09

Import patches-unapplied version 1:1.0.6-2 to ubuntu/hoary

Imported using git-ubuntu import.

Changelog parent: 34a6d5108c0706009ea0e368eb5cfa0b8abb1f51

New changelog entries:
  * fixed location of sounds dir in addmailbox (Closes: #298769)
  * New upstream release. (asterisk 1.0.6, bristuff RC7k, Closes: #298128)
  * debian/control: explicitly depend on zlib1g-dev. (Closes: #296967)
  * Make sure we have the newer asterisk-config to not conflict
    /etc/default/asterisk. (Closes: #297719)
  * as there is no longer a conflict with libnewt-dev, it was added to the
    build deps for astman
  * debian/control: add astman and cdr_sqlite (Closes: #259342)
  * asterisk.default, asterisk.init: removed hack to load zaphfc correctly.
    We'll leave this to zaptel and it's modprobe.d features.
  * debian/patches/00list,debian/control: Enable bristuff RC7f by default.
  * debian/asterisk.init, debian/asterisk.default: Cleanup zaphfc preloading
    as inspired by Tzafrir Cohen.
  * debian/control: Remove speex as B-D, it's broken when imported from
    debian. Added autotools-dev for editline.
  * deiban/rules: fix asterisk.8.gz error in lintian. Bring new autotools for
    editline's configure.
  * reintroduce chan_zap (Closes: #296656)
  * debian/patches/08_debian-zaptel.dpatch, debian/control: fixed zaptel.h
    include to take zaptel-source's version.
  * debian/patches/97_bristuff.dpatch:
    include bristuff from junghanns.net (not enabled by default now, would
    close: #286797). We need libpri and zaptel with bristuff patch first.
  * 18_debian-libedit.dpatch: removed due to command history problem.
    (Closes:#281690)
  * debian/asterisk.init: Added grace timeout of 2 secs before hard shutting
    down running daemons to don't scatter incorrect warnings. Don't run the
    asterisk daemon unless RUNASTERISK=yes. (Will not bind ports from chroots)
  * debian/asterisk-config.default: Disabled autostart - especially when
    installing in chroots this was quite annoying.
  * debian/rules: Remove the asterisk.8.gz recompression. (Closes: #295220)
  * debian/README.Debian: Added first version. Thanks to Tzafrir Cohen for the
    template! (Closes: #270072)
  * debian/asterisk.deafult: moved the /etc/default to the asterisk package,
    as /etc/init.d/asterisk in there needs it.
  * debian/80_skinny.dpatch: Added
    http://bugs.digium.com/bug_view_page.php?bug_id=0003496. Thanks to Johan
    Thelmén <email address hidden>. (Closes:#295658)
  * debian/control: remove chan_h323 from being built for now. For now it's
    being replaced by asterisk-oh323 until chan_h323 does build and work ok
    with latest OpenH323 again.
  * Debian VoIP Team upload.
  * asterisk.init, asterisk-config.default: probably fixed start-as-user-with-
    multiple-groups-problem.
  * patches/40_initgroups.dpatch: added patch from Florian Weimer
    <email address hidden>. Thanks! (Closes: #293124)
  * debian/postinst: Make asterisk user's home /var/lib/asterisk upon user
    request.
  * debian/control: Bump libpri build-depends to 1.0.4-1. (Closes: #293990)
  * Debian VoIP Team upload.
  * New upstream release.
  * Kilian Krause:
    - debian/asterisk.init: fixed multiple GID problem when starting asterisk (as
      reported by Raoul Bönisch and Simon Peter). Unfortunatelly this does
      remove the chance to run as real-time prio.
    - debian/asterisk.init: fixed stale stop by using start-stop-server after
      soft shutdown (Closes: #263879)
    - debian/asterisk.init: Fixed running as root problem for #279052. At least
      through the /etc/init.d/asterisk you won't be able to run asterisk as
      root (not even with another username). (Closes: #279052)
    - debian/asterisk.init: Added switch to run asterisk via safe_asterisk
      optionally for automatic restart (Closes: #266805)
    - debian/patches/01_security_hotfix_287851.dpatch: Removed, as is
      incorporated in 1.0.4 upstream release.
  * Jose Carlos
    - debian/rules: add a check at build time for fpm sounds. If they exist,
      abort, as we must remember to remove those from sources in each new
      upstream release.
    - debian/patches: 20_Makefile.dpatch: updated
  * Apply missing 25_subdirs_Makefile patch.
  * Debian VoIP Team upload.
  * New upstream version. (Closes: #284889)
  * Kilian Krause:
    - ACK NMU. (Thanks Steve!):
      + debian/patches/01_security_hotfix_287851.dpatch: Patched to
        fix logging strings vulnerability. (Closes: #287851)
  * Jose Carlos Garcia Sogo
    - Using again dpatch.
    - debian/patches: populated with different patches.
    - 08_debian-zaptel: Using zaptel.h file from version 1:1.0.0-2 of
      zaptel-source package.
    - removed sounds licensed from FreePlayMusic from source,
      as the license for them is not DFSG compliant (Closes: #288429)
    - applied patch to make asterisk compile on amd64 with
      gcc-4.0 (Closes: #288831)
    - debian/asterisk.init:
      + Changed how daemon is restarted in init file. (Closes: #287025)
      + Using -r in checks in init file. (Closes: #287456)
    - debian/asterisk-config.default
      + Run by default as group asterisk.
    - Fix some lintian warnings and errors:
      + Description: should start with lowercase letter.
      + Bumped Standars-Version to 3.6.1. No changes needed.
      + Removed duplicate dependencies.
      + Recompress asterisk.8 manpage with max level (--best option)
  * Non-maintainer upload.
  * High-urgency upload for sarge-targetted RC bugfix
  * Fix multiple format string vulnerabilities, reported by Jan
    Niehusmann. Closes: #287851.
  * Closes: #281524: running asterisk with realtime priority
  * Include changes from Tzafrir Cohen
  * fixup init.d/asterisk to logger reload. Thanks Daniel Pocock
  * Closes: #260575: chan_zap.so: undefined symbol
  * Build-Depends: libpri1 >= 0.6
  * Closes: #279905: dependency issue breaks voicemail setup
  * Build-Depends: asterisk-sounds-main (>= 1.0.2)
  * Closes: #269942: package Debian asterisk-sounds
  * Rename asterisk-sounds to asterisk-sounds-main to avoid upstream
    conflict
  * Closes: #277404: Please split out GTK console
  * Split off asterisk-gtk-console package to contain all X11
    dependancies
  * New upstream release
  * Closes: #279540: Please package newer version of asterisk
  * Closes: #275808: logrotate errors and emails
  * Closes: #275808: logrotate errors and emails
  * Add init.d/asterisk logger-reload|extensions-reload options & use
    logger reload in asterisk.logrotate. Thanks Daniel Pocock
  * New upstream release
  * Urgency high for sarge release
  * Closes: #273570: asterisk-sounds: sounds/letters directory is missing
  * Closes: #273780: under ALSA, infinite-loops immediately on
    installation
  * Comment out autoload of chan_oss from modules.conf
  * Closes: #272999: asterisk_1:0.9.1+1.0RC2-2_hppa: FTBFS:
    [anaFilter.o] Error 1
  * Version 1.0.0 now builds on hppa
  * Closes: #273576: chan_zap.so module is missing
  * check for ../include/linux/zaptel.h in channels/Makefile
  * Closes: #273572: Music on hold has wrong default directory
  * refer to correct /usr/share/asterisk/mohmp3 directory
  * Rebuild with zaptel.h_1.0.0 and libpri-dev_1.0.0
  * New upstream release
  * Use asterisk.8.gz man page
  * Remove back PROC optomizations from Makefile, enable build on hppa
  * New upstream release
  * Back out dpatch (Makes new upstream release straight forward)
  * Breakup monolithic patch into components.
  * debian/patches/11_makefile-sanitize.dpatch: fixed patch to make gsm
     work again. (Closes: #266167)
  * debian/rules, debian/patches/10_rollup-1.0-1.dpatch,
    debian/patches/11_makefile-sanitize.dpatch: Incorporate fixes proposed by
    Thiemo Seufer <email address hidden>.
    Should fix the FTBFS on hppa.
  * debian/control: suggest gnomemeeting. (At least tell people, which clients
    they need) Also add dpatch as Build-Dep. (Closes: #265036)
  * Closes: #262011: SIP cancels fail due to Request-URI mismatch
  * debian/patches/20_chan_sip.dpatch: Apply chan_sip patch from Jan Niehusmann
  * debian/control: make sure we're rebuilding with rtti enabled openh323
  * debian/rules: make svn-buildpacakge not choke on failing clean target
  * Cleanup wierd .diff.gz file
  * Rebuild with existing libtonezone1
  * Cleanup codecs/ilbc/Makefile to remove -march sillyness (which is
    already defined above anyway
  * Debian already has libedit.a Don't build, fails on mips anyway due to old config.guess
  * New upstream release (Closes: Bug#260370)
  * Closes: #247401: doesn't upgrade cleanly - initscript
    problems ?
  * allow init.d/asterisk distribution via GPL
  * Remove -I/usr/include/ptlib/unix from h323 Makefile, Thanks Ray
    Dassen (Closes: Bug#259564)
  * Closes: #259572: Unmet dependencies
  * Maintainer: Debian VoIP Team <email address hidden>
    Uploaders: Mark Purcell <email address hidden>,
    Kilian Krause <email address hidden>,
    Jose Carlos Garcia Sogo <email address hidden>,
    Goedson Teixeira Paixao <email address hidden>,
    Santiago Garcia Mantinan <email address hidden>
  * Next step. Get this all back into svn!
  * Rebuild with libopenh323-dev (1.12.2-4) from sarge for H.323 support
  * New upstream release. Previous version WAS tagged as 1.0 in CVS :-(
  * Closes: #249046: no ring indication
  * Closes: #254654: init.d/asterisk restart kills asterisk
  * Build-Depends: libgtk1.2-dev, libspeex-dev (Closes: Bug#253639)
  * Turn off broken H.323 support (Closes: Bug#255662)
  * Closes: #250302: Package description is slightly outdated and
    incorrect
  * Closes: #255685: Syntax error in configuration file,
    /etc/asterisk/sip.conf
  * Closes: #228722: please add postgres support for asterisk
  * Rebuild for new libopenh323-dev
  * Merged 1.0-1 and 0.9.0-2

34a6d51... by Mark Purcell on 2004-05-31

Import patches-unapplied version 1.0-1 to ubuntu/warty

Imported using git-ubuntu import.