aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/README.source58
-rw-r--r--debian/changelog168
-rw-r--r--debian/compat2
-rw-r--r--debian/control30
-rwxr-xr-xdebian/rules16
-rw-r--r--debian/source/format2
6 files changed, 120 insertions, 156 deletions
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 5dde0bf8..00000000
--- a/debian/README.source
+++ /dev/null
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- break
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/changelog b/debian/changelog
index 1b7581f8..6bc47925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,117 +1,129 @@
-indicator-keyboard (0.0.0-0ubuntu19) saucy; urgency=low
+indicator-keyboard (0.0.0+14.04.20131029.1-0ubuntu1) trusty; urgency=low
- * debian/control:
- - Don't build-depend on vala-0.20-vapi
- - Build-depend on dbus for tests
-
- -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 15 Jul 2013 21:00:06 -0400
-
-indicator-keyboard (0.0.0-0ubuntu18) saucy; urgency=low
-
- * Add indicator schema.
- * Repair test fixtures.
-
- -- William Hua <william.hua@canonical.com> Mon, 15 Jul 2013 20:37:40 -0400
-
-indicator-keyboard (0.0.0-0ubuntu17) saucy; urgency=low
-
- * Minor fixes.
-
- -- William Hua <william.hua@canonical.com> Thu, 27 Jun 2013 11:38:17 -0400
-
-indicator-keyboard (0.0.0-0ubuntu16) saucy; urgency=low
-
- * Remove autopilot support.
-
- -- William Hua <william.hua@canonical.com> Mon, 24 Jun 2013 17:13:03 -0400
+ [ Dmitrijs Ledkovs ]
+ * Define "ubiquity" indicator profile, reusing the greeter object. (LP:
+ #1241539)
-indicator-keyboard (0.0.0-0ubuntu15) saucy; urgency=low
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 155
- * Experimental non-null support.
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 29 Oct 2013 10:30:36 +0000
- -- William Hua <william.hua@canonical.com> Sat, 22 Jun 2013 16:25:44 -0400
+indicator-keyboard (0.0.0+13.10.20131010.1-0ubuntu1) saucy; urgency=low
-indicator-keyboard (0.0.0-0ubuntu14) saucy; urgency=low
+ [ William Hua ]
+ * Don't set LightDM's layout if we're in a session. (LP: 1226962).
+ (LP: #1226962)
- * Update indicator service manifest.
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 134
- -- William Hua <william.hua@canonical.com> Thu, 20 Jun 2013 15:20:09 -0400
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 10 Oct 2013 12:36:09 +0000
-indicator-keyboard (0.0.0-0ubuntu13) saucy; urgency=low
+indicator-keyboard (0.0.0+13.10.20131004-0ubuntu1) saucy; urgency=low
- * Migrate old keyboard layouts.
+ [ William Hua ]
+ * Set the selected user's first keyboard layout whenever it changes
+ under unity-greeter. (LP #1233945). (LP: #1233945)
- -- William Hua <william.hua@canonical.com> Thu, 20 Jun 2013 13:50:00 -0400
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 125
-indicator-keyboard (0.0.0-0ubuntu12) saucy; urgency=low
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 04 Oct 2013 02:28:12 +0000
- * Remove indicator-keyboard-schema.
+indicator-keyboard (0.0.0+13.10.20130924.2-0ubuntu3) saucy; urgency=low
- -- William Hua <william.hua@canonical.com> Wed, 19 Jun 2013 10:15:00 -0400
+ * Updated POTFILES.skip, seems to be required as well.
-indicator-keyboard (0.0.0-0ubuntu11) saucy; urgency=low
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 27 Sep 2013 17:09:25 +0200
- * Per-window fixes.
+indicator-keyboard (0.0.0+13.10.20130924.2-0ubuntu2) saucy; urgency=low
- -- William Hua <william.hua@canonical.com> Wed, 19 Jun 2013 08:52:36 -0400
+ * Update translations template (workaround launchpad bug) (lp: #1223488)
-indicator-keyboard (0.0.0-0ubuntu10) saucy; urgency=low
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 27 Sep 2013 16:10:01 +0200
- * Build depend on dh-translations.
+indicator-keyboard (0.0.0+13.10.20130924.2-0ubuntu1) saucy; urgency=low
- -- William Hua <william.hua@canonical.com> Fri, 14 Jun 2013 09:34:50 -0400
+ [ William Hua ]
+ * Fall-back on old unity-greeter keyboard layouts in case migration
+ hasn't occurred. (LP: #1228489)
-indicator-keyboard (0.0.0-0ubuntu9) saucy; urgency=low
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 116
- * dh --with translations.
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 24 Sep 2013 08:58:16 +0000
- -- William Hua <william.hua@canonical.com> Thu, 13 Jun 2013 17:07:42 -0400
+indicator-keyboard (0.0.0+13.10.20130829.1-0ubuntu1) saucy; urgency=low
-indicator-keyboard (0.0.0-0ubuntu8) saucy; urgency=low
+ [ William Hua ]
+ * Append input source suffix to accessible-desc as described in design
+ spec.
- * Build depend on libgee-dev.
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 112
- -- William Hua <william.hua@canonical.com> Mon, 10 Jun 2013 15:23:33 -0400
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 29 Aug 2013 06:06:42 +0000
-indicator-keyboard (0.0.0-0ubuntu7) saucy; urgency=low
+indicator-keyboard (0.0.0+13.10.20130829-0ubuntu1) saucy; urgency=low
- * Translations.
- * Use icons from theme.
+ [ Matthieu Baerts ]
+ * Added an 'accessible description' This description is used by other
+ applications (like Cairo-Dock) as label for this icon. (LP:
+ #1217855)
- -- William Hua <william.hua@canonical.com> Mon, 10 Jun 2013 12:11:14 -0400
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 110
-indicator-keyboard (0.0.0-0ubuntu6) saucy; urgency=low
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 29 Aug 2013 02:07:27 +0000
- * Require vala 0.20.
+indicator-keyboard (0.0.0+13.10.20130822.4-0ubuntu1) saucy; urgency=low
- -- William Hua <william.hua@canonical.com> Wed, 15 May 2013 16:57:51 -0400
+ [ William Hua ]
+ * Kill running gvfs instance after tests finish. Because the
+ XDG_RUNTIME_DIR was changed to be in the build-tree, a running gvfs
+ instance held a lock on a file in the directory, preventing it from
+ being cleaned properly, and preventing the build from finishing. So
+ we send a SIGTERM to the running gvfs-fused instance, allowing the
+ build to finish.
+ * Use accountsservice and make work under unity-greeter.
+ * Proper shutdown on SIGTERM.
-indicator-keyboard (0.0.0-0ubuntu5) saucy; urgency=low
+ [ Jeremy Bicha ]
+ * Don't build-depend on quilt and drop debian/README.source, thanks
+ Michael Terry!.
- * Fix icon rendering.
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 108
- -- William Hua <william.hua@canonical.com> Wed, 08 May 2013 17:01:09 -0400
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 22 Aug 2013 20:29:00 +0000
-indicator-keyboard (0.0.0-0ubuntu4) raring; urgency=low
+indicator-keyboard (0.0.0+13.10.20130821-0ubuntu1) saucy; urgency=low
- * Add indicator visibility schema.
-
- -- William Hua <william.hua@canonical.com> Wed, 01 May 2013 14:53:34 -0700
-
-indicator-keyboard (0.0.0-0ubuntu3) raring; urgency=low
-
- * Use dictionary action state.
-
- -- William Hua <william.hua@canonical.com> Fri, 26 Apr 2013 15:03:12 -0400
-
-indicator-keyboard (0.0.0-0ubuntu2) raring; urgency=low
-
- * GBytesIcon support.
-
- -- William Hua <william.hua@canonical.com> Tue, 16 Apr 2013 10:45:34 -0400
-
-indicator-keyboard (0.0.0-0ubuntu1) raring; urgency=low
+ [ Jeremy Bicha ]
+ * debian/control:
+ - Don't build-depend on vala-0.20-vapi
+ - Build-depend on dbus for tests
+ [ William Hua ]
* Initial Release.
- -- William Hua <william.hua@canonical.com> Wed, 03 Apr 2013 12:37:54 -0400
+ [ Mathieu Trudel-Lapierre ]
+ * Automatic snapshot from revision 102 (bootstrap)
+ * debian/control:
+ - Packaging review, add comment to developers.
+ - Fix Vcs-Bzr, Vcs-Browser.
+ - Sort Build-Depends, use trailing commas.
+ - Improve long description.
+ * debian/rules:
+ - Add DPKG_GENSYMBOLS_CHECK_LEVEL = 4.
+ - Override dh_autoreconf to run ./autogen.sh.
+ - Override dh_install to remove .la and .a files.
+ - Run dh_install with --fail-missing.
+ * debian/compat: bump to compat level 9.
+ * debian/source/format: make sure we're using format 1.0.
+
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 103
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Aug 2013 14:07:27 +0000
diff --git a/debian/compat b/debian/compat
index 45a4fb75..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 90eb2451..63e20ab6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,32 +3,36 @@ Section: gnome
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: William Hua <william.hua@canonical.com>
-Build-Depends: quilt,
- debhelper (>= 9.0.0),
+Build-Depends: debhelper (>= 9.0.0),
dh-autoreconf,
dh-translations,
- libgirepository1.0-dev,
- valac,
+ dbus,
+ libaccountsservice-dev,
+ libbamf3-dev,
libgee-dev,
- libgtk-3-dev,
+ libgirepository1.0-dev,
libgnome-desktop-3-dev,
libgnomekbd-dev,
+ libgtk-3-dev,
libibus-1.0-dev (>= 1.5.0),
- libbamf3-dev,
- dbus,
+ liblightdm-gobject-1-dev,
+ valac,
+ xauth,
xvfb,
- xauth
Standards-Version: 3.9.4
Homepage: https://code.launchpad.net/indicator-keyboard
# If you aren't a member of ~indicator-applet-developers but need to upload
# packaging changes, just go ahead. ~indicator-applet-developers will notice
# and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~attente/indicator-keyboard/trunk
-Vcs-Browser: https://bazaar.launchpad.net/~attente/indicator-keyboard/trunk/files
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-keyboard/trunk
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-develpers/indicator-keyboard/trunk/files
Package: indicator-keyboard
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
Description: Keyboard indicator
- This package contains the keyboard indicator.
+ This package contains the keyboard indicator, which should show as an icon in
+ the top panel when using the Unity environment. It can be used to switch
+ key layouts or languages, and helps the user identifying which layouts are
+ currently in use.
diff --git a/debian/rules b/debian/rules
index c816d1da..d2bfba7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,19 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
%:
dh $@ --with autoreconf,translations
+
+override_dh_autoreconf:
+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_install:
+ find debian/indicator-keyboard/usr/lib -name *.la -delete
+ find debian/indicator-keyboard/usr/lib -name *.a -delete
+ dh_install --fail-missing
+
diff --git a/debian/source/format b/debian/source/format
index 89ae9db8..d3827e75 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+1.0
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 08:48:50 +0000