diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 7 | ||||
| -rw-r--r-- | data/com.canonical.indicator.keyboard.gschema.xml | 10 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/indicator-keyboard-schema.install | 1 |
6 files changed, 8 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index d00c6f10..1d0159ba 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [The prefix for our AM_GLIB_GNU_GETTEXT IT_PROG_INTLTOOL -GLIB_GSETTINGS - AM_PATH_PYTHON PKG_CHECK_MODULES([GEE], [gee-1.0]) diff --git a/data/Makefile.am b/data/Makefile.am index b65c47ff..009024e4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -48,10 +48,5 @@ indicator-keyboard.indicator: echo 'ObjectPath=/com/canonical/indicator/keyboard') > $@.tmp && \ mv $@.tmp $@ -gsettings_SCHEMAS = com.canonical.indicator.keyboard.gschema.xml - -@GSETTINGS_RULES@ - EXTRA_DIST = $(dist_service_DATA) \ - $(dist_indicator_DATA) \ - $(gsettings_SCHEMAS) + $(dist_indicator_DATA) diff --git a/data/com.canonical.indicator.keyboard.gschema.xml b/data/com.canonical.indicator.keyboard.gschema.xml deleted file mode 100644 index b201ec3c..00000000 --- a/data/com.canonical.indicator.keyboard.gschema.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schemalist> - <schema path="/com/canonical/indicator/keyboard/" id="com.canonical.indicator.keyboard"> - <key type="b" name="visible"> - <default>true</default> - <summary>Keyboard indicator visibility</summary> - <description>True if the keyboard indicator is shown, false otherwise.</description> - </key> - </schema> -</schemalist> diff --git a/debian/changelog b/debian/changelog index 58d9b6ba..12262835 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-keyboard (0.0.0-0ubuntu12) saucy; urgency=low + + * Remove indicator-keyboard-schema. + + -- William Hua <william.hua@canonical.com> Wed, 19 Jun 2013 10:15:00 -0400 + indicator-keyboard (0.0.0-0ubuntu11) saucy; urgency=low * Per-window fixes. diff --git a/debian/control b/debian/control index 5e576573..4aabea2a 100644 --- a/debian/control +++ b/debian/control @@ -25,18 +25,10 @@ Vcs-Browser: https://bazaar.launchpad.net/~attente/indicator-keyboard/trunk/file Package: indicator-keyboard Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - indicator-keyboard-schema (= ${source:Version}) + ${misc:Depends} Description: Keyboard indicator This package contains the keyboard indicator. -Package: indicator-keyboard-schema -Architecture: all -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Keyboard indicator schema - This package contains the keyboard indicator schema. - Package: indicator-keyboard-autopilot Architecture: all Depends: ${misc:Depends}, diff --git a/debian/indicator-keyboard-schema.install b/debian/indicator-keyboard-schema.install deleted file mode 100644 index 3ce6aa9f..00000000 --- a/debian/indicator-keyboard-schema.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/glib-2.0/schemas/com.canonical.indicator.keyboard.gschema.xml |