--- libfsobasics-0.9.0+git20100509.orig/configure.ac +++ libfsobasics-0.9.0+git20100509/configure.ac @@ -24,7 +24,7 @@ AC_PATH_PROG(VALAC, valac, valac) AC_SUBST(VALAC) PKG_CHECK_MODULES(VALA, - vala-1.0 >= $VALA_REQUIRED) + vala-0.10 >= $VALA_REQUIRED) # glib and friends PKG_CHECK_MODULES(GLIB, --- libfsobasics-0.9.0+git20100509.orig/debian/libfsobasics0.install +++ libfsobasics-0.9.0+git20100509/debian/libfsobasics0.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- libfsobasics-0.9.0+git20100509.orig/debian/changelog +++ libfsobasics-0.9.0+git20100509/debian/changelog @@ -0,0 +1,89 @@ +libfsobasics (0.9.0+git20100509-2ubuntu2) oneiric; urgency=low + + * Backport from upstream: + - Fix delegates for Vala 0.9.3 (LP: #749284). + - Mark EnumValue as nullable before trying to compare it with null. + * Clean dependency_libs from .la files, using clean-la.mk from + gnome-pkg-tools. + + -- Colin Watson Tue, 16 Aug 2011 14:33:18 +0100 + +libfsobasics (0.9.0+git20100509-2ubuntu1) natty; urgency=low + + * Transition from libvala-dev to libvala-0.10-dev. (LP: #618809) + + -- Barry Warsaw Sat, 08 Jan 2011 19:37:17 +0100 + +libfsobasics (0.9.0+git20100509-2) unstable; urgency=low + + * Modify patch 0001 to also forward declare the missing functions + vala_library_init and vala_library_fini. This patch was also + accepted upstream. (Closes: #573504) + + -- Heiko Stuebner Mon, 17 May 2010 17:20:32 +0200 + +libfsobasics (0.9.0+git20100509-1) unstable; urgency=low + + * New upstream snapshot + * Add two patches to fix some of the implicit declared functions + * Builds again with vala >= 0.8.0 (Closes: #577349) + + -- Heiko Stuebner Sat, 15 May 2010 20:25:12 +0200 + +libfsobasics (0.9.0+git20100304-2) unstable; urgency=low + + * Added forgotten dependency on libnl2-dev to libfsobasics-dev. + + -- Heiko Stuebner Thu, 11 Mar 2010 20:18:12 +0100 + +libfsobasics (0.9.0+git20100304-1) unstable; urgency=low + + * New upstream snapshot + * Bump standards to 3.8.4 + * Add libnl2 to build-depends + + -- Heiko Stuebner Wed, 10 Mar 2010 18:21:12 +0100 + +libfsobasics (0.9.0+git20091226-1) unstable; urgency=low + + * New upstream snapshot + + -- Heiko Stuebner Mon, 11 Jan 2010 20:10:12 +0100 + +libfsobasics (0.9.0+git20091225-1) unstable; urgency=low + + * New upstream snapshot + + -- Heiko Stuebner Tue, 05 Jan 2010 21:17:33 +0100 + +libfsobasics (0.8.9.9-1) unstable; urgency=low + + * New upstream release + + -- Heiko Stuebner Wed, 11 Nov 2009 18:17:33 +0100 + +libfsobasics (0.8.3.1+git20090918-1) unstable; urgency=low + + * New upstream snapshot + + -- Heiko Stuebner Mon, 21 Sep 2009 20:48:12 +0200 + +libfsobasics (0.8.1.0+git20090812-2) unstable; urgency=low + + * Fixed unnecessary dependency on dbus-1 and dbus-glib-1 + declared by fsobasics-2.0.pc + + -- Heiko Stuebner Wed, 16 Sep 2009 21:48:12 +0200 + +libfsobasics (0.8.1.0+git20090812-1) unstable; urgency=low + + * New upstream-snapshot + * Bump standards to 3.8.3 + + -- Heiko Stuebner Thu, 20 Aug 2009 20:24:12 +0200 + +libfsobasics (0.8.1.0-1) pkg-fso; urgency=low + + * Initial release + + -- Heiko Stuebner Sun, 09 Aug 2009 16:44:12 +0200 --- libfsobasics-0.9.0+git20100509.orig/debian/rules +++ libfsobasics-0.9.0+git20100509/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk + +DEB_DH_STRIP_ARGS := --dbg-package=libfsobasics-dbg +DEB_DH_MAKESHLIBS_ARGS_libfsobasics0 := -V"libfsobasics0 (>= $(DEB_UPSTREAM_VERSION))" + +DEB_INSTALL_DOCS_ALL = + +post-patches:: + autoreconf -f -i -v --- libfsobasics-0.9.0+git20100509.orig/debian/compat +++ libfsobasics-0.9.0+git20100509/debian/compat @@ -0,0 +1 @@ +7 --- libfsobasics-0.9.0+git20100509.orig/debian/libfsobasics-dev.install +++ libfsobasics-0.9.0+git20100509/debian/libfsobasics-dev.install @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/lib*.so +usr/lib/pkgconfig/* +usr/lib/*.la +usr/share/vala/vapi/* --- libfsobasics-0.9.0+git20100509.orig/debian/gbp.conf +++ libfsobasics-0.9.0+git20100509/debian/gbp.conf @@ -0,0 +1,53 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +# the default build command: +#builder = debuild -i\.git/ -I.git +# the default clean command: +#cleaner = debuild clean +# the default branch for upstream sources: +upstream-branch = upstream-dist +# the default branch for the debian patch: +debian-branch = debian +# the default tag formats used: +#upstream-tag = upstream/%(version)s +#debian-tag = debian/%(version)s +# use pristine-tar: +pristine-tar = True + +# Options only affecting git-buildpackage +[git-buildpackage] +#upstream-branch = dfsgclean +# uncomment this to automatically GPG sign tags +#sign-tags = True +# keyid to GPG sign tags with +#keyid = 0xdeadbeef +# push to a remote repository after a successful tag: +#posttag = git-push git.example.com +# use this for more svn-buildpackage like behaviour: +#export-dir = ../build-area/ +#tarball-dir = ../tarballs/ +#ignore-new = True + +# Options only affecting git-import-orig +[git-import-orig] +#upstream-branch = newupstream +#debian-branch = dfsgclean +#filter = .svn + +# Options only affecting git-import-dsc +[git-import-dsc] +#upstream-branch = svn-upstream +#filter = [ 'CVS', '.cvsignore' ] + +# Options only affecting git-dch +[git-dch] +#git-log = --no-merges +#snapshot-number = snapshot + 1 +# include 0 digits of the commit id in the changelog enty +#id-length = 0 +# don't include information from meta tags +#meta = False +# what tags to look for to generate bug-closing changelog entries +#meta-closes = Closes|LP + --- libfsobasics-0.9.0+git20100509.orig/debian/control +++ libfsobasics-0.9.0+git20100509/debian/control @@ -0,0 +1,47 @@ +Source: libfsobasics +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian FreeSmartphone.Org Team +Uploaders: Heiko Stuebner +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7), cdbs, pkg-config, valac-0.10, libvala-0.10-dev, libglib2.0-dev, libnl2-dev, libtool, gnome-pkg-tools +Standards-Version: 3.8.4 +Section: libs +Homepage: http://freesmartphone.org/ +Vcs-Git: git://git.debian.org/git/pkg-fso/libfsobasics.git +Vcs-Browser: http://git.debian.org/?p=pkg-fso/libfsobasics.git;a=summary + +Package: libfsobasics-dev +Section: libdevel +Architecture: any +Depends: libfsobasics0 (= ${binary:Version}), ${misc:Depends}, libnl2-dev +Description: Development files for libfsobasics + This library contains classes useful for + logging and using configuration keyfiles. + . + Development files. + +Package: libfsobasics0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: freesmartphone.org basics library + This library contains classes useful for + logging and using configuration keyfiles. + . + This package is part of the freesmartphone.org software stack + and is targeted for smartphones. + +Package: libfsobasics-dbg +Architecture: any +Section: debug +Depends: ${misc:Depends}, libfsobasics0 (= ${binary:Version}) +Priority: extra +Description: debugging symbols for use with libfsobasics + This library contains classes useful for + logging and using configuration keyfiles. + . + This package contains unstripped shared libraries. It is provided primarily + to provide a backtrace with names in a debugger, this makes it somewhat easier + to interpret core dumps. The libraries are installed in /usr/lib/debug and + are automatically used by gdb. --- libfsobasics-0.9.0+git20100509.orig/debian/copyright +++ libfsobasics-0.9.0+git20100509/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Heiko Stuebner on +Sun, 09 Aug 2009 16:44:12 +0200. + +It was downloaded from http://www.freesmartphone.org + +Upstream Authors: + + Michael 'Mickey' Lauer + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; 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 can be found in `/usr/share/common-licenses/LGPL-2.1'. + +The Debian packaging is copyright 2009, Heiko Stuebner and +is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'. --- libfsobasics-0.9.0+git20100509.orig/debian/patches/0001-fix-implicit-declarations.patch +++ libfsobasics-0.9.0+git20100509/debian/patches/0001-fix-implicit-declarations.patch @@ -0,0 +1,31 @@ +From d242974d1299a4aa6904147f58b7151ce2256e35 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Mon, 17 May 2010 17:09:44 +0200 +Subject: [PATCH] fix implicit declarations + +--- + fsobasics/gcc_libinitexit.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/fsobasics/gcc_libinitexit.c b/fsobasics/gcc_libinitexit.c +index 9cdafa2..7b8db33 100644 +--- a/fsobasics/gcc_libinitexit.c ++++ b/fsobasics/gcc_libinitexit.c +@@ -18,11 +18,14 @@ + */ + + #include ++#include + + // Unfortunately we need to do this in a C file, since Vala + // does not have support for it yet. I have created a bug + // report for that but chances are it won't make it upstream + // See https://bugzilla.gnome.org/show_bug.cgi?id=599606 ++void vala_library_init (void); ++void vala_library_fini (void); + + void gcc_library_init() __attribute__((constructor)); + void gcc_library_fini() __attribute__((destructor)); +-- +1.7.1 + --- libfsobasics-0.9.0+git20100509.orig/debian/patches/0003-fix-delegates.patch +++ libfsobasics-0.9.0+git20100509/debian/patches/0003-fix-delegates.patch @@ -0,0 +1,69 @@ +Description: Fix delegates for Vala 0.9.3 +Author: Michael 'Mickey' Lauer +Origin: upstream, http://anonscm.debian.org/gitweb/?p=pkg-fso/libfsobasics.git;a=commitdiff;h=fc017203e64123e9b64423bf4325785f6772875d +Forwarded: not-needed +Last-Update: 2011-08-16 + +diff -Nur -x '*.orig' -x '*~' libfsobasics-0.9.0+git20100509//configure libfsobasics-0.9.0+git20100509.new//configure +--- libfsobasics-0.9.0+git20100509//configure 2010-05-15 12:01:27.000000000 +0100 ++++ libfsobasics-0.9.0+git20100509.new//configure 2011-08-16 14:21:05.000000000 +0100 +@@ -10764,7 +10764,7 @@ + fi + + fi +-VALA_REQUIRED=0.7.9.7 ++VALA_REQUIRED=0.9.3 + GLIB_REQUIRED=2.18.0 + LIBNL_REQUIRED=2.0 + +diff -Nur -x '*.orig' -x '*~' libfsobasics-0.9.0+git20100509//configure.ac libfsobasics-0.9.0+git20100509.new//configure.ac +--- libfsobasics-0.9.0+git20100509//configure.ac 2011-08-16 14:07:08.000000000 +0100 ++++ libfsobasics-0.9.0+git20100509.new//configure.ac 2011-08-16 14:20:45.000000000 +0100 +@@ -16,7 +16,7 @@ + + # pkg-config + PKG_PROG_PKG_CONFIG +-VALA_REQUIRED=0.7.9.7 ++VALA_REQUIRED=0.9.3 + GLIB_REQUIRED=2.18.0 + LIBNL_REQUIRED=2.0 + +diff -Nur -x '*.orig' -x '*~' libfsobasics-0.9.0+git20100509//fsobasics/asyncworker.vala libfsobasics-0.9.0+git20100509.new//fsobasics/asyncworker.vala +--- libfsobasics-0.9.0+git20100509//fsobasics/asyncworker.vala 2010-05-15 12:01:27.000000000 +0100 ++++ libfsobasics-0.9.0+git20100509.new//fsobasics/asyncworker.vala 2011-08-16 14:20:45.000000000 +0100 +@@ -1,4 +1,4 @@ +-/** ++/* + * Copyright (C) 2009-2010 Michael 'Mickey' Lauer + * + * This library is free software; you can redistribute it and/or +@@ -22,9 +22,9 @@ + **/ + public abstract interface FsoFramework.AbstractWorkerQueue : GLib.Object + { +- public delegate void WorkerFunc( T element ); ++ public delegate void WorkerFunc( T element ); + +- public abstract void setDelegate( WorkerFunc worker ); ++ public abstract void setDelegate( WorkerFunc worker ); + public abstract void enqueue( T element ); + public abstract void trigger(); + } +@@ -35,7 +35,7 @@ + public class FsoFramework.AsyncWorkerQueue : FsoFramework.AbstractWorkerQueue, GLib.Object + { + protected GLib.Queue q; +- protected AbstractWorkerQueue.WorkerFunc worker; ++ protected AbstractWorkerQueue.WorkerFunc worker; + uint watch; + + protected bool _onIdle() +@@ -52,7 +52,7 @@ + q = new GLib.Queue(); + } + +- public void setDelegate( AbstractWorkerQueue.WorkerFunc worker ) ++ public void setDelegate( AbstractWorkerQueue.WorkerFunc worker ) + { + this.worker = worker; + trigger(); --- libfsobasics-0.9.0+git20100509.orig/debian/patches/0004-fix-nullable-enumvalue.patch +++ libfsobasics-0.9.0+git20100509/debian/patches/0004-fix-nullable-enumvalue.patch @@ -0,0 +1,18 @@ +Description: Mark EnumValue as nullable before trying to compare it with null +Author: Michael 'Mickey' Lauer +Origin: backport, http://anonscm.debian.org/gitweb/?p=pkg-fso/libfsobasics.git;a=commitdiff;h=bdb28f886018e88066628ad72a01e0b2ce12121c +Forwarded: not-needed +Last-Update: 2011-08-16 + +diff -Nur -x '*.orig' -x '*~' libfsobasics-0.9.0+git20100509//fsobasics/utilities.vala libfsobasics-0.9.0+git20100509.new//fsobasics/utilities.vala +--- libfsobasics-0.9.0+git20100509//fsobasics/utilities.vala 2010-05-15 12:01:27.000000000 +0100 ++++ libfsobasics-0.9.0+git20100509.new//fsobasics/utilities.vala 2011-08-16 14:22:34.000000000 +0100 +@@ -302,7 +302,7 @@ + public string enumToString( Type enum_type, int value ) + { + EnumClass ec = (EnumClass) enum_type.class_ref(); +- unowned EnumValue ev = ec.get_value( value ); ++ unowned EnumValue? ev = ec.get_value( value ); + return ev == null ? "Unknown Enum value for %s: %i".printf( enum_type.name(), value ) : ev.value_name; + } + --- libfsobasics-0.9.0+git20100509.orig/debian/patches/0002-fix-netlink-include.patch +++ libfsobasics-0.9.0+git20100509/debian/patches/0002-fix-netlink-include.patch @@ -0,0 +1,25 @@ +From d13f23b5b93c42f8c87cc297bdbc5cb243181ec9 Mon Sep 17 00:00:00 2001 +From: Heiko Stuebner +Date: Sat, 15 May 2010 18:18:34 +0200 +Subject: [PATCH] fix netlink-include + +--- + vapi/libnl-2.0.vapi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/vapi/libnl-2.0.vapi b/vapi/libnl-2.0.vapi +index 4d65849..022aa91 100644 +--- a/vapi/libnl-2.0.vapi ++++ b/vapi/libnl-2.0.vapi +@@ -181,7 +181,7 @@ namespace Netlink { + } + + [Compact] +- [CCode (cprefix = "nl_link_cache_", cname = "struct nl_cache", free_function = "nl_cache_free", cheader_filename = "netlink/netlink.h")] ++ [CCode (cprefix = "nl_link_cache_", cname = "struct nl_cache", free_function = "nl_cache_free", cheader_filename = "netlink/route/link.h")] + public class LinkCache : Cache { + [CCode (cname = "rtnl_link_name2i")] + public int name2i (string name); +-- +1.7.1 +