← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/almanah/oneiric

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2011-04-18 16:21:36 UTC
  • mfrom: (1.3.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110418162136-l0ik4snrl420srer
Tags: 0.8.0-1
* New upstream release
* Temporarily remove evolution support in unstable
* Disable AM_GCONF_SOURCE_2 macro to fix ftbfs in unstable
  - debian/patches/disable_am_gconf_source_2
  - Build-Depends on dh-autoreconf
  - Use --with autoreconf in rules
* debian/control:
  - Build-Depends on libgtk-3-dev
* debian/rules:
  - Remove unnecessary override_dh_auto_install
* debian/copyright:
  - Update copyright years
  - Update license stanza
* Bump Standards-Version to 3.9.1 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
30
30
 
31
31
@INTLTOOL_DESKTOP_RULE@
32
32
 
 
33
desktopdir = $(datadir)/applications
33
34
desktop_in_files = almanah.desktop.in
34
 
desktopdir = $(datadir)/applications
35
35
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
36
36
 
37
37
###############################################################################
38
 
# GConf schemas
 
38
# GSettings schemas
39
39
###############################################################################
40
40
 
41
 
@INTLTOOL_SCHEMAS_RULE@
42
 
 
43
 
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
44
 
schemas_in_files = almanah.schemas.in
45
 
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
46
 
 
47
 
install-data-local:
48
 
if GCONF_SCHEMAS_INSTALL
49
 
        @GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 \
50
 
                --makefile-install-rule $(schemas_DATA) || \
51
 
                (echo ;\
52
 
                echo "*****************************************************"; \
53
 
                echo "Installation of schemas failed: install them manually"; \
54
 
                echo "*****************************************************";)
55
 
        @true
56
 
endif
 
41
gsettings_SCHEMAS = org.gnome.almanah.gschema.xml
 
42
 
 
43
@GSETTINGS_RULES@
 
44
@INTLTOOL_XML_NOMERGE_RULE@
 
45
 
 
46
# Data migration tool
 
47
convertdir = $(datadir)/GConf/gsettings
 
48
convert_DATA = almanah.convert
57
49
 
58
50
###############################################################################
59
51
# General
62
54
EXTRA_DIST = \
63
55
        $(ui_DATA)              \
64
56
        $(desktop_in_files)     \
65
 
        $(schemas_in_files)
 
57
        $(schemas_in_files)     \
 
58
        $(convert_DATA)
66
59
CLEANFILES = \
67
60
        $(desktop_DATA)         \
68
 
        $(schemas_DATA)
 
61
        $(gsettings_SCHEMAS)
69
62
 
70
63
-include $(top_srcdir)/git.mk