Ubuntu
avogadro package

Merge lp:~goelkunal/ubuntu/natty/avogadro/revision26 into lp:ubuntu/natty/avogadro

  1. Natty (11.04)
  2. revision26
  3. Merge into natty
Proposed by KunalGoel
Status: Merged
Merged at revision: 26
Proposed branch: lp:~goelkunal/ubuntu/natty/avogadro/revision26
Merge into: lp:ubuntu/natty/avogadro
Diff against target: 83 lines (+15/-11)
3 files modified
debian/changelog (+8/-0)
debian/control (+6/-6)
debian/rules (+1/-5)
To merge this branch: bzr merge lp:~goelkunal/ubuntu/natty/avogadro/revision26
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+56768@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-29 17:36:45 +0000
3+++ debian/changelog 2011-04-07 13:41:13 +0000
4@@ -1,3 +1,11 @@
5+avogadro (1.0.1-3.2ubuntu2) natty; urgency=low
6+
7+ * Revert back the changes as build fails for arm
8+ * build disabled for arm as build dependency on
9+ libOpenGL and libQtOpenGL
10+
11+ -- Kunal Goel <kunal.goel@linaro.org> Thu, 07 Apr 2011 18:56:17 +0530
12+
13 avogadro (1.0.1-3.2ubuntu1) natty; urgency=low
14
15 * Only build-dep on libqt4-opengl-dev and libglew1.5-dev on [i386 amd64
16
17=== modified file 'debian/control'
18--- debian/control 2011-03-29 17:37:32 +0000
19+++ debian/control 2011-04-07 13:41:13 +0000
20@@ -8,8 +8,8 @@
21 Daniel Leidert (dale) <daniel.leidert@wgdd.de>
22 Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.38), cmake (>= 2.6.0),
23 patchutils, pkg-config, libboost-python-dev, libeigen2-dev (>= 2.0~beta6),
24- libglew1.5-dev [i386 amd64 powerpc], libqt4-dev (>= 4.5.0), qt4-dev-tools, zlib1g-dev,
25- libqt4-opengl-dev [i386 amd64 powerpc], libopenbabel-dev (>= 2.2.0), python-dev, python-central,
26+ libglew1.5-dev, libqt4-dev (>= 4.5.0), qt4-dev-tools, zlib1g-dev,
27+ libqt4-opengl-dev, libopenbabel-dev (>= 2.2.0), python-dev, python-central,
28 python-numpy, python-sip-dev
29 Standards-Version: 3.8.3
30 XS-Python-Version: current
31@@ -19,7 +19,7 @@
32 DM-Upload-Allowed: yes
33
34 Package: avogadro
35-Architecture: any
36+Architecture: i386 amd64 powerpc
37 Depends: ${shlibs:Depends}, ${misc:Depends}, libavogadro1 (= ${binary:Version})
38 Recommends: avogadro-data (>= 1.0.0-2)
39 Description: Molecular Graphics and Modelling System
40@@ -56,7 +56,7 @@
41 Package: libavogadro1
42 Conflicts: libavogadro0
43 Replaces: libavogadro0
44-Architecture: any
45+Architecture: i386 amd64 powerpc
46 Section: libs
47 Depends: ${shlibs:Depends}, ${misc:Depends}
48 Recommends: python-avogadro, avogadro-data (>= 1.0.0-2)
49@@ -68,7 +68,7 @@
50 This package provides the shared library.
51
52 Package: libavogadro-dev
53-Architecture: any
54+Architecture: i386 amd64 powerpc
55 Section: libdevel
56 Priority: extra
57 Depends: ${misc:Depends}, libavogadro1 (= ${binary:Version}), libqt4-dev (>= 4.4.0), libeigen2-dev (>= 2.0~beta6), libopenbabel-dev (>= 2.2.0)
58@@ -80,7 +80,7 @@
59 This package provides the development and header files.
60
61 Package: python-avogadro
62-Architecture: any
63+Architecture: i386 amd64 powerpc
64 Section: python
65 Priority: extra
66 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, ${pyavo:Depends}, ${sip:Depends}
67
68=== modified file 'debian/rules'
69--- debian/rules 2011-03-29 14:23:28 +0000
70+++ debian/rules 2011-04-07 13:41:13 +0000
71@@ -14,11 +14,7 @@
72 DEB_SHLIBDEPS_LIBRARY_avogadro = libavogadro1
73 DEB_SHLIBDEPS_INCLUDE_avogadro = debian/libavogadro1/usr/lib
74 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
75-DEB_CMAKE_EXTRA_FLAGS = -DENABLE_RPATH=OFF -DENABLE_UPDATE_CHECKER=OFF -DPYTHON_EXECUTABLE=/usr/bin/python -DPYTHON_LIBRARY=/usr/lib/lib$(shell pyversions -d).so -DPYTHON_INCLUDE_DIR=/usr/include/$(shell pyversions -d)/
76-
77-ifeq (,$(filter $(DEB_HOST_ARCH),armel armhf))
78- DEB_CMAKE_EXTRA_FLAGS += -DENABLE_GLSL=ON
79-endif
80+DEB_CMAKE_EXTRA_FLAGS = -DENABLE_GLSL=ON -DENABLE_RPATH=OFF -DENABLE_UPDATE_CHECKER=OFF -DPYTHON_EXECUTABLE=/usr/bin/python -DPYTHON_LIBRARY=/usr/lib/lib$(shell pyversions -d).so -DPYTHON_INCLUDE_DIR=/usr/include/$(shell pyversions -d)/
81
82 PYVER = $(shell pyversions -dv)
83 DEB_DH_GENCONTROL_ARGS_python-avogadro = -- -V'pyavo:Depends=python$(PYVER)-numpy, python$(PYVER)-qt4, python$(PYVER)-sip'

Subscribers

People subscribed via source and target branches

to all changes: