r1218 - in trunk/web/patches: . debian-only
Author: rmh
Date: 2006-02-16 16:28:31 +0000 (Thu, 16 Feb 2006)
New Revision: 1218
Added:
trunk/web/patches/debian-only/gnome-applets.diff
Removed:
trunk/web/patches/gnome-applets.diff
Log:
Update gnome-applets.diff (different bug, FTBFS again).
Added: trunk/web/patches/debian-only/gnome-applets.diff
===================================================================
--- trunk/web/patches/debian-only/gnome-applets.diff 2006-02-16 16:09:05 UTC (rev 1217)
+++ trunk/web/patches/debian-only/gnome-applets.diff 2006-02-16 16:28:31 UTC (rev 1218)
@@ -0,0 +1,40 @@
+
+Author: rmh
+Status: in BTS
+
+diff -ur gnome-applets-2.12.3.old/debian/control.in gnome-applets-2.12.3/debian/control.in
+--- gnome-applets-2.12.3.old/debian/control.in 2006-02-16 10:54:52.000000000 +0100
++++ gnome-applets-2.12.3/debian/control.in 2006-02-16 16:31:09.000000000 +0100
+@@ -4,7 +4,7 @@
+ Maintainer: Guilherme de S. Pastore <guilherme.pastore@terra.com.br>
+ Uploaders: @GNOME_TEAM@
+ Standards-Version: 3.6.2.1
+-Build-Depends: cdbs, autotools-dev, debhelper (>= 5.0.13), patchutils, type-handling, libgtop2-dev (>= 2.11.92), intltool, libpanel-applet2-dev (>= 2.10.1-1), liborbit2-dev (>= 1:2.12.1-1), scrollkeeper, libgail-dev (>= 1.8.2-1), libwnck-dev (>= 2.10.0-1), libgconf2-dev (>= 2.10.0-1), libglade2-dev (>= 1:2.5.1-1), libapm-dev | not+linux-gnu, libgnomeui-dev (>= 2.10.0-1), libgnome-keyring-dev (>= 0.4.2-1) , libxklavier-dev (>= 1.14-1), gnome-pkg-tools, xsltproc, docbook-xsl, xlibs-static-dev, sharutils, libgstreamer-plugins0.8-dev (>= 0.8.8) [!hurd-i386], libgnomevfs2-dev (>= 2.10.0-1), libgucharmap4-dev (>= 1:1.4.2-1), system-tools-backends-dev (>= 1.1.3), xlibs-static-dev, libxkbfile-dev, libgnome-desktop-dev (>= 2.11.1), libhal-dev (>= 0.5.3), libdbus-glib-1-dev (>= 0.60), gnome-doc-utils (>= 0.3.2)
++Build-Depends: cdbs, autotools-dev, debhelper (>= 5.0.13), patchutils, libgtop2-dev (>= 2.11.92), intltool, libpanel-applet2-dev (>= 2.10.1-1), liborbit2-dev (>= 1:2.12.1-1), scrollkeeper, libgail-dev (>= 1.8.2-1), libwnck-dev (>= 2.10.0-1), libgconf2-dev (>= 2.10.0-1), libglade2-dev (>= 1:2.5.1-1), libapm-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libgnomeui-dev (>= 2.10.0-1), libgnome-keyring-dev (>= 0.4.2-1) , libxklavier-dev (>= 1.14-1), gnome-pkg-tools, xsltproc, docbook-xsl, xlibs-static-dev, sharutils, libgstreamer-plugins0.8-dev (>= 0.8.8) [!hurd-i386], libgnomevfs2-dev (>= 2.10.0-1), libgucharmap4-dev (>= 1:1.4.2-1), system-tools-backends-dev (>= 1.1.3), xlibs-static-dev, libxkbfile-dev, libgnome-desktop-dev (>= 2.11.1), libhal-dev (>= 0.5.3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdbus-glib-1-dev (>= 0.60), gnome-doc-utils (>= 0.3.2), libxres-dev
+
+ Package: gnome-applets-data
+ Architecture: all
+diff -ur gnome-applets-2.12.3.old/debian/rules gnome-applets-2.12.3/debian/rules
+--- gnome-applets-2.12.3.old/debian/rules 2006-02-16 10:54:51.000000000 +0100
++++ gnome-applets-2.12.3/debian/rules 2006-02-16 11:27:45.000000000 +0100
+@@ -26,6 +26,11 @@
+
+ MANPAGES += debian/gnome-keyboard-layout.1 debian/gswitchit-plugins-capplet.1
+
++ifeq ($(DEB_HOST_GNU_SYSTEM),linux-gnu)
++sound=alsa
++else
++sound=oss
++endif
+
+ build/gnome-applets:: $(MANPAGES)
+
+@@ -49,7 +54,7 @@
+ ifeq ($(DEB_BUILD_GNU_SYSTEM),gnu)
+ sed -i "s/, @gstreamer@//" debian/control
+ else
+- sed -i "s/@gstreamer@/gstreamer0.8-alsa | gstreamer0.8-audiosink/" debian/control
++ sed -i "s/@gstreamer@/gstreamer0.8-$(sound) | gstreamer0.8-audiosink/" debian/control
+ endif
+ case $$(dpkg-architecture -qDEB_BUILD_ARCH) in \
+ i386|ia64|amd64) sed -i "s/@acpid@/acpid, /" debian/control ;; \
Deleted: trunk/web/patches/gnome-applets.diff
===================================================================
--- trunk/web/patches/gnome-applets.diff 2006-02-16 16:09:05 UTC (rev 1217)
+++ trunk/web/patches/gnome-applets.diff 2006-02-16 16:28:31 UTC (rev 1218)
@@ -1,84 +0,0 @@
-
-Description: avoid messing with cpufreq in postinst (rmh)
- fix FTBFS (aurel32)
-Status: both in BTS (#320962)
-
-diff -ur gnome-applets-2.10.1.old/debian/gnome-applets.config gnome-applets-2.10.1/debian/gnome-applets.config
---- gnome-applets-2.10.1.old/debian/gnome-applets.config 2005-08-26 16:22:59.000000000 +0200
-+++ gnome-applets-2.10.1/debian/gnome-applets.config 2005-08-26 16:37:32.000000000 +0200
-@@ -3,6 +3,8 @@
- # Debconf config script for gnome-applets
- prog=/usr/bin/cpufreq-selector
-
-+test -e $prog || exit 0
-+
- # Load Debconf
- . /usr/share/debconf/confmodule
- db_version 2.0
-diff -ur gnome-applets-2.10.1.old/debian/gnome-applets.postinst gnome-applets-2.10.1/debian/gnome-applets.postinst
---- gnome-applets-2.10.1.old/debian/gnome-applets.postinst 2005-08-26 16:22:59.000000000 +0200
-+++ gnome-applets-2.10.1/debian/gnome-applets.postinst 2005-08-26 16:36:03.000000000 +0200
-@@ -10,10 +10,12 @@
-
- case "$1" in
- configure)
-- db_get gnome-applets/cpufreq_SUID_bit
-- if [ "$RET" = "false" ]; then
-- chmod 0755 $prog
-- fi;
-+ if test -e $prog ; then
-+ db_get gnome-applets/cpufreq_SUID_bit
-+ if [ "$RET" = "false" ]; then
-+ chmod 0755 $prog
-+ fi;
-+ fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
---- gnome-applets-2.10.1.orig/debian/patches/10_kfreebsd.patch
-+++ gnome-applets-2.10.1/debian/patches/10_kfreebsd.patch
-@@ -0,0 +1,44 @@
-+--- configure.in.orig
-++++ configure.in
-+@@ -250,7 +250,7 @@
-+ AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
-+ ;;
-+ # list of supported OS cores that do not use libapm
-+- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-++ *-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
-+ ;;
-+ *)
-+ echo "warning: ${host} is not supported by battstat_applet, not building" >&2
-+--- configure.orig
-++++ configure
-+@@ -24989,7 +24989,7 @@
-+
-+ ;;
-+ # list of supported OS cores that do not use libapm
-+- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-++ *-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*-kfreebsd*-gnu)
-+ ;;
-+ *)
-+ echo "warning: ${host} is not supported by battstat_applet, not building" >&2
-+--- battstat.orig/properties.c
-++++ battstat/properties.c
-+@@ -27,7 +27,7 @@
-+
-+ #include <stdio.h>
-+
-+-#ifdef __FreeBSD__
-++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+ #include <machine/apm_bios.h>
-+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
-+ #include <sys/param.h>
-+--- battstat.orig/power-management.c
-++++ battstat/power-management.c
-+@@ -73,7 +73,7 @@
-+ * the problem might be. This error message is not to be freed.
-+ */
-+
-+-#ifdef __FreeBSD__
-++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+
-+ #include <machine/apm_bios.h>
-+
Reply to: