← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnome-panel/natty

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-11-09 15:06:29 UTC
  • mfrom: (1.13.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101109150629-whuwed41qbhpxk9j
Tags: 1:2.32.0.2-0ubuntu1
* New upstream version
* debian/control.in:
  - recommends python-gconf and python rather than depends on it,
    gnome-panel-add is the only code to use those
  - clean the python-gnome2 depends
  - list the new binaries for libpanel-applet3 and gir
  - set a new gnome-panel-bonobo binary with the bonobo loader
  - recommends gnome-settings-daemon which has the timezone polkit service
  - updated glib requirement and the build depends for the gir build
  - use dh-autoreconf
* Updated the .install files for the new version
* debian/patches/01_layout.patch:
  - new version update
* debian/patches/04_default_panel_config.patch:
  - updated the layout
* debian/patches/90_git_wnck_show_realize.patch,
  debian/patches/91_git_wnck_pager_update.patch:
 - the fixes are in the next version
* debian/patches/99_ltmain_as-needed.patch:
  - dropped, it's not required with --as-needed by default in natty
* debian/rules:
  - call dh_girepository
  - comment the ldflag options to workaround build issues 
  - updated shlibs version
  - use dh-autoreconf rather than the cdbs way

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
1
1
SUBDIRS =                       \
2
 
        po                      \
3
 
        idl                     \
4
 
        icons                   \
5
2
        gnome-panel             \
6
3
        libpanel-applet         \
7
4
        applets                 \
 
5
        doc                     \
8
6
        help                    \
9
 
        doc                     \
10
 
        man
 
7
        icons                   \
 
8
        man                     \
 
9
        po
 
10
 
 
11
if HAVE_BONOBO
 
12
SUBDIRS += bonobo
 
13
endif
11
14
 
12
15
ACLOCAL_AMFLAGS = -I m4
13
16
 
 
17
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-scrollkeeper
 
18
 
14
19
EXTRA_DIST = \
15
 
        MAINTAINERS             \
16
20
        COPYING-DOCS            \
17
21
        HACKING                 \
 
22
        MAINTAINERS             \
18
23
        ChangeLog.pre-git       \
19
24
        gnome-doc-utils.make
20
25
 
21
 
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
22
26
DISTCLEANFILES =                \
23
27
        gnome-doc-utils.make
24
28
 
39
43
        $(srcdir)/gtk-doc.make \
40
44
        $(srcdir)/m4/gnome-doc-utils.m4 \
41
45
        $(srcdir)/m4/gtk-doc.m4 \
42
 
        $(srcdir)/m4/intltool.m4
 
46
        $(srcdir)/m4/intltool.m4 \
 
47
        $(srcdir)/m4/libtool.m4 \
 
48
        $(srcdir)/m4/ltoptions.m4 \
 
49
        $(srcdir)/m4/ltsugar.m4 \
 
50
        $(srcdir)/m4/ltversion.m4 \
 
51
        $(srcdir)/m4/lt~obsolete.m4
43
52
 
44
53
-include $(top_srcdir)/git.mk