[Pkg-xfce-commits] r999 - in goodies: xfce4-notes-plugin/debian
xfmedia/debian xfmedia/debian/patches
Yves-Alexis Perez
corsac-guest at alioth.debian.org
Mon Nov 27 22:43:16 CET 2006
Author: corsac-guest
Date: 2006-11-27 22:43:16 +0100 (Mon, 27 Nov 2006)
New Revision: 999
Removed:
goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch
goodies/xfmedia/debian/patches/01_dbus_use_newapi.patch
goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch
Modified:
goodies/xfce4-notes-plugin/debian/changelog
goodies/xfce4-notes-plugin/debian/control
goodies/xfmedia/debian/changelog
goodies/xfmedia/debian/control
goodies/xfmedia/debian/patches/03_fix_volume_steps.patch
Log:
new upstream releases
Modified: goodies/xfce4-notes-plugin/debian/changelog
===================================================================
--- goodies/xfce4-notes-plugin/debian/changelog 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfce4-notes-plugin/debian/changelog 2006-11-27 21:43:16 UTC (rev 999)
@@ -1,3 +1,10 @@
+xfce4-notes-plugin (1.4-1) UNRELEASED; urgency=low
+
+ * New upstream relese.
+ * debian/control: updated build-dep against Xfce 4.4rc2 (4.3.99.2).
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 27 Nov 2006 21:04:31 +0100
+
xfce4-notes-plugin (1.3.99.1-1) unstable; urgency=low
* New upstream release.
Modified: goodies/xfce4-notes-plugin/debian/control
===================================================================
--- goodies/xfce4-notes-plugin/debian/control 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfce4-notes-plugin/debian/control 2006-11-27 21:43:16 UTC (rev 999)
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Build-Depends: autotools-dev, cdbs, debhelper (>= 4.1), libgtk2.0-dev, xfce4-panel-dev (>= 4.3.90.2-3), libxml2-dev, libxml-parser-perl
+Build-Depends: autotools-dev, cdbs, debhelper (>= 4.1), libgtk2.0-dev, xfce4-panel-dev (>= 4.3.99.2), libxml2-dev, libxml-parser-perl
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Jani Monoses <jani at ubuntu.com>, Yves-Alexis Perez <corsac at corsac.net>
Standards-Version: 3.7.2
Modified: goodies/xfmedia/debian/changelog
===================================================================
--- goodies/xfmedia/debian/changelog 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfmedia/debian/changelog 2006-11-27 21:43:16 UTC (rev 999)
@@ -1,8 +1,12 @@
-xfmedia (0.9.1-7) UNRELEASED; urgency=low
+xfmedia (0.9.2-1) UNRELEASED; urgency=low
+ (Yves-Alexis Perez)
+ * New upstream release.
+ * debian/control: updated build-dep against Xfce 4.4rc2 (4.3.99.2).
+ (Stefan Ott)
* Added a patch to change the volume-step size closes: #331584
- -- Stefan Ott <stefan at desire.ch> Sun, 5 Nov 2006 03:10:49 +0100
+ -- Yves-Alexis Perez <corsac at corsac.net> Mon, 27 Nov 2006 21:04:52 +0100
xfmedia (0.9.1-6) unstable; urgency=low
Modified: goodies/xfmedia/debian/control
===================================================================
--- goodies/xfmedia/debian/control 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfmedia/debian/control 2006-11-27 21:43:16 UTC (rev 999)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at corsac.net>, Jani Monoses <jani at ubuntu.com>
-Build-Depends: debhelper (>= 4.1.0), libxfcegui4-dev (>= 4.3.90.2), libxine-dev, libexo-0.3-dev (>= 0.3.1.8beta2), libdbus-glib-1-dev (>= 0.60), libxml-perl, libstartup-notification0-dev, cdbs, libtagc0-dev
+Build-Depends: debhelper (>= 4.1.0), libxfcegui4-dev (>= 4.3.99.2), libxine-dev, libexo-0.3-dev (>= 0.3.1.12rc2), libdbus-glib-1-dev (>= 0.60), libxml-perl, libstartup-notification0-dev, cdbs, libtagc0-dev
Standards-Version: 3.7.2
Package: xfmedia
Deleted: goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch
===================================================================
--- goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfmedia/debian/patches/00_trayicon-volume-scroll.patch 2006-11-27 21:43:16 UTC (rev 999)
@@ -1,51 +0,0 @@
---- src/trayicon.c.old 2005-10-06 00:18:19.000000000 +0200
-+++ src/trayicon.c 2005-10-06 00:17:15.000000000 +0200
-@@ -101,13 +101,35 @@
- break;
- }
- } else if(evt->button == 3) {
-- if(tray_icon->menu) {
-+ if(tray_icon->menu) {
- gtk_menu_popup(GTK_MENU(tray_icon->menu), NULL, NULL, NULL,
- NULL, evt->button, evt->time);
- }
- return TRUE;
- }
--
-+ return FALSE;
-+}
-+static gboolean
-+xfmedia_tray_icon_button_scroll_cb(GtkWidget *w, GdkEventScroll *evt,
-+ gpointer user_data)
-+{
-+ XfmediaTrayIcon *tray_icon = user_data;
-+ XfmediaMainwin *mwin = tray_icon->mwin;
-+ if(evt->direction == GDK_SCROLL_UP) {
-+ gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
-+ volume += 2;
-+ if(volume >100)
-+ volume = 100;
-+ xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
-+ return TRUE;
-+ } else if(evt->direction == GDK_SCROLL_DOWN) {
-+ gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
-+ volume -= 2;
-+ if(volume <0)
-+ volume = 0;
-+ xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
-+ return TRUE;
-+ }
- return FALSE;
- }
-
-@@ -159,7 +181,9 @@
- gtk_container_add(GTK_CONTAINER(evtbox), img);
-
- g_signal_connect(G_OBJECT(evtbox), "button-press-event",
-- G_CALLBACK(xfmedia_tray_icon_button_press_cb), cb_data);
-+ G_CALLBACK(xfmedia_tray_icon_button_press_cb), cb_data);
-+ g_signal_connect(G_OBJECT(evtbox), "scroll-event",
-+ G_CALLBACK(xfmedia_tray_icon_button_scroll_cb), cb_data);
- g_signal_connect(G_OBJECT(tray_icon), "destroy",
- G_CALLBACK(xfmedia_tray_icon_destroy_cb), cb_data);
-
Deleted: goodies/xfmedia/debian/patches/01_dbus_use_newapi.patch
===================================================================
--- goodies/xfmedia/debian/patches/01_dbus_use_newapi.patch 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfmedia/debian/patches/01_dbus_use_newapi.patch 2006-11-27 21:43:16 UTC (rev 999)
@@ -1,13 +0,0 @@
-=== modified file 'src/remote.c'
---- src/remote.c
-+++ src/remote.c
-@@ -490,7 +490,7 @@
- g_snprintf(name, 64, XFMEDIA_DBUS_SERVICE_FMT, i);
- dbus_error_init(&derr);
- ret = dbus_bus_request_name(dbus_conn, name,
-- DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &derr);
-+ DBUS_NAME_FLAG_DO_NOT_QUEUE, &derr);
- if(ret < 0) {
- g_warning("Unable to acquire D-BUS service '%s': %s." \
- " Remote control interface will not be available.",
-
Deleted: goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch
===================================================================
--- goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch 2006-11-27 21:43:16 UTC (rev 999)
@@ -1,82 +0,0 @@
-Index: src/xfmedia-remote.c
-===================================================================
---- src/xfmedia-remote.c (revision 19403)
-+++ src/xfmedia-remote.c (working copy)
-@@ -40,17 +40,26 @@
- #include <getopt.h>
- #endif
-
--#ifdef HAVE_LOCALE_H
-+#include <glib.h>
-+
-+#if defined(HAVE_LOCALE_H) && defined(ENABLE_NLS)
- #include <locale.h>
-+#include <glib/gi18n.h>
- #endif
-
--#include <glib.h>
-
--/* for _() only; no need to link in the actual library */
--#include <libxfce4util/libxfce4util.h>
--
- #include <xfmedia/xfmedia-remote-client.h>
-
-+#ifdef BDEBUG
-+#define DBG(...) G_STMT_START{ \
-+ fprintf(stderr, "DBG[%s:%d] %s(): ", __FILE__, __LINE__, __DBG_FUNC__); \
-+ fprintf(stderr, __VA_ARGS__); \
-+ fprintf(stderr, "\n"); \
-+}G_STMT_END
-+#else
-+#define DBG(...) G_STMT_START{ (void)0; }G_STMT_END
-+#endif
-+
- enum {
- OPT_SESSION = 1000,
- OPT_PING,
-@@ -145,9 +154,15 @@
- gboolean possibly_play_too = FALSE;
- XfmediaRemoteStatus ret;
-
-- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-+#ifdef ENABLE_NLS
-+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
-+# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-+# endif
-+ textdomain(GETTEXT_PACKAGE);
- if(!setlocale(LC_ALL, ""))
- g_warning("Locale not supported; using 'C'.");
-+#endif
-
- if(argc == 1) {
- xfmedia_remote_print_usage(argv[0]);
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am (revision 19403)
-+++ src/Makefile.am (working copy)
-@@ -87,8 +87,7 @@
- -DLOCALEDIR=\"$(localedir)\" \
- -DBINDIR=\"$(bindir)\" \
- @GLIB_CFLAGS@ \
-- @DBUS_CFLAGS@ \
-- @LIBXFCE4UTIL_CFLAGS@
-+ @DBUS_CFLAGS@
-
- xfmedia_remote_LDADD = \
- $(top_builddir)/xfmedia/libxfmedia-remote-client.la \
-Index: src/remote.c
-===================================================================
---- src/remote.c (revision 19403)
-+++ src/remote.c (working copy)
-@@ -55,6 +55,10 @@
- #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
- #endif
-
-+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
-+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
-+#endif
-+
- #endif /* HAVE_DBUS */
-
- #include <libxfce4util/libxfce4util.h>
Modified: goodies/xfmedia/debian/patches/03_fix_volume_steps.patch
===================================================================
--- goodies/xfmedia/debian/patches/03_fix_volume_steps.patch 2006-11-27 14:24:51 UTC (rev 998)
+++ goodies/xfmedia/debian/patches/03_fix_volume_steps.patch 2006-11-27 21:43:16 UTC (rev 999)
@@ -1,27 +1,26 @@
-diff -Nru xfmedia-0.9.1.orig/src/trayicon.c xfmedia-0.9.1/src/trayicon.c
---- xfmedia-0.9.1.orig/src/trayicon.c 2006-11-05 02:45:54.000000000 +0100
-+++ xfmedia-0.9.1/src/trayicon.c 2006-11-05 02:52:07.386140000 +0100
-@@ -117,14 +117,14 @@
- XfmediaMainwin *mwin = tray_icon->mwin;
+--- src/trayicon.c.old 2006-11-27 08:21:23.000000000 +0100
++++ src/trayicon.c 2006-11-27 22:06:07.000000000 +0100
+@@ -121,7 +121,7 @@
if(evt->direction == GDK_SCROLL_UP) {
- gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
-- volume += 2;
-+ volume += 3;
- if(volume >100)
- volume = 100;
- xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
- return TRUE;
+ gint volume = xfmedia_xine_get_param(mwin->xfx,
+ XINE_PARAM_AUDIO_VOLUME);
+- volume += 2;
++ volume += 3;
+ if(volume > 100)
+ volume = 100;
+ xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
+@@ -130,7 +130,7 @@
} else if(evt->direction == GDK_SCROLL_DOWN) {
- gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
-- volume -= 2;
-+ volume -= 3;
- if(volume <0)
- volume = 0;
- xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
-diff -Nru xfmedia-0.9.1.orig/src/xfmedia-keybindings.c xfmedia-0.9.1/src/xfmedia-keybindings.c
---- xfmedia-0.9.1.orig/src/xfmedia-keybindings.c 2006-11-05 02:51:51.496140000 +0100
-+++ xfmedia-0.9.1/src/xfmedia-keybindings.c 2006-11-05 02:40:55.976140000 +0100
-@@ -421,7 +421,7 @@
+ gint volume = xfmedia_xine_get_param(mwin->xfx,
+ XINE_PARAM_AUDIO_VOLUME);
+- volume -= 2;
++ volume -= 3;
+ if(volume < 0)
+ volume = 0;
+ xfmedia_xine_set_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME, volume);
+--- src/xfmedia-keybindings.c.old 2006-11-27 08:21:23.000000000 +0100
++++ src/xfmedia-keybindings.c 2006-11-27 22:06:21.000000000 +0100
+@@ -430,7 +430,7 @@
{
gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
@@ -30,7 +29,7 @@
if(volume > 100)
volume = 100;
-@@ -432,7 +432,7 @@
+@@ -441,7 +441,7 @@
{
gint volume = xfmedia_xine_get_param(mwin->xfx, XINE_PARAM_AUDIO_VOLUME);
More information about the Pkg-xfce-commits
mailing list