From ef79cb33588a250aa1058192d7304a5857254ef2 Mon Sep 17 00:00:00 2001 From: fake Date: Fri, 2 Jan 2004 21:18:50 +0000 Subject: [PATCH] Thomas Jakobi : I finally found the time to update the bluez- packages. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2116 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/fake/bluez-libs/bluez-libs.desc | 5 +- package/fake/bluez-sdp/bluez-sdp.desc | 4 +- package/fake/bluez-utils/bluez-utils.desc | 4 +- package/fake/bluez-utils/fix-mandir.patch | 54 ++++++------------- .../bluez-utils/hcid-sysconfdir-usage.patch | 44 --------------- 5 files changed, 22 insertions(+), 89 deletions(-) delete mode 100644 package/fake/bluez-utils/hcid-sysconfdir-usage.patch diff --git a/package/fake/bluez-libs/bluez-libs.desc b/package/fake/bluez-libs/bluez-libs.desc index a6407d647..e4da06356 100644 --- a/package/fake/bluez-libs/bluez-libs.desc +++ b/package/fake/bluez-libs/bluez-libs.desc @@ -32,8 +32,7 @@ [L] GPL [S] Stable -[V] 2.4 +[V] 2.5 [P] X -----5---9 600.100 -[D] 379562505 bluez-libs-2.4.tar.gz http://bluez.sourceforge.net/download/ - +[D] 537935599 bluez-libs-2.5.tar.gz http://bluez.sourceforge.net/download/ diff --git a/package/fake/bluez-sdp/bluez-sdp.desc b/package/fake/bluez-sdp/bluez-sdp.desc index eb50faf8f..7a2b5f7d3 100644 --- a/package/fake/bluez-sdp/bluez-sdp.desc +++ b/package/fake/bluez-sdp/bluez-sdp.desc @@ -32,8 +32,8 @@ [L] GPL [S] Stable -[V] 1.2 +[V] 1.5 [P] X -----5---9 606.000 -[D] 4054420623 bluez-sdp-1.2.tar.gz http://bluez.sourceforge.net/download/ +[D] 3105530956 bluez-sdp-1.5.tar.gz http://bluez.sourceforge.net/download/ diff --git a/package/fake/bluez-utils/bluez-utils.desc b/package/fake/bluez-utils/bluez-utils.desc index 8781d5829..e78b57e5b 100644 --- a/package/fake/bluez-utils/bluez-utils.desc +++ b/package/fake/bluez-utils/bluez-utils.desc @@ -32,8 +32,8 @@ [L] GPL [S] Stable -[V] 2.3 +[V] 2.4 [P] X -----5---9 600.200 -[D] 3725367919 bluez-utils-2.3.tar.gz http://bluez.sourceforge.net/download/ +[D] 4294579632 bluez-utils-2.4.tar.gz http://bluez.sourceforge.net/download/ diff --git a/package/fake/bluez-utils/fix-mandir.patch b/package/fake/bluez-utils/fix-mandir.patch index c99b58eb0..325b3bd76 100644 --- a/package/fake/bluez-utils/fix-mandir.patch +++ b/package/fake/bluez-utils/fix-mandir.patch @@ -1,53 +1,31 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/fake/bluez-utils/fix-mandir.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -rduN ./rfcomm/Makefile.am ../bluez-utils-2.3/rfcomm/Makefile.am ---- ./rfcomm/Makefile.am 2002-12-21 04:07:42.000000000 +0100 -+++ ../bluez-utils-2.3/rfcomm/Makefile.am 2003-07-14 19:21:36.000000000 +0200 +diff -rduN bluez-utils-2.4-orig/rfcomm/Makefile.am bluez-utils-2.4/rfcomm/Makefile.am +--- bluez-utils-2.4-orig/rfcomm/Makefile.am 2003-07-18 11:25:50.000000000 +0200 ++++ bluez-utils-2.4/rfcomm/Makefile.am 2004-01-02 21:05:24.964888336 +0100 @@ -2,7 +2,6 @@ - # $Id: Makefile.am,v 1.4 2002/10/17 22:15:48 holtmann Exp $ + # $Id: Makefile.am,v 1.5 2003/07/18 09:25:50 holtmann Exp $ # -mandir = $(prefix)/usr/share/man - confdir = /etc/bluetooth + confdir = $(sysconfdir)/bluetooth bin_PROGRAMS = rfcomm -diff -rduN ./rfcomm/Makefile.in ../bluez-utils-2.3/rfcomm/Makefile.in ---- ./rfcomm/Makefile.in 2003-03-20 07:40:30.000000000 +0100 -+++ ../bluez-utils-2.3/rfcomm/Makefile.in 2003-07-14 19:26:05.000000000 +0200 +diff -rduN bluez-utils-2.4-orig/rfcomm/Makefile.in bluez-utils-2.4/rfcomm/Makefile.in +--- bluez-utils-2.4-orig/rfcomm/Makefile.in 2003-12-18 19:36:54.000000000 +0100 ++++ bluez-utils-2.4/rfcomm/Makefile.in 2004-01-02 21:05:46.092676424 +0100 @@ -89,7 +89,7 @@ VERSION = @VERSION@ YACC = @YACC@ -mandir = $(prefix)/usr/share/man +mandir = @mandir@ - confdir = /etc/bluetooth + confdir = $(sysconfdir)/bluetooth bin_PROGRAMS = rfcomm -diff -rduN ./tools/Makefile.am ../bluez-utils-2.3/tools/Makefile.am ---- ./tools/Makefile.am 2002-12-21 04:07:42.000000000 +0100 -+++ ../bluez-utils-2.3/tools/Makefile.am 2003-07-14 19:26:58.000000000 +0200 +diff -rduN bluez-utils-2.4-orig/tools/Makefile.am bluez-utils-2.4/tools/Makefile.am +--- bluez-utils-2.4-orig/tools/Makefile.am 2003-07-03 00:27:41.000000000 +0200 ++++ bluez-utils-2.4/tools/Makefile.am 2004-01-02 21:06:10.017039368 +0100 @@ -2,8 +2,6 @@ - # $Id: Makefile.am,v 1.8 2002/11/16 01:44:53 holtmann Exp $ + # $Id: Makefile.am,v 1.9 2003/07/02 22:27:41 holtmann Exp $ # -mandir = $(prefix)/usr/share/man @@ -55,9 +33,9 @@ diff -rduN ./tools/Makefile.am ../bluez-utils-2.3/tools/Makefile.am sbin_PROGRAMS = hciattach hciconfig bin_PROGRAMS = hcitool l2ping -diff -rduN ./tools/Makefile.in ../bluez-utils-2.3/tools/Makefile.in ---- ./tools/Makefile.in 2003-03-20 07:40:30.000000000 +0100 -+++ ../bluez-utils-2.3/tools/Makefile.in 2003-07-14 19:26:30.000000000 +0200 +diff -rduN bluez-utils-2.4-orig/tools/Makefile.in bluez-utils-2.4/tools/Makefile.in +--- bluez-utils-2.4-orig/tools/Makefile.in 2003-12-18 19:36:53.000000000 +0100 ++++ bluez-utils-2.4/tools/Makefile.in 2004-01-02 21:06:21.549286200 +0100 @@ -89,7 +89,7 @@ VERSION = @VERSION@ YACC = @YACC@ diff --git a/package/fake/bluez-utils/hcid-sysconfdir-usage.patch b/package/fake/bluez-utils/hcid-sysconfdir-usage.patch deleted file mode 100644 index 453af6f05..000000000 --- a/package/fake/bluez-utils/hcid-sysconfdir-usage.patch +++ /dev/null @@ -1,44 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/fake/bluez-utils/hcid-sysconfdir-usage.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./hcid/Makefile.am.orig 2003-07-14 17:58:00.000000000 +0200 -+++ ./hcid/Makefile.am 2003-07-14 17:58:22.000000000 +0200 -@@ -16,7 +16,7 @@ - # - # Install configuration files - # --confdir = $(prefix)/etc/bluetooth -+confdir = $(sysconfdir)/bluetooth - conf_FILE = $(confdir)/$(hcid_CONFIG) - pin_FILE = $(confdir)/pin - ---- ./hcid/Makefile.in.orig 2003-07-14 18:23:12.000000000 +0200 -+++ ./hcid/Makefile.in 2003-07-14 18:23:25.000000000 +0200 -@@ -104,7 +104,7 @@ - # - # Install configuration files - # --confdir = $(prefix)/etc/bluetooth -+confdir = $(sysconfdir)/bluetooth - conf_FILE = $(confdir)/$(hcid_CONFIG) - pin_FILE = $(confdir)/pin - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs