Last commit made on 2010-04-22
Get this branch:
git clone -b ubuntu/lucid https://git.launchpad.net/ubuntu/+source/avogadro
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

d98a282... by Jonathan Thomas on 2010-04-22

Import patches-unapplied version 1.0.0-2ubuntu3 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 8d8de80914eea74644e2f5ef6d89d7480c51e16e

New changelog entries:
  * Remove faulty depends for python2.6-qt4 and python2.6-sip4 in debian/rules
  * Use dh_sip in debian/rules

8d8de80... by Jonathan Thomas on 2010-04-21

Import patches-unapplied version 1.0.0-2ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 679e926160f97c0230d16b1f1b231090b33a6f09

New changelog entries:
  * Add sip_4.10_support.patch from upstream. Fixes FTBFS with new SIP

679e926... by Jonathan Riddell on 2010-01-06

Import patches-unapplied version 1.0.0-2ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: bcfa17699c695fdd5c55da51f4b8c187f80270bb

New changelog entries:
  * Sync with Debian
  * Edit python-avogadro.install for python 2.6 directories

bcfa176... by Michael Banck on 2009-11-13

Import patches-unapplied version 1.0.0-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ab42411ee7caa3accedd008f190a90710b0e78cc

New changelog entries:
  [ Michael Banck ]
  * debian/libavogadro0.install: Wildcard the API directory.
  * debian/libavogadro-dev.install: Likewise.
  * debian/libavogadro0.install: Renamed to ...
  * debian/libavogadro1.install: ... this.
  * debian/control (libavogadro0): Renamed package to libavogadro1. Update
    all references.
  * debian/rules: Likewise.
  * debian/control (libavogadro1): Replace and Conflict with libavogadro0.
  * debian/control (avogadro-data): New package.
  * debian/control (avogadro): Recommend avogadro-data.
  * debian/control (libavogadro1): Likewise.
  * debian/libavogadro1.install: No longer ship /usr/share/libavogadro.
  * debian/avogadro.install: Only ship i18n directory from
  * debian/avogadro-data.install: New file.
  * debian/python-avogadro.install: Install wireframe.py explicitely
    ommitting example.py (closes: #555627).
  * debian/libavogadro-dev.install: Ship AvogadroBuildSettings.cmake,
    AvogadroLibraryDeps.cmake and AvogadroUse.cmake as well.
  * debian/control (avogadro-date): Replace and Conflict with prior versions
    of the avogadro and libavogadro0 packages.
  * debian/python-avogadro.dirs: New file.
  [ Daniel Leidert ]
  * debian/python-avogadro.files: Dropped.
  * debian/python-avogadro.install: Install scripts from debian/tmp.
  * debian/rules (binary-install/python-avogadro): Adjusted for changes above.

ab42411... by Michael Banck on 2009-10-23

Import patches-unapplied version 1.0.0-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6a07db65173980589165ad591cd41c412b5eb750

New changelog entries:
  * New upstream release.
  * debian/patches/sip_4.9_support.patch: Removed, applied upstream.
  * debian/patches/fix_empty_second_window.patch: Likewise.
  * debian/patches/fix_molpro_input_generator.patch: Likewise.
  * debian/libavogadro0.install: Adjust for additional API directory.
  * debian/libavogadro-dev.install: Likewise.

6a07db6... by Michael Banck on 2009-10-22

Import patches-unapplied version 0.9.9-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d33aba7a578313209fbc2106f772660c4d2fe23d

New changelog entries:
  * New upstream release.
    + Fixes german umlauts in the interface (closes: #538075).
  [ Michael Banck ]
  * debian/patches/vibrations_ordering.patch: Removed, applied upstream.
  * debian/patches/sip_4.9_support.patch: New patch, recognize new SIP
    version, taken from upstream (closes: #551244).
  * debian/rules (binary-fixup/python-avogadro): Removed rule, no longer
  * debian/libavogadro0.install: Put extensions, engines and tools into
    library package.
  * debian/libavogadro-dev.install: Put cmake files into development package.
  * debian/avogadro.install: No longer put /usr/lib/avogadro into application
  * debian/patches/fix_empty_second_window.patch: New patch, fixes opening an
    empty second window when Avogadro gets opened with a molecule, taken from
  * debian/patches/fix_molpro_input_generator.patch: New patch, makes the
    Molpro input generator work again, taken from upstream.
  [ Daniel Leidert ]
  * debian/control: Added python-avogadro package (closes: #513441).
    (Build-Depends): Added python-dev and python-central. Increase dh version
    to >= 5.0.38 for the latter.
    (Standrads-Version): Bumped to 3.8.3.
    (Depends): Move Python (module) dependencies to python-avogadro.
    (Recommends): Let libavogadro0 recommend python-avogadro.
  * debian/rules: Added targets and rules to create new python-avogadro
    package. Make sure we comply to the Python policy and depend on
    pythonX.Y-foo for the moment.
  * debian/libavogadro0.install: Don't install Python module.
  * debian/pycomat: Added with compat leven 2.
  * debian/python-avogadro.files: Added to move Python scripts over to
  * debian/python-avogadro.install: Added to install Python module.

d33aba7... by Michael Banck on 2009-07-19

Import patches-unapplied version 0.9.7-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 76aefa31400695407dde425a847d8e7a41f2c5aa

New changelog entries:
  * New upstream release.
  [ Daniel Leidert ]
  * debian/rules (binary-fixup/libavogadro0): Don't install
    extensionScripts/example.py for the moment (closes: #536281).
  [ Michael Banck ]
  * debian/patches/orbitalextension_link_zlib.patch: Removed, applied
  * debian/patches/sip_4.8_support.patch: Likewise.
  * debian/control (Build-Depends): Removed libboost-python1.37-dev and
    libboost-python1.38-dev, added qt4-dev-tools.
  * debian/avogadro.examples: New file.

76aefa3... by Michael Banck on 2009-06-17

Import patches-unapplied version 0.9.6-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ac10395e88c876cc0253a113647f4261e32a85f1

New changelog entries:
  * New upstream release.
  * debian/patches/ignore_f_orbitals.patch: Removed, applied upstream.
  * debian/patches/ignore_missing_intensities.patch: Likewise.
  * debian/patches/molpro_orbitals.patch: Likewise.
  * debian/patches/install_desktop_on_kfreebsd.patch: Likewise.
  * debian/libavogadro0.install: Wildcard python directory, the old
    "Avogadro.so" no longer matches.
  * debian/control (Build-Depends): Added zlib1g-dev.
  * debian/patches/orbitalextension_link_zlib.patch: New patch, fixes build
    failure due to a missing link to zlib, taken from upstream.
  * debian/patches/vibrations_ordering.patch: New patch, fixing sorting of
    vibrations, taken from upstream.
  * debian/patches/sip_4.8_support.patch: New patch, adding support for
  * debian/control (Build-Depends): Added sip4, needed by the build system to
    detect the sip4 version.

ac10395... by Daniel Leidert on 2009-05-14

Import patches-unapplied version 0.9.4-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: fdbcd2c2d4cf044d4705fab424d7b73345442152

New changelog entries:
  * debian/avogadro.install: Include the .desktop file (closes: #528166).
  * debian/patches/install_desktop_on_kfreebsd.patch: Added.
    - avogadro/src/CMakeLists.txt: Install .desktop file and icon on kfreebsd
      too to avoid an FTBFS.

fdbcd2c... by Michael Banck on 2009-05-05

Import patches-unapplied version 0.9.4-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: acf67008d4ad28193bc75c9cc112418f4e6d9b7c

New changelog entries:
  [ Daniel Leidert (dale) ]
  * debian/avogadro.desktop: Dropped. Upstream installs a valid one now.
  * debian/avogadro.install: Don't install self-written .desktop file over the
    one installed by upstream and install missing icon.
  * debian/control (Build-Depends): (Re-)Add Boost 1.37 as alternative to 1.38
    for Ubuntu.
  * debian/rules: Removed hardcoded CC and CXX definitions. Set
    LDFLAGS += -Wl,-z,defs -Wl,--as-needed.
    (get-orig-source): Dropped (we don't need a special target for this).
  * debian/copyright: Minor updates and cosmetics.
  [ Michael Banck ]
  * debian/control (Description): Updated to reflect recent feature additions.
  * debian/patches/ignore_missing_intensities.patch: New patch, takes into
    account missing intensity information for vibrations so that Avogadro no
    longer crashes, taken from upstream.