From 41f91fb03beed16bfadd770c059735272e27df3a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 19 Aug 2014 20:25:55 -0500 Subject: initial pass at debian/ directory --- debian/changelog | 0 debian/compat | 1 + debian/control | 27 +++++++++++++++++++++++++++ debian/copyright | 21 +++++++++++++++++++++ debian/rules | 10 ++++++++++ 5 files changed, 59 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules (limited to 'debian') diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e69de29 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..e174f31 --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: indicator-display +Section: misc +Priority: optional +Maintainer: Charles Kerr +# make g++ version explicit for ABI safety +Build-Depends: cmake, + dbus, + g++-4.9, + debhelper (>= 9), + dh-translations, + intltool (>= 0.35.0), + libglib2.0-dev (>= 2.36), + libgtest-dev, + liburl-dispatcher1-dev, +Standards-Version: 3.9.4 +Homepage: http://launchpad.net/indicator-display/ +# 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-display/trunk.14.10 + +Package: indicator-display +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813), +Description: Miscellaneous small Indicators. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..21333a8 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,21 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: indicator-location +Source: http://launchpad.net/indicator-location + +Files: * +Copyright: 2014, Canonical Ltd. +License: GPL-3 + This package 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 package 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 + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e39944a --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +# Explicitly selecting a G{CC,++}-version here to avoid ABI breaks +# introduced by toolchain updates. +export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9 +export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9 + +%: + dh $@ --with translations + -- cgit v1.2.3 From ec2c7ec58b192e0b907239ad1ff840fe69b4da56 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 19 Aug 2014 22:25:45 -0500 Subject: get skeletal service and tests building --- debian/control | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index e174f31..fe33f52 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,21 @@ Source: indicator-display Section: misc Priority: optional Maintainer: Charles Kerr -# make g++ version explicit for ABI safety Build-Depends: cmake, dbus, +# make g++ version explicit for ABI safety g++-4.9, - debhelper (>= 9), - dh-translations, - intltool (>= 0.35.0), libglib2.0-dev (>= 2.36), + liburl-dispatcher1-deva +# for coverage reports + lcov, +# for tests + cppcheck, libgtest-dev, - liburl-dispatcher1-dev, + google-mock (>= 1.6.0+svn437), +# for packaging + debhelper (>= 9), + dh-translations, Standards-Version: 3.9.4 Homepage: http://launchpad.net/indicator-display/ # If you aren't a member of ~indicator-applet-developers but need to upload -- cgit v1.2.3 From 1b90575c67de3cf6459785cc18e3d661a826bece Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Aug 2014 22:35:16 -0500 Subject: add rotation lock indicator --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e69de29..58b5072 100644 --- a/debian/changelog +++ b/debian/changelog @@ -0,0 +1,6 @@ +indicator-display (0.1-0ubuntu1) utopic; urgency=medium + + * Initial release. + + -- Charles Kerr Wed, 20 Aug 2014 15:29:27 -0500 + diff --git a/debian/control b/debian/control index fe33f52..a972cc9 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: cmake, g++-4.9, libglib2.0-dev (>= 2.36), liburl-dispatcher1-deva + libproperties-cpp-dev, # for coverage reports lcov, # for tests -- cgit v1.2.3 From 81e6d9633da0ac96b919032e51f5ae48f77113db Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Aug 2014 22:56:45 -0500 Subject: remove url-dispatcher dependency. --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a972cc9..9c84ef5 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: cmake, # make g++ version explicit for ABI safety g++-4.9, libglib2.0-dev (>= 2.36), - liburl-dispatcher1-deva libproperties-cpp-dev, # for coverage reports lcov, -- cgit v1.2.3 From 8fc611f6e3f1062446353bcb7b2822f561d83be4 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 20 Aug 2014 23:40:51 -0500 Subject: unit tests passing on desktop and phone, but not in jenkins -- adding gsettings-ubuntu-schemas to build-depends. --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 9c84ef5..b6ef7ca 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: cmake, cppcheck, libgtest-dev, google-mock (>= 1.6.0+svn437), + gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813), # for packaging debhelper (>= 9), dh-translations, -- cgit v1.2.3 From 6240ab516f3cb783d9fb5f450cf0e292fc5915c0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Aug 2014 11:56:44 -0500 Subject: in debian/control, make the Description more informative --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index b6ef7ca..f708fa9 100644 --- a/debian/control +++ b/debian/control @@ -30,4 +30,4 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813), -Description: Miscellaneous small Indicators. +Description: Indicators too small to merit individual codebases; e.g. the rotation lock indicator -- cgit v1.2.3 From ce4b2f4c185105db22e1d6519c2b4d1ce0884008 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Aug 2014 11:58:23 -0500 Subject: fix copy-paste error --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 21333a8..7809d7c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: indicator-location -Source: http://launchpad.net/indicator-location +Upstream-Name: indicator-display +Source: http://launchpad.net/indicator-display Files: * Copyright: 2014, Canonical Ltd. -- cgit v1.2.3 From f9bbdce4bf0edf1b879749e63f1a4a7ce1fc89d6 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Aug 2014 18:53:01 -0500 Subject: in control/debian, split Description into a shorter description plus an extended description. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f708fa9..e9fcfac 100644 --- a/debian/control +++ b/debian/control @@ -30,4 +30,5 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813), -Description: Indicators too small to merit individual codebases; e.g. the rotation lock indicator +Description: Collection of small indicators + Indicators too small to merit separate codebases, such as Rotation Lock -- cgit v1.2.3 From 415f18f56667eea5c650d209b9ac1464a70ef7f5 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 21 Aug 2014 19:07:19 -0500 Subject: in debian/control, bump Standards-Version from 3.9.4 to 3.9.5 to make lintian happy --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index e9fcfac..3c274ac 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: cmake, # for packaging debhelper (>= 9), dh-translations, -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://launchpad.net/indicator-display/ # 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 -- cgit v1.2.3