diff options
-rw-r--r-- | debian/changelog | 5 | ||||
-rw-r--r-- | debian/control | 27 | ||||
-rw-r--r-- | debian/copyright | 24 | ||||
-rw-r--r-- | debian/libresource0-dev.install | 8 | ||||
-rw-r--r-- | debian/libresource0-progs.install | 2 | ||||
-rw-r--r-- | debian/libresource0.install | 2 | ||||
-rw-r--r-- | debian/patches/001-fixcompile.patch | 20 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 8 |
9 files changed, 73 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index 401250c..013869f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -libresource (0.21.0-git.20101126t140946.1c1b8ab-0linaro4) natty; urgency=low +libresource (0.21.0-git.20101126t140946.1c1b8ab-0linaro6) natty; urgency=low - * Fix build, add dbus-1.0 include to path + * Fix build, add dbus-1.0 includes to path * fix debian/copyright file + * debian/control debian/compat use debhelper 7+ -- Tom Gall <tom.gall@linaro.org> Tue, 11 Jan 2011 15:52:25 -0600 diff --git a/debian/control b/debian/control index 235ff99..a28b4f3 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,33 @@ Section: misc Priority: optional Maintainer: Harri Mahonen <harri.mahonen@gmail.com> Uploaders: Tom Gall <tom.gall@linaro.org> -Build-Depends: debhelper (>= 7.0.0), cdbs, libglib2.0-dev, dh-autoreconf, libdbus-1-dev, libdbus-glib-1-dev, check +Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, libdbus-1-dev, libdbus-glib-1-dev, automake, autoconf, libtool Standards-Version: 3.9.1 -Package: libresource +Package: libresource0 Architecture: any -Section: embedded +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Resource policy client library + Resource policy client library over the d-bus protocol. + . + Package contains shared libs. + +Package: libresource0-dev +Architecture: any +Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends} Description: Resource policy client library + Resource policy client library over the d-bus protocol. + . + Package contains static libs,includes and docs. +Package: libresource0-progs +Architecture: any +Section: embedded +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Resource policy client library + fmradio and resource-client library programs + included as part of libresource + . diff --git a/debian/copyright b/debian/copyright index b063812..bbc397e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,10 +3,30 @@ Name: libresource Source: git://gitorious.org/maemo-multimedia/libresource Files: * -Copyright: 2010, Harri Mahonen +Copyright: 2010, Nokia Corporation License: LGPL-2.1 Files: debian/* Copyright: 2010 Linaro Limited -License: LGPL-2.1+ +License: LGPL-2.1 + +License: LGPL-2.1 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License (LGPL) as published by the Free Software Foundation; + either version 2 of the License, or (at your option) any later + version. + . + This library 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU Library General Public + License, version 2, can be found in /usr/share/common-licenses/LGPL-2.1. diff --git a/debian/libresource0-dev.install b/debian/libresource0-dev.install new file mode 100644 index 0000000..3c0ba9d --- /dev/null +++ b/debian/libresource0-dev.install @@ -0,0 +1,8 @@ +usr/include +usr/lib/libresource.a +usr/lib/libresource.la +usr/lib/libresource.so +usr/lib/libresource-glib.a +usr/lib/libresource-glib.la +usr/lib/libresource-glib.so +usr/lib/pkgconfig diff --git a/debian/libresource0-progs.install b/debian/libresource0-progs.install new file mode 100644 index 0000000..aac7251 --- /dev/null +++ b/debian/libresource0-progs.install @@ -0,0 +1,2 @@ +/usr/bin/fmradio +/usr/bin/resource-client diff --git a/debian/libresource0.install b/debian/libresource0.install new file mode 100644 index 0000000..3240457 --- /dev/null +++ b/debian/libresource0.install @@ -0,0 +1,2 @@ +usr/lib/libresource.so.* +usr/lib/libresource-glib.so.* diff --git a/debian/patches/001-fixcompile.patch b/debian/patches/001-fixcompile.patch index a5583e4..0567f7b 100644 --- a/debian/patches/001-fixcompile.patch +++ b/debian/patches/001-fixcompile.patch @@ -1,13 +1,11 @@ -Index: libresource/tests/Makefile.am +Index: libresource-0.21.0-git.20101126t140946.1c1b8ab/Makefile.am =================================================================== ---- libresource.orig/tests/Makefile.am 2011-01-10 17:14:48.827529309 -0600 -+++ libresource/tests/Makefile.am 2011-01-10 17:15:33.087529322 -0600 -@@ -2,7 +2,7 @@ - - resource_test_SOURCES = resource-test.c ../src/resource.c - --resource_test_CFLAGS = -I$(top_srcdir)/src @DBUS_CFLAGS@ -+resource_test_CFLAGS = -I$(top_srcdir)/src -I/usr/include/dbus-1.0 @DBUS_CFLAGS@ - resource_test_LDADD = -lcheck \ - @DBUS_LIBS@ +--- libresource-0.21.0-git.20101126t140946.1c1b8ab.orig/Makefile.am 2011-01-17 16:09:42.360803734 -0600 ++++ libresource-0.21.0-git.20101126t140946.1c1b8ab/Makefile.am 2011-01-17 16:10:42.482849734 -0600 +@@ -1,5 +1,5 @@ + EXTRA_DIST = autogen.sh build-aux/git-version-gen +-SUBDIRS = src client examples tests ++SUBDIRS = src client examples + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libresource0.pc libresource0-glib.pc diff --git a/debian/patches/series b/debian/patches/series index 91ef030..3c85d1a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 001-fixcompile.patch -debian-changes-0.21.0-git.20101126t140946.1c1b8ab-0linaro2 diff --git a/debian/rules b/debian/rules index a99ec39..ad9c3aa 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 + %: dh $@ @@ -16,11 +17,8 @@ override_dh_auto_configure: ./autogen.sh ./configure --prefix=/usr -override_dh_auto_test: - echo "Don't run tests" - -override_dh_usrlocal: - echo "don't run usrlocal" +#override_dh_auto_test: +# echo "Don't run tests" DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //') DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //') |