← Back to branch summary

~ubuntu-branches/ubuntu/precise/simple-scan/precise

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-08-22 14:39:00 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822143900-mas00fbdm5evsv8a
Tags: 3.1.3-0ubuntu1
* New upstream release.
* debian/control: Update build-deps as per configure.ac: valac (>= 0.13.0),
  GTK 2 → 3, drop libgconf2-dev.
* debian/watch: Look for *.tar.bz2.
* 01-zlib.patch: Update for new upstream version.
* Disable 20-lpi.patch for now, needs porting to vala.

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
8
8
utilities_DATA = $(utilities_in_files:.desktop.in=.desktop)
9
9
@INTLTOOL_DESKTOP_RULE@
10
10
 
11
 
schemadir = @GCONF_SCHEMA_FILE_DIR@
12
 
schema_in_files = simple-scan.schemas.in
13
 
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
14
 
@INTLTOOL_SCHEMAS_RULE@
 
11
gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
 
12
@INTLTOOL_XML_NOMERGE_RULE@
 
13
@GSETTINGS_RULES@
15
14
 
16
15
man1_MANS = simple-scan.1
17
16
 
18
 
EXTRA_DIST = $(ui_DATA) $(utilities_in_files) $(schema_in_files) $(man1_MANS)
 
17
EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS)
19
18
 
20
19
DISTCLEANFILES = \
21
20
        Makefile.in \
22
21
        $(schema_DATA) \
23
 
        $(utilities_DATA)
 
22
        $(utilities_DATA) \
 
23
        $(gsettings_SCHEMAS)