r24620 - in /desktop/unstable/gnome-applets/debian: changelog control control.in patches/09_modemlights_use_new_gst.patch rules source/ source/format

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Jun 29 22:05:27 UTC 2010 

Author: biebl
Date: Tue Jun 29 22:05:16 2010
New Revision: 24620

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24620
Log:
* Switch to source format 3.0 (quilt)
  - Add debian/source/format.
  - Drop Build-Depends on quilt.
  - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
  - Refresh patches so they apply without fuzz.

Added:
    desktop/unstable/gnome-applets/debian/source/
    desktop/unstable/gnome-applets/debian/source/format
Modified:
    desktop/unstable/gnome-applets/debian/changelog
    desktop/unstable/gnome-applets/debian/control
    desktop/unstable/gnome-applets/debian/control.in
    desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
    desktop/unstable/gnome-applets/debian/rules

Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=24620&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Tue Jun 29 22:05:16 2010
@@ -1,8 +1,16 @@
 gnome-applets (2.30.0-2) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Disable HAL, APM, and the battstat applet. Closes: #580429.
 
- -- Josselin Mouette <joss at debian.org>  Thu, 06 May 2010 09:06:57 +0200
+  [ Michael Biebl ]
+  * Switch to source format 3.0 (quilt)
+    - Add debian/source/format.
+    - Drop Build-Depends on quilt.
+    - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
+    - Refresh patches so they apply without fuzz.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 30 Jun 2010 00:02:12 +0200
 
 gnome-applets (2.30.0-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=24620&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control [utf-8] Tue Jun 29 22:05:16 2010
@@ -7,13 +7,11 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Standards-Version: 3.8.4
 Build-Depends: cdbs (>= 0.4.41),
                autotools-dev,
                debhelper (>= 5.0.13),
-               quilt,
-               patchutils,
                type-handling,
                libgtk2.0-dev (>= 2.13.0),
                libglib2.0-dev (>= 2.22.0),

Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=24620&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control.in [utf-8] Tue Jun 29 22:05:16 2010
@@ -7,8 +7,6 @@
 Build-Depends: cdbs (>= 0.4.41),
                autotools-dev,
                debhelper (>= 5.0.13),
-               quilt,
-               patchutils,
                type-handling,
                libgtk2.0-dev (>= 2.13.0),
                libglib2.0-dev (>= 2.22.0),

Modified: desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch?rev=24620&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch [utf-8] Tue Jun 29 22:05:16 2010
@@ -1,5 +1,7 @@
---- a/configure.in
-+++ b/configure.in
+Index: b/configure.in
+===================================================================
+--- a/configure.in	2010-03-28 08:27:14.000000000 +0200
++++ b/configure.in	2010-06-30 00:00:42.639936018 +0200
 @@ -20,6 +20,7 @@
  LIBGTOP_REQUIRED=2.11.92
  LIBXKLAVIER_REQUIRED=4.0
@@ -8,7 +10,7 @@
  LIBGNOME_DESKTOP_REQUIRED=2.11.1
  LIBNOTIFY_REQUIRED=0.3.2
  HAL_REQUIRED=0.5.3
-@@ -507,27 +508,21 @@
+@@ -472,27 +473,21 @@
  dnl *** modemlights applet check                                            ***
  dnl ***************************************************************************
  
@@ -46,8 +48,10 @@
  AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
  
  dnl ***************************************************************************
---- a/modemlights/modem-applet.c
-+++ b/modemlights/modem-applet.c
+Index: b/modemlights/modem-applet.c
+===================================================================
+--- a/modemlights/modem-applet.c	2010-03-28 07:29:51.000000000 +0200
++++ b/modemlights/modem-applet.c	2010-06-30 00:00:42.647932289 +0200
 @@ -1,5 +1,5 @@
 -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
 -/* Copyright (C) 2004 Carlos Garnacho
@@ -927,29 +931,20 @@
    return ret;
  }
  
+-static void
+-toggle_interface_non_root (ModemApplet *applet, gboolean enable)
 +static gboolean
 +pulse_progressbar (GtkProgressBar *progressbar)
-+{
-+  gtk_progress_bar_pulse (progressbar);
-+  return TRUE;
-+}
-+
- static void
--toggle_interface_non_root (ModemApplet *applet, gboolean enable)
-+show_report_window (ModemApplet *applet)
  {
 -  queue_directive (applet, rerun_backend_callback,
 -		   FALSE, "end", NULL);
-+  ModemAppletPrivate *priv;
-+
-+  priv = MODEM_APPLET_GET_PRIVATE (applet);
-+  gtk_widget_show (priv->report_window);
-+  priv->pulse_id = g_timeout_add (300, (GSourceFunc) pulse_progressbar, priv->report_window_progress);
++  gtk_progress_bar_pulse (progressbar);
++  return TRUE;
  }
  
  static void
 -toggle_interface_root (ModemApplet *applet, gboolean enable)
-+hide_report_window (ModemApplet *applet)
++show_report_window (ModemApplet *applet)
  {
 -  ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet);
 -  GtkWidget *dialog;
@@ -959,7 +954,11 @@
 -  text = (enable) ?
 -    _("Do you want to connect?") :
 -    _("Do you want to disconnect?");
--
++  priv = MODEM_APPLET_GET_PRIVATE (applet);
++  gtk_widget_show (priv->report_window);
++  priv->pulse_id = g_timeout_add (300, (GSourceFunc) pulse_progressbar, priv->report_window_progress);
++}
+ 
 -  dialog = gtk_message_dialog_new (NULL,
 -				   GTK_DIALOG_MODAL,
 -				   GTK_MESSAGE_QUESTION,
@@ -971,7 +970,11 @@
 -			  GTK_RESPONSE_OK, NULL);
 -  gtk_window_set_screen (GTK_WINDOW (dialog),
 -			 gtk_widget_get_screen (GTK_WIDGET (applet)));
--
++static void
++hide_report_window (ModemApplet *applet)
++{
++  ModemAppletPrivate *priv;
+ 
 -  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
 -    queue_directive (applet, NULL, enable,
 -		     "enable_iface", priv->dev, (enable) ? "1" : "0", NULL);
@@ -1044,8 +1047,10 @@
      {
        dialog = gtk_message_dialog_new (NULL,
  				       GTK_DIALOG_DESTROY_WITH_PARENT,
---- a/modemlights/modemlights.ui
-+++ b/modemlights/modemlights.ui
+Index: b/modemlights/modemlights.ui
+===================================================================
+--- a/modemlights/modemlights.ui	2010-03-28 07:29:51.000000000 +0200
++++ b/modemlights/modemlights.ui	2010-06-30 00:00:42.651939783 +0200
 @@ -2,167 +2,12 @@
  <interface>
    <requires lib="gtk+" version="2.16"/>
@@ -1216,8 +1221,10 @@
      <child>
        <object class="GtkHBox" id="hbox3">
          <property name="visible">True</property>
---- a/modemlights/Makefile.am
-+++ b/modemlights/Makefile.am
+Index: b/modemlights/Makefile.am
+===================================================================
+--- a/modemlights/Makefile.am	2010-03-28 07:29:51.000000000 +0200
++++ b/modemlights/Makefile.am	2010-06-30 00:00:42.651939783 +0200
 @@ -1,7 +1,8 @@
  #SUBDIRS = docs
  

Modified: desktop/unstable/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/rules?rev=24620&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/rules [utf-8] Tue Jun 29 22:05:16 2010
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk

Added: desktop/unstable/gnome-applets/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/source/format?rev=24620&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/source/format (added)
+++ desktop/unstable/gnome-applets/debian/source/format [utf-8] Tue Jun 29 22:05:16 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list