Just to be sure: will this upload be harmful?
First of all: thanks for your work.
Before sponsoring this upload of somaplayer (which fixes RC bug #309093)
I would like to know if there's something wrong with it; here it is the
interdiff:
diff -u somaplayer-0.5.2/debian/control somaplayer-0.5.2/debian/control
--- somaplayer-0.5.2/debian/control
+++ somaplayer-0.5.2/debian/control
@@ -2,14 +2,14 @@
Section: sound
Priority: optional
Maintainer: Riccardo Setti <giskard@autistici.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libmad0-dev, libssl-dev, libvorbis-dev, libogg-dev, libid3tag0-dev, libao-dev, libsndfile1-dev, libcdaudio0-dev, libcdparanoia0-dev, libgtk2.0-dev
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libmad0-dev, libssl-dev, libvorbis-dev, libogg-dev, libasound2-dev, libid3tag0-dev, libid3-3.8.3-dev, libao-dev, libsndfile1-dev, libcdaudio0-dev, libcdparanoia0-dev, libgtk2.0-dev, dpatch
Standards-Version: 3.6.1
Package: somaplayer
Architecture: any
Section: sound
Suggests: somaplayer-doc
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}
Description: player audio for the soma suite
Music player for mp3, ogg, wav, audiocd, mp3 streaming, ogg streaming and
able to use the appropriate sound drivers, demons, to stream
@@ -40,7 +40,7 @@
Package: libsds0
Architecture: any
Section: libs
-Depends: somaplayer (= ${VERSION})
+Depends: ${shlibs:Depends}
Description: primary lib for SDS
This package includes the primary library for the Soma
Daemon System, which is used by all SDS applications
@@ -50,7 +50,7 @@
Package: libsomaplayer0
Architecture: any
Section: libs
-Depends: somaplayer (= ${VERSION})
+Depends: ${shlibs:Depends}
Description: primary lib for somaplayer
This package includes the primary library for the Soma
Daemon System, which is used by all SDS applications
diff -u somaplayer-0.5.2/debian/rules somaplayer-0.5.2/debian/rules
--- somaplayer-0.5.2/debian/rules
+++ somaplayer-0.5.2/debian/rules
@@ -11,8 +11,12 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-VERSION = `head -n1 debian/changelog | grep -o -e '(.*)' | sed -e "s/(\(.*\))/\1/m"`
-export $(VERSION)
+
+#VERSION = `head -n1 debian/changelog | grep -o -e '(.*)' | sed -e "s/(\(.*\))/\1/m"`
+#export $(VERSION)
+
+PACKAGE=somaplayer
+include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -25,13 +29,13 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+config.status: configure patch-stamp
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-ipv6 --disable-lame \
--disable-cdromsearch --enable-mic -enable-somalist
-build: build-stamp
+build: build-stamp
build-stamp: config.status
dh_testdir
@@ -42,7 +46,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
@@ -168,9 +172,10 @@
dh_strip -a
dh_compress -a
dh_fixperms -a
+ dh_makeshlibs
dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a -- -VVERSION="$(VERSION)"
+ dh_shlibdeps -a
+ dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
diff -u somaplayer-0.5.2/debian/changelog somaplayer-0.5.2/debian/changelog
--- somaplayer-0.5.2/debian/changelog
+++ somaplayer-0.5.2/debian/changelog
@@ -1,3 +1,16 @@
+somaplayer (0.5.2-2) unstable; urgency=high
+
+ * Correctly depend on libsomaplayer0. (closes: #309093)
+ * Added patch for compile somaplayer on amd64 thanks to
+ Andreas Jochens (closes: #297963)
+ * Minor changes in debian/rules (i'll not use anymore dh_gencontrol -- $VERSION)
+ * Minor changes in debian/control (remove dependency on $VERSION)
+ * Removed debian/shlibsdep files, switched to dh_shlibs
+ * Updated config.guess / config.sub
+ * Sponsored by Emanuele Rocca <ema@debian.org>
+
+ -- Riccardo Setti <giskard@autistici.org> Sun, 16 May 2005 12:45:11 +0100
+
somaplayer (0.5.2-1) unstable; urgency=low
* New upstream.
reverted:
--- somaplayer-0.5.2/debian/libsds0.shlibs
+++ somaplayer-0.5.2.orig/debian/libsds0.shlibs
@@ -1,2 +0,0 @@
-libsds 1 libsds0 (= ${VERSION} )
-libsdsdsp 1 libsds0 (= ${VERSION} )
reverted:
--- somaplayer-0.5.2/debian/libsomaplayer0.shlibs
+++ somaplayer-0.5.2.orig/debian/libsomaplayer0.shlibs
@@ -1 +0,0 @@
-libsomaplayer 1 libsomaplayer0 (= ${VERSION} )
only in patch2:
unchanged:
--- somaplayer-0.5.2.orig/config.guess
+++ somaplayer-0.5.2/config.guess
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-12'
+timestamp='2005-04-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -804,6 +804,9 @@
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
@@ -1137,6 +1140,10 @@
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
exit 0 ;;
+ i*86:VOS:*:*)
+ # From Paul.Green@stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit 0 ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
@@ -1197,6 +1204,9 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
@@ -1413,7 +1423,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
only in patch2:
unchanged:
--- somaplayer-0.5.2.orig/config.sub
+++ somaplayer-0.5.2/config.sub
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2004-11-30'
+timestamp='2005-04-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -231,13 +231,14 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -262,7 +263,8 @@
| pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
@@ -298,7 +300,7 @@
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
- | bs2000-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
@@ -310,7 +312,7 @@
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -336,7 +338,8 @@
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
only in patch2:
unchanged:
--- somaplayer-0.5.2.orig/debian/patches/amd64.dpatch
+++ somaplayer-0.5.2/debian/patches/amd64.dpatch
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## amd64.dpatch by <giskard@localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad somaplayer-0.5.2/src/gtk/about.c /tmp/dpep.sPHCUr/somaplayer-0.5.2/src/gtk/about.c
+--- somaplayer-0.5.2/src/gtk/about.c 2005-01-08 01:22:41.000000000 +0100
++++ /tmp/dpep.sPHCUr/somaplayer-0.5.2/src/gtk/about.c 2005-04-10 11:17:02.424516728 +0200
+@@ -54,7 +54,7 @@
+
+ static int about_t = 0;
+ static int about_timer = 0;
+-static GtkWidget *text = NULL;
++static GtkWidget *text_about = NULL;
+
+ gint about_timeout (gpointer);
+ void on_about_button_press_event (GtkWidget *, GdkEventButton *);
+@@ -110,14 +110,14 @@
+ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textarea), 5);
+ gtk_text_view_set_right_margin (GTK_TEXT_VIEW (textarea), 5);
+
+- text =
++ text_about =
+ (GtkWidget *) gtk_text_view_get_buffer (GTK_TEXT_VIEW (textarea));
+- gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (text), "text", "weight",
++ gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (text_about), "text", "weight",
+ PANGO_WEIGHT_BOLD, "scale",
+ PANGO_SCALE_MEDIUM, NULL);
+
+ g_signal_connect ((gpointer) window, "delete_event",
+- G_CALLBACK (on_about_activate), text);
++ G_CALLBACK (on_about_activate), text_about);
+
+ gtk_signal_connect_object (GTK_OBJECT (textarea), "button_press_event",
+ GTK_SIGNAL_FUNC
+@@ -163,18 +163,18 @@
+ GtkTextIter start;
+ GtkTextIter end;
+
+- gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (text), &start);
+- gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (text), &end);
++ gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (text_about), &start);
++ gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (text_about), &end);
+
+- gtk_text_buffer_delete (GTK_TEXT_BUFFER (text), &start, &end);
++ gtk_text_buffer_delete (GTK_TEXT_BUFFER (text_about), &start, &end);
+
+- gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (text), &start, 0);
++ gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (text_about), &start, 0);
+
+
+ if (!credits[about_timer])
+ about_timer = 0;
+
+- gtk_text_buffer_insert_with_tags_by_name (GTK_TEXT_BUFFER (text),
++ gtk_text_buffer_insert_with_tags_by_name (GTK_TEXT_BUFFER (text_about),
+ &start, credits[about_timer],
+ -1, "text", NULL);
+ about_timer++;
only in patch2:
unchanged:
--- somaplayer-0.5.2.orig/debian/patches/00list
+++ somaplayer-0.5.2/debian/patches/00list
@@ -0,0 +1 @@
+amd64
Thanks.
ciao,
ema
Reply to: