aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzr-builddeb/default.conf2
-rw-r--r--NEWS5
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am2
-rw-r--r--data/indicator-bluetooth.service.in2
-rw-r--r--debian/changelog61
-rw-r--r--debian/compat1
-rw-r--r--debian/control32
-rw-r--r--debian/copyright21
-rwxr-xr-xdebian/rules14
-rw-r--r--debian/source/format1
-rw-r--r--debian/watch2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/indicator-bluetooth-service.vala2
-rw-r--r--src/indicator-bluetooth.vala2
15 files changed, 145 insertions, 6 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..6c96a98
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True
diff --git a/NEWS b/NEWS
index 197fd06..0864265 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Overview of changes in indicator-bluetooth 0.0.5
+
+ * Add license file
+ * Update copyright date
+
Overview of changes in indicator-bluetooth 0.0.4
* Stop items being duplicated on resume from suspend
diff --git a/configure.ac b/configure.ac
index 5f5f64a..758c71a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(indicator-bluetooth, 0.0.4)
+AC_INIT(indicator-bluetooth, 0.0.5)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE
diff --git a/data/Makefile.am b/data/Makefile.am
index a279245..ac63ebc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ dbus_servicesdir = $(DBUSSERVICEDIR)
dbus_services_DATA = indicator-bluetooth.service
%.service: %.service.in
- sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
EXTRA_DIST = indicator-bluetooth.service.in
diff --git a/data/indicator-bluetooth.service.in b/data/indicator-bluetooth.service.in
index 8b7a8cb..4d1c445 100644
--- a/data/indicator-bluetooth.service.in
+++ b/data/indicator-bluetooth.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=com.canonical.indicator.bluetooth
-Exec=@libexecdir@/indicator-bluetooth-service
+Exec=@pkglibexecdir@/indicator-bluetooth-service
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..25ae456
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,61 @@
+indicator-bluetooth (0.0.6-0ubuntu1) UNRELEASED; urgency=low
+
+ * debian/copyright:
+ - Note that code is GPL-3, not GPL-3+
+ * debian/control:
+ - Add Vcs-Bzr entries
+ * debian/source/format:
+ - Switch to format 1.0, to match rest of indicator stack and for our
+ daily landing support to work.
+ * Automatic snapshot from revision 44 (bootstrap)
+
+ -- Michael Terry <mterry@ubuntu.com> Tue, 05 Feb 2013 11:14:32 -0500
+
+indicator-bluetooth (0.0.5-0ubuntu1) raring; urgency=low
+
+ * New upstream release:
+ - Add license file
+ - Update copyright date
+
+ -- Robert Ancell <robert.ancell@canonical.com> Fri, 01 Feb 2013 09:00:07 +1300
+
+indicator-bluetooth (0.0.4-0ubuntu1) raring; urgency=low
+
+ * New upstream release:
+ - Stop items being duplicated on resume from suspend
+ * debian/copyright:
+ - Fix lintian warnings
+ * debian/source/format:
+ - Use format 3.0
+
+ -- Robert Ancell <robert.ancell@canonical.com> Thu, 31 Jan 2013 11:12:42 +1300
+
+indicator-bluetooth (0.0.3-0ubuntu1) raring; urgency=low
+
+ * New upstream release:
+ - Fix service file having incorrect path
+ - Set useful values for accessible description
+ * debian/control:
+ - Use standards version 3.9.4
+
+ -- Robert Ancell <robert.ancell@canonical.com> Fri, 11 Jan 2013 14:09:33 +1300
+
+indicator-bluetooth (0.0.2-0ubuntu1) raring; urgency=low
+
+ * New upstream release:
+ - Stop feedback loop when settings changed outside of indicator
+ - Implement disconnecting from devices
+ - Add accessible description
+ - Hide devices without controls
+ - Change enable label to match design
+ - Added translations
+ * debian/watch:
+ - Update to use .xz
+
+ -- Robert Ancell <robert.ancell@canonical.com> Tue, 08 Jan 2013 16:55:27 +1300
+
+indicator-bluetooth (0.0.1-0ubuntu1) raring; urgency=low
+
+ * Initial release
+
+ -- Robert Ancell <robert.ancell@canonical.com> Thu, 06 Dec 2012 16:04:48 +1300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..0725eb0
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,32 @@
+Source: indicator-bluetooth
+Section: gnome
+Priority: extra
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+Build-Depends: debhelper (>= 9.0),
+ dh-autoreconf,
+ dh-translations,
+ gnome-common,
+ libdbusmenu-gtk3-dev,
+ libglib2.0-dev,
+ libgnome-bluetooth-dev,
+ libgtk-3-dev,
+ libido3-0.1-dev,
+ libindicator3-dev,
+ valac-0.18,
+Standards-Version: 3.9.4
+Homepage: https://launchpad.net/indicator-bluetooth
+# 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/~indicator-applet-developers/indicator-bluetooth/trunk
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-bluetooth/trunk/files
+
+Package: indicator-bluetooth
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ gnome-bluetooth,
+Description: System bluetooth indicator.
+ System bluetooth indicator which provides fast user controls for Bluetooth
+ devices.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..ae877a3
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,21 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: 2012 Canonical Ltd.
+License: GPL-3
+
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file /usr/share/common-licenses/GPL-3.
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..ca87700
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
+%:
+ dh $@ --with translations,autoreconf
+
+override_dh_autoreconf:
+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_install:
+ find debian/indicator-bluetooth/usr/lib -name *.la -delete
+ find debian/indicator-bluetooth/usr/lib -name *.a -delete
+ dh_install --fail-missing
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..d75864c
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/indicator-bluetooth/+download .*/indicator-bluetooth-([0-9.]+)\.tar\.xz
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a0b790..6bbb623 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-libexec_PROGRAMS = indicator-bluetooth-service
+pkglibexec_PROGRAMS = indicator-bluetooth-service
indicatordir = $(INDICATORDIR)
indicator_LTLIBRARIES = libbluetooth.la
diff --git a/src/indicator-bluetooth-service.vala b/src/indicator-bluetooth-service.vala
index 4b62e74..63e634d 100644
--- a/src/indicator-bluetooth-service.vala
+++ b/src/indicator-bluetooth-service.vala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2013 Canonical Ltd.
* Author: Robert Ancell <robert.ancell@canonical.com>
*
* This program is free software: you can redistribute it and/or modify it under
diff --git a/src/indicator-bluetooth.vala b/src/indicator-bluetooth.vala
index 729c1bf..4f3aef8 100644
--- a/src/indicator-bluetooth.vala
+++ b/src/indicator-bluetooth.vala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2013 Canonical Ltd.
* Author: Robert Ancell <robert.ancell@canonical.com>
*
* This program is free software: you can redistribute it and/or modify it under