[SCM] plasma-widget-fastuserswitch packaging branch, master, updated. upstream/0.2.1-4-g317cc40

Rohan Garg rohangarg-guest at alioth.debian.org
Sun Jul 25 19:22:26 UTC 2010


The following commit has been merged in the master branch:
commit 317cc4087339d6acbc136df2c8a79b87cc7f41c5
Author: Rohan Garg <rohangarg at ubuntu.com>
Date:   Mon Jul 26 00:50:55 2010 +0530

    Drop patches,applied upstream and add changelog entry
    	modified:   debian/changelog
    	deleted:    debian/patches/kde_includes.patch
    	deleted:    debian/patches/series
    	deleted:    debian/patches/user_identity.patch
---
 debian/changelog                   |    9 ++++++++
 debian/patches/kde_includes.patch  |   16 --------------
 debian/patches/series              |    2 -
 debian/patches/user_identity.patch |   39 ------------------------------------
 4 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3df2f0..9c8af7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+plasma-widget-fastuserswitch (0.2.1-1) unstable; urgency=low
+
+  * New upstream release
+    - Drop user_identity.patch, applied upstream
+    - Drop kde_includes.patch, applied upstream
+  * Added Vcs-Git and Vcs-Browser entries to control file
+
+ -- Rohan Garg <rohangarg at ubuntu.com>  Mon, 26 Jul 2010 00:49:36 +0530
+
 plasma-widget-fastuserswitch (0.1.1-1) unstable; urgency=low
 
   * Initial release (Closes: #589471)
diff --git a/debian/patches/kde_includes.patch b/debian/patches/kde_includes.patch
deleted file mode 100644
index ec53169..0000000
--- a/debian/patches/kde_includes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Rohan Garg <rohangarg at ubuntu.com>
-Description: Patch to include proper paths to KDE libraries and fix FTBFS issues
-Forwarded: Yes, via personal email
-
-Index: fastuserswitch-0.1.1/CMakeLists.txt
-===================================================================
---- fastuserswitch-0.1.1.orig/CMakeLists.txt	2010-07-14 17:14:00.000000000 +0530
-+++ fastuserswitch-0.1.1/CMakeLists.txt	2010-07-19 21:20:27.000000000 +0530
-@@ -4,6 +4,7 @@
- include(KDE4Defaults)
- 
- add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-+include_directories(${KDE4_INCLUDES} ${QT_INCLUDES})
- 
- set(fastuserswitch_SRCS
-     fastuserswitch.cpp
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2c8ca75..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-kde_includes.patch
-user_identity.patch
\ No newline at end of file
diff --git a/debian/patches/user_identity.patch b/debian/patches/user_identity.patch
deleted file mode 100644
index f598249..0000000
--- a/debian/patches/user_identity.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d7b3149f16e45fc5215b7e9274d3f25819591ba9 Mon Sep 17 00:00:00 2001
-From: Flavio Castelli <fcastelli at novell.com>
-Date: Thu, 15 Jul 2010 13:38:09 +0200
-Subject: [PATCH] Use the "user-identity" icon instead of the "system-switch-user" one
-
----
- fastuserswitch.cpp                   |    2 +-
- plasma-applet-fastuserswitch.desktop |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fastuserswitch.cpp b/fastuserswitch.cpp
-index b3e10c7..4cc4726 100644
---- a/fastuserswitch.cpp
-+++ b/fastuserswitch.cpp
-@@ -29,7 +29,7 @@
- 
- using namespace Plasma;
- 
--static const char DEFAULT_ICON_NAME[] = "system-switch-user";
-+static const char DEFAULT_ICON_NAME[] = "user-identity";
- 
- K_EXPORT_PLASMA_APPLET(fastuserswitch, FastUserSwitch)
- 
-diff --git a/plasma-applet-fastuserswitch.desktop b/plasma-applet-fastuserswitch.desktop
-index b886c5a..8ee3a9b 100644
---- a/plasma-applet-fastuserswitch.desktop
-+++ b/plasma-applet-fastuserswitch.desktop
-@@ -7,7 +7,7 @@ Comment=Fast user switching applet
- Comment[en_GB]=Fast user switching applet
- Comment[it]=Applet per il cambio rapido di utente
- Comment[x-test]=xxFast user switching appletxx
--Icon=system-switch-user
-+Icon=user-identity
- Type=Service
- X-KDE-ServiceTypes=Plasma/Applet
- 
--- 
-1.6.1
- 

-- 
plasma-widget-fastuserswitch packaging



More information about the pkg-kde-commits mailing list