From 9f5954f81cba5a55e09db7f8d023dc8dc65199f9 Mon Sep 17 00:00:00 2001 From: Tom Gall Date: Mon, 24 Jan 2011 16:21:37 -0600 Subject: added debian dir to package for linaro --- debian/changelog | 8 ++++ debian/compat | 1 + debian/control | 26 ++++++++++++ debian/copyright | 32 ++++++++++++++ debian/libresourceqt1-dev.install | 6 +++ debian/libresourceqt1.install | 3 ++ debian/patches/001-fixcompile.patch | 25 +++++++++++ debian/patches/series | 1 + debian/rules | 83 +++++++++++++++++++++++++++++++++++++ debian/source/format | 1 + 10 files changed, 186 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/libresourceqt1-dev.install create mode 100644 debian/libresourceqt1.install create mode 100644 debian/patches/001-fixcompile.patch create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a70651c --- /dev/null +++ b/debian/changelog @@ -0,0 +1,8 @@ +libresourceqt (1.26-git.20101213t174343.d6ef695-0linaro3) natty; urgency=low + + * update debian/copyright + * remove build of resource-client (demo program which is busted, not needed) + * small fix to add -lrt -lresource to link libs + * Package for Linaro + + -- Tom Gall Mon, 10 Jan 2011 16:21:58 -0600 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..8ad655e --- /dev/null +++ b/debian/control @@ -0,0 +1,26 @@ +Source: libresourceqt +Section: misc +Priority: optional +Maintainer: Wolf Bergenheim +Uploaders: Tom Gall +Build-Depends: debhelper (>= 7.0.50), libqt4-dev (>= 4.6), libresource, libdbus-1-dev, doxygen, graphviz +Standards-Version: 3.9.1 + +Package: libresourceqt1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: QT wrapper for libresource + QT wrapper library for libresource + . + Package includes shared libs. + +Package: libresourceqt1-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Qt wrapper for libresource + Qt wrapper library for libresource + . + Package contains links to shared libs, includes and docs. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..93c1654 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,32 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libresourceqt +Source: git://gitorious.org/maemo-multimedia/libresourceqt + +Files: * +Copyright: 2010, Wolf Bergenheim +License: LGPL-2.1 + +Files: debian/* +Copyright: 2010 Linaro Limited +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/libresourceqt1-dev.install b/debian/libresourceqt1-dev.install new file mode 100644 index 0000000..f8144c7 --- /dev/null +++ b/debian/libresourceqt1-dev.install @@ -0,0 +1,6 @@ +usr/include +usr/lib/libresourceqt.so +usr/lib/libdbus-qeventloop.so +usr/lib/pkgconfig +usr/share/doc +usr/share/man diff --git a/debian/libresourceqt1.install b/debian/libresourceqt1.install new file mode 100644 index 0000000..259dd5c --- /dev/null +++ b/debian/libresourceqt1.install @@ -0,0 +1,3 @@ +usr/lib/libresourceqt.so.* +usr/lib/libdbus-qeventloop.so.* + diff --git a/debian/patches/001-fixcompile.patch b/debian/patches/001-fixcompile.patch new file mode 100644 index 0000000..04f9722 --- /dev/null +++ b/debian/patches/001-fixcompile.patch @@ -0,0 +1,25 @@ +Index: libresourceqt/resourceqt-client/resourceqt-client.pro +=================================================================== +--- libresourceqt.orig/resourceqt-client/resourceqt-client.pro 2011-01-10 22:07:08.044215314 -0600 ++++ libresourceqt/resourceqt-client/resourceqt-client.pro 2011-01-10 22:07:12.092215315 -0600 +@@ -35,6 +35,8 @@ + QMAKE_CFLAGS += -std=c99 -D_POSIX_C_SOURCE=199309L + QMAKE_LFLAGS = -L$${LIBRESOURCEQT}/build -lresourceqt -L$${LIBDBUSQEVENTLOOP}/build -ldbus-qeventloop -lrt + ++LIBS += -lrt -lresource ++ + # Input + HEADERS = client.h commandlineparser.h time-stat.h + SOURCES += resourceqt-client.cpp commandlineparser.cpp client.cpp time-stat.c +Index: libresourceqt/libresourceqt.pro +=================================================================== +--- libresourceqt.orig/libresourceqt.pro 2011-01-10 22:07:17.388215314 -0600 ++++ libresourceqt/libresourceqt.pro 2011-01-10 22:07:28.872215314 -0600 +@@ -24,7 +24,6 @@ + + SUBDIRS = libdbus-qeventloop \ + libresourceqt \ +- resourceqt-client \ + tests + + dist.commands = ./makedist.sh diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3c85d1a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +001-fixcompile.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..4f60f2e --- /dev/null +++ b/debian/rules @@ -0,0 +1,83 @@ +#!/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 + +%: + dh $@ + +#include /usr/share/cdbs/1/rules/debhelper.mk +#include /usr/share/cdbs/1/class/qmake.mk + + +DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //') +DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //') +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//') +DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//') + +GIT_URL := git://gitorious.org/maemo-multimedia/libresourceqt +GIT_BRANCH := "master" +GIT_BRANCH_NAME := libresourceqt + +ifneq (,$(LOCAL_BRANCH)) +LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH)) +endif + + +PACKAGENAME=libresourceqt + +GET_SOURCE = \ + set -e; \ + tmpdir=`mktemp -d -t`; \ + cd $$tmpdir; \ + echo "cloning upstream repository ..."; \ + git clone -b $(GIT_BRANCH) $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)) $(GIT_BRANCH_NAME); \ + echo "getting specific upstream revision/tag: $(1)"; \ + cd `ls | head -n 1`; git checkout -b orig $(1); \ + commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //' | sed -e 's/\.\.\.$$//'`; \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%dt%H%M%S"`; \ + if echo $(2) | grep -q -c "orig" || echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + upstream_version=$(DEB_MAJOR_VERSION)-git.$$raw.$$commit_id; \ + else \ + upstream_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + cd ..; tar --exclude=.git -czf $(CURDIR)/$(DEB_SOURCE)_$$upstream_version.orig.tar.gz `ls | head -n 1`; \ + cd $(CURDIR); rm -rf $$tmpdir; + + +get-current-source:: $(if $(LOCAL_BRANCH),update-local-branch) + set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + elif echo $(DEB_VERSION) | grep -q -c "~rc"; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^\([0-9\.]*\)\(~rc\)\([0-9]\)-.*$$/\1-rc\3/'`; \ + else \ + git_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + $(call GET_SOURCE, $$git_version, "current") + +get-orig-source:: $(if $(LOCAL_BRANCH),update-local-branch) + $(call GET_SOURCE, "HEAD", "orig") + +update-local-branch:: + @echo "updating local branch ($(LOCAL_BRANCH))" + @set -e; if ! test -d $(LOCAL_BRANCH); then mkdir -p $(LOCAL_BRANCH); fi + @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); if ! `git branch | grep -q -c "$(GIT_BRANCH)"`; then git branch $(GIT_BRANCH) remotes/origin/$(GIT_BRANCH); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git checkout $(GIT_BRANCH); git pull -f + @echo "updated local branch ($(LOCAL_BRANCH))" + +get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch) + @set -e; \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc $$git_version | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y-%m-%d %H:%M:%S (GMT)"`; \ + git log -n1 $$git_version --format="%n%s%n%n * upstream snapshot $$raw%n + %H%n"; diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v1.2.3