[maemo-commits] [maemo-commits] r16592 - in projects/haf/trunk/totem-pl-parser: . debian debian/patches

Thu Nov 6 14:18:04 EET 2008

Author: ifrade
Date: 2008-11-06 14:18:03 +0200 (Thu, 06 Nov 2008)
New Revision: 16592

Added:
   projects/haf/trunk/totem-pl-parser/debian/
   projects/haf/trunk/totem-pl-parser/debian/changelog
   projects/haf/trunk/totem-pl-parser/debian/compat
   projects/haf/trunk/totem-pl-parser/debian/control
   projects/haf/trunk/totem-pl-parser/debian/copyright
   projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser-dev.install
   projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser10.install
   projects/haf/trunk/totem-pl-parser/debian/patches/
   projects/haf/trunk/totem-pl-parser/debian/patches/01-maemo.patch
   projects/haf/trunk/totem-pl-parser/debian/rules
   projects/haf/trunk/totem-pl-parser/debian/watch
Modified:
   projects/haf/trunk/totem-pl-parser/autogen.sh
   projects/haf/trunk/totem-pl-parser/configure.in
Log:
Added debian directory and autostuff to integrate in maemo

Modified: projects/haf/trunk/totem-pl-parser/autogen.sh
===================================================================

--- projects/haf/trunk/totem-pl-parser/autogen.sh	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/autogen.sh	2008-11-06 12:18:03 UTC (rev 16592)
@@ -17,4 +17,5 @@
 	exit 1
 }
 
-REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-gtk-doc "$@"
+AUTOGEN_FLAGS="--disable-gtk-doc --disable-camel-i-know-what-im-doing"
+REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh $AUTOGEN_FLAGS "$@"

Modified: projects/haf/trunk/totem-pl-parser/configure.in
===================================================================
--- projects/haf/trunk/totem-pl-parser/configure.in	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/configure.in	2008-11-06 12:18:03 UTC (rev 16592)
@@ -36,7 +36,7 @@
 
 # Requirements
 GLIB_REQS=2.16.3
-GIO_REQS=2.17.3
+GIO_REQS=2.16.3
 DBUS_REQS=0.61
 
 # Before making a release, the PLPARSER_LT_VERSION string should be modified.

Added: projects/haf/trunk/totem-pl-parser/debian/changelog
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/changelog	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/changelog	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,64 @@
+totem-pl-parser (2.25-0maemo1) maemo; urgency=low
+
+  * First version for maemo. Removing gnomevfs and camel dependencies.
+
+ -- Ivan Frade <ivan.frade at nokia.com>  Mon, 17 Oct 2008 14:55:48 +0200
+
+totem-pl-parser (2.22.3-0ubuntu2) hardy-updates; urgency=low
+
+  * Upload to hardy-updates to not depend on other upgrades 
+    which didn't migrate to hardy-updates yet (lp: #231236)
+
+ -- Sebastien Bacher <seb128 at canonical.com>  Sat, 17 May 2008 14:55:48 +0200
+
+totem-pl-parser (2.22.3-0ubuntu1) hardy-proposed; urgency=low
+
+  * New upstream version (lp: #229922):
+    - Fix the playlist parser trying to parse RCS files
+    - Fix parsing of file that appear to be DOS text files but are Podcasts
+    - Fix linefeeds appearing in titles
+
+ -- Sebastien Bacher <seb128 at canonical.com>  Tue, 13 May 2008 14:23:53 +0200
+
+totem-pl-parser (2.22.2-0ubuntu1) hardy; urgency=low
+
+  * Sync on debian and new upstream version:
+    - Add support for feed:// URLs as used by Firefox 3
+    - Work-around for feeds with a linefeed straight after "<rss" (lp: #202982)
+
+ -- Sebastien Bacher <seb128 at canonical.com>  Tue, 08 Apr 2008 18:25:25 +0200
+
+totem-pl-parser (2.22.1-1) unstable; urgency=low
+
+  [ Sam Morris ]
+  * New upstream development release.
+    - Build-depend on gtk-doc-tools 1.0.
+    - build-depend on libglib2.0-dev 2.13.4.
+    - build-depend on libgnomevfs2-dev 2.16.
+    - build-depend on libcamel1.2-dev.
+  * Import 30_kfreebsd_gnu.patch from totem package.
+  * Include check-dist.mk in rules file to prevent accidental uploads to
+    unstable.
+
+  [ Sebastian Dröge ]
+  * New upstream stable release:
+    + debian/control.in:
+      - Update/wrap build dependencies.
+      - Add required dependencies to the -dev package.
+    + debian/control.in,
+      debian/libtotem-plparser*.install:
+      - Renamed from *11 to *10.
+  * debian/watch,
+    debian/rules:
+    Changes taken from the Ubuntu package
+    + Add watch file.
+    + Extract libtotem-plparserN package name from control.
+    + Set shlibs version via DEB_DH_MAKESHLIBS_ARGS instead of debian/*.shlibs
+      as this is less fragile across SONAME changes and library additions.
+  * debian/rules:
+    + Remove check-dist include, upload to unstable.
+  * debian/copyright:
+    + Updated.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 12 Mar 2008 14:19:22 +0100
+

Added: projects/haf/trunk/totem-pl-parser/debian/compat
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/compat	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/compat	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1 @@
+5

Added: projects/haf/trunk/totem-pl-parser/debian/control
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/control	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/control	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,37 @@
+Source: totem-pl-parser
+Priority: extra
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 5),
+               autotools-dev,
+               cdbs,
+               libxml-parser-perl,
+               libglib2.0-dev (>= 2.13.4),
+               libgtk2.0-dev (>= 2.11.6),
+               libxml2-dev,
+               libdbus-1-dev (>= 0.61),
+               libhal-dev (>= 0.5),
+               gtk-doc-tools (>= 1.0)
+Uploaders: Sebastian Dröge <slomo at debian.org>
+Standards-Version: 3.7.3
+Section: libs
+
+Package: libtotem-plparser-dev
+Section: libdevel
+Architecture: any
+Depends: libtotem-plparser10 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.13.4),
+         libgtk2.0-dev (>= 2.11.6)
+Description: Totem Playlist Parser library - development version
+ A library to parse playlists.
+ .
+ This package contains the development headers.
+
+Package: libtotem-plparser10
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Totem Playlist Parser library - runtime version
+ A library to parse playlists.
+ .
+ This package contains the shared library.

Added: projects/haf/trunk/totem-pl-parser/debian/copyright
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/copyright	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/copyright	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,129 @@
+This package was debianized by Sebastien Bacher <seb128 at canonical.com> on
+Thu, 06 Dec 2007 16:47:38 +0100.
+
+It was downloaded from http://download.gnome.org/sources/totem-pl-parser
+
+Upstream Author:
+  Bastien Nocera <hadess at hadess.net>
+
+Copyright: 
+    
+    For plparse/totem-pl-parser-media.*,
+        plparse/totem-pl-parser-wm.*,
+	plparse/totem-pl-parser-xspf.*,
+	plparse/totem-pl-parser-mini.*,
+	plparse/totem-pl-parser.*,
+	plparse/totem-pl-parser-misc.*,
+	plparse/totem-pl-parser-smil.*,
+	plparse/totem-pl-parser-qt.*,
+	plparse/totem-pl-parser-lines.*,
+	plparse/totem-pl-parser-pls.*:	
+      Copyright (C) 2002-2007 Bastien Nocera <hadess at hadess.net>
+      Copyright (C) 2003, 2004 Colin Walters <walters at rhythmbox.org>
+
+    For plparse/bswap.*,
+        plparse/totem-pl-parser-podcast.*:
+      Copyright (C) 2007 Bastien Nocera
+
+    For plparse/totem-pl-parser-pla.*:
+      Copyright (C) 2007 Jonathan Matthew
+
+    For plparse/totem-pl-parser-features.h*:
+      Copyright (C) 2006 William Jon McCann <mccann at jhu.edu>
+
+    For plparse/totem-pl-parser-private.*,
+	plparse/totem-pl-parser-wm.*:
+      Copyright (C) 2003 Colin Walters <walters at verbum.org>
+
+    For plparse/xmlparser.*,
+        plparse/xmllexer.*:
+      Copyright (C) 2002-2003,2007 the xine project
+
+    For plparse/totem-disc.*,
+      Copyright (C) 2004 Ronald Bultje <rbultje at ronald.bitfreak.net>
+      Copyright (C) 2004-2007 Bastien Nocera <hadess at hadess.net>
+
+    For lib/memmem.c:
+      Copyright (c) 2001 Andrew L. Neporada <andr at dgap.mipt.ru>
+      Copyright (c) 1990, 1993
+          The Regents of the University of California.  All rights reserved.
+
+License:
+
+ For lib/memmem.c:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. All advertising materials mentioning features or use of this software
+     must display the following acknowledgement:
+ 	This product includes software developed by the University of
+ 	California, Berkeley and its contributors.
+  4. Neither the name of the University nor the names of its contributors
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGE.
+
+
+
+ For plparse/totem-pl-parser-features.*:
+
+  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; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  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, write to the
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+  Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+
+
+  For everything else:
+
+  This package is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  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
+  Library General Public License for more details.
+ 
+  You should have received a copy of the GNU Library General Public
+  License along with this pacakge; see the file COPYING.LIB.  If not,
+  write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+  Floor, Boston, MA 02110, USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+The Debian packaging is (C) 2007, Sebastien Bacher <seb128 at canonical.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Added: projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser-dev.install
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser-dev.install	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser-dev.install	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/lib*.so
+debian/tmp/usr/lib/pkgconfig/*

Added: projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser10.install
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser10.install	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/libtotem-plparser10.install	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/share

Added: projects/haf/trunk/totem-pl-parser/debian/patches/01-maemo.patch
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/patches/01-maemo.patch	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/patches/01-maemo.patch	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,30 @@
+diff --git a/plparse/totem-disc.c b/plparse/totem-disc.c
+index ee80fa9..3260010 100644
+--- a/plparse/totem-disc.c
++++ b/plparse/totem-disc.c
+@@ -276,7 +276,11 @@ cd_cache_new (const char *dev,
+     cache = g_new0 (CdCache, 1);
+     cache->mountpoint = local;
+     cache->is_media = FALSE;
+-    cache->content_types = g_content_type_guess_for_tree (file);
++    if (GLIB_CHECK_VERSION (2, 17, 3)) {
++            cache->content_types = g_content_type_guess_for_tree (file);
++    } else {
++            cache->content_types = NULL;
++    }
+     g_object_unref (file);
+ 
+     return cache;
+@@ -364,7 +368,11 @@ cd_cache_new (const char *dev,
+     GMount *mount;
+ 
+     mount = g_volume_get_mount (volume);
+-    cache->content_types = g_mount_guess_content_type_sync (mount, FALSE, NULL, NULL);
++    if (GLIB_CHECK_VERSION (2, 17, 3)) {
++            cache->content_types = g_mount_guess_content_type_sync (mount, FALSE, NULL, NULL);
++    } else {
++            cache->content_types = NULL;
++    }
+     g_object_unref (mount);
+   }
+ 

Added: projects/haf/trunk/totem-pl-parser/debian/rules
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/rules	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/rules	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+#-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := \
+	--disable-camel-i-know-what-im-doing
+
+libtotem-plparserN := $(shell sed -rn 's/Package:[[:space:]]*(libtotem-plparser[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+
+DEB_DH_MAKESHLIBS_ARGS_$(libtotem-plparserN) += -V '$(libtotem-plparserN) (>= 2.21.92)'
+
+


Property changes on: projects/haf/trunk/totem-pl-parser/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: projects/haf/trunk/totem-pl-parser/debian/watch
===================================================================
--- projects/haf/trunk/totem-pl-parser/debian/watch	2008-11-06 11:59:44 UTC (rev 16591)
+++ projects/haf/trunk/totem-pl-parser/debian/watch	2008-11-06 12:18:03 UTC (rev 16592)
@@ -0,0 +1,2 @@
+version=3
+http://download.gnome.org/sources/totem-pl-parser/([\d\.]+)[02468]/totem-pl-parser-([\d\.]+)\.tar\.gz


