2.1.3-4

Cairo-Dock · Feb 22, 2010 · 670dc02 · 670dc02
1 parent 0e5d20a
commit 670dc02
Show file tree

Hide file tree

Showing 26 changed files with 233 additions and 205 deletions.
diff --git a/debian/debian/cairo-dock.1 b/debian/debian/cairo-dock.1
@@ -1,4 +1,4 @@
-.TH CAIRO-DOCK 1 "Aug. 09, 2009"
+.TH CAIRO-DOCK 1 "Feb. 13, 2010"
 
 .SH NAME
 cairo\-dock \- A dock to launch your programs easily.
@@ -28,7 +28,7 @@ It is recommended to install the PLUG\-INS package (
 .PP
 Some screenshots are available :
 .br
-http://www.cairo\-dock.org/mc_album.php?a=3
+http://pics.glx\-dock.org
 
 .SH OPTIONS
 You can launch
@@ -168,16 +168,15 @@ Updated by Matthieu Baerts (matttbe) <matttbe@gmail.com>.
 Your bug is maybe a
 .B recurrent problem
 (black background, window at startup (use \-c or \-o),
-problem with OpenGL, etc.). Please go to http://www.glx-dock.org/ww_page.php?p=Recurrents%20problems&lang=en
+problem with OpenGL, etc.). Please go to http://www.glx\-dock.org/ww_page.php?p=Recurrents%20problems&lang=en
 .PP
 For any other bugs, you can post them on Cairo\-Dock forum
-(http://www.glx-dock.org/bg_forumlist.php)
+(http://forum.glx\-dock.org)
 .br
 or on Launchpad
 (https://bugs.launchpad.net/cairo\-dock)
 
 .SH WEBSITE
 <
-.B http://www.glx-dock.org
+.B http://glx-dock.org
 >
-
diff --git a/debian/debian/control b/debian/debian/control
@@ -28,7 +28,7 @@ Architecture: all
 Conflicts: 	cairo-dock (< 2.0.9)
 Replaces: 	cairo-dock (< 2.0.9)
 Depends: 	cairo-dock-core (>= ${source:Version}),
-		cairo-dock-plug-ins (>= 2.0.0),
+		cairo-dock-plug-ins (> 2.1.2),
                 ${misc:Depends}
 Description: A light and eye-candy dock to launch your programs (metapackage)
  It uses Cairo / OpenGL to render graphics (many in correlation
@@ -37,7 +37,7 @@ Description: A light and eye-candy dock to launch your programs (metapackage)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This metapackage provides the components necessary for running Cairo-Dock. It
  provides the Cairo-Dock core, a set of standard plugins and the files necessary
@@ -84,13 +84,13 @@ Description: A light and eye-candy dock to launch your programs (core package)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This package is the core of Cairo-Dock project.
 
 Package: cairo-dock-dev
 Section: libdevel
-Architecture: any
+Architecture: all
 Depends: 	cairo-dock-core (= ${binary:Version}),
 		${misc:Depends},
 		libdbus-glib-1-dev,
@@ -105,7 +105,7 @@ Description: A light and eye-candy dock to launch your programs (dev package)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This package provides the include files and static library for cairo-dock 
  functions.
@@ -123,6 +123,6 @@ Description: A light and eye-candy dock to launch your programs (common files)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This package contains default icons and themes for Cairo-Dock.
diff --git a/debian/plug-ins/debian/control b/debian/plug-ins/debian/control
@@ -6,18 +6,18 @@ XSBC-Original-Maintainer: Julien Lavergne <julien.lavergne@gmail.com>, Ubuntu De
 Build-Depends: 	cdbs,
 		gawk, 
 		libxxf86vm-dev,
-		debhelper, 
+		debhelper (>= 7.2.6), 
 		automake,
 		libtool,
 		intltool,
-		libcairo2-dev, 
-		libgtk2.0-dev, 
-		librsvg2-dev,
+		libcairo2-dev (>= 1.8.0), 
+		libgtk2.0-dev (>= 2.16), 
+		librsvg2-dev (>= 2.22.0),
 		libdbus-glib-1-dev,
 		libxml2-dev,
 		libxtst-dev,
-		libglib2.0-dev,
-		cairo-dock-dev (>= 2.0.8.0),
+		libglib2.0-dev (>= 2.20),
+		cairo-dock-dev (>= 2.1.2),
 		libasound2-dev,
 		libvte-dev,
 		x11proto-xf86vidmode-dev,
@@ -31,9 +31,7 @@ Build-Depends: 	cdbs,
 		libgnutls-dev,
 		libwebkit-dev,
 		libexif-dev,
-		libxklavier12-dev,
-		libasound2-dev,
-		libexif-dev,
+		libxklavier-dev,
 		libgtkglext1-dev,
 		libgvfscommon-dev,
 		libetpan-dev
@@ -95,7 +93,7 @@ Depends: 	cairo-dock-plug-ins-data (>= ${source:Version}),
 		libxcomposite1,
 		libxfixes3,
 		libxinerama1,
-		libxklavier12 | libxklavier15 | libxklavier16,
+		libxklavier12 | libxklavier15 | libxklavier16 | libxklavier17,
 		libxml2,
 		libxmu6,
 		libxrender1,

diff --git a/debian/plug-ins/debian/copyright b/debian/plug-ins/debian/copyright
@@ -2,7 +2,7 @@ X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
 X-Debianized-By: Julien Lavergne <julien.lavergne@gmail.com>
 X-Debianized-Date: Wed, 16 Jun 2008 13:13:07 +0000.
 X-Source-Downloaded-From: http://developer.berlios.de/projects/cairo-dock/
-X-Upstream-Author: Fabrice Rey <fabounet@users.berlios.de>.
+X-Upstream-Author: Fabrice Rey <fabounet@glx-dock.org>.
 
 Files: systray/src/cd-tray.c: LGPL (v2 or later)
 Copyright: 2007 Neil Jagdish Patel
@@ -82,10 +82,6 @@ Files: 	powermanager/*
 Copyright: 2008 Adrien Pilleboue
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
-Files: 	rhythmbox/*
-Copyright: 2008 Adrien Pilleboue and 2009 Yann Dulieu
-Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
-
 Files: 	mail/*
 Copyright: Christophe Chapuis and Fabrice Rey
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
@@ -104,15 +100,27 @@ Copyright: Romain PEROL
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: 	switcher/*
-Copyright: Cchumi and Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Cchumi and Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: 	musicPlayer/*
-Copyright: Rémy Robertson, Yann Sladek and Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Rémy Robertson, Yann Sladek, Yann Dulieu and Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: dnd2share/*
-Copyright: Yann Dulieu and Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Yann Dulieu and Fabrice Rey <fabounet@glx-dock.org>
+Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
+
+Files: 	RSSreader/*
+Copyright: 2008 Yann Dulieu and Fabrice Rey <fabounet@glx-dock.org>
+Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
+
+Files: 	Doncky/*
+Copyright: 2008 Yann Dulieu
+Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
+
+Files: 	Network-Monitor/*
+Copyright: 2008 Yann Sladek and Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 
@@ -141,7 +149,7 @@ Files: 	alsaMixer/*
 	Toons/*
 	weather/*
 	Xgamma/*
-Copyright: Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: 	debian/*

diff --git a/debian2/debian/cairo-dock.1 b/debian2/debian/cairo-dock.1
@@ -1,4 +1,4 @@
-.TH CAIRO-DOCK 1 "Aug. 09, 2009"
+.TH CAIRO-DOCK 1 "Feb. 13, 2010"
 
 .SH NAME
 cairo\-dock \- A dock to launch your programs easily.
@@ -28,7 +28,7 @@ It is recommended to install the PLUG\-INS package (
 .PP
 Some screenshots are available :
 .br
-http://www.cairo\-dock.org/mc_album.php?a=3
+http://pics.glx\-dock.org
 
 .SH OPTIONS
 You can launch
@@ -168,16 +168,15 @@ Updated by Matthieu Baerts (matttbe) <matttbe@gmail.com>.
 Your bug is maybe a
 .B recurrent problem
 (black background, window at startup (use \-c or \-o),
-problem with OpenGL, etc.). Please go to http://www.glx-dock.org/ww_page.php?p=Recurrents%20problems&lang=en
+problem with OpenGL, etc.). Please go to http://www.glx\-dock.org/ww_page.php?p=Recurrents%20problems&lang=en
 .PP
 For any other bugs, you can post them on Cairo\-Dock forum
-(http://www.glx-dock.org/bg_forumlist.php)
+(http://forum.glx\-dock.org)
 .br
 or on Launchpad
 (https://bugs.launchpad.net/cairo\-dock)
 
 .SH WEBSITE
 <
-.B http://www.glx-dock.org
+.B http://glx-dock.org
 >
-
diff --git a/debian2/debian/control b/debian2/debian/control
@@ -28,7 +28,7 @@ Architecture: all
 Conflicts: 	cairo-dock (< 2.0.9)
 Replaces: 	cairo-dock (< 2.0.9)
 Depends: 	cairo-dock-core (>= ${source:Version}),
-		cairo-dock-plug-ins (>= 2.0.0),
+		cairo-dock-plug-ins (> 2.1.2),
                 ${misc:Depends}
 Description: A light and eye-candy dock to launch your programs (metapackage)
  It uses Cairo / OpenGL to render graphics (many in correlation
@@ -37,7 +37,7 @@ Description: A light and eye-candy dock to launch your programs (metapackage)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This metapackage provides the components necessary for running Cairo-Dock. It
  provides the Cairo-Dock core, a set of standard plugins and the files necessary
@@ -84,13 +84,13 @@ Description: A light and eye-candy dock to launch your programs (core package)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This package is the core of Cairo-Dock project.
 
 Package: cairo-dock-dev
 Section: libdevel
-Architecture: any
+Architecture: all
 Depends: 	cairo-dock-core (= ${binary:Version}),
 		${misc:Depends},
 		libdbus-glib-1-dev,
@@ -105,7 +105,7 @@ Description: A light and eye-candy dock to launch your programs (dev package)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This package provides the include files and static library for cairo-dock 
  functions.
@@ -123,6 +123,6 @@ Description: A light and eye-candy dock to launch your programs (common files)
  You can easily add applets in the dock or as a desklet.
  It is recommended to install the PLUG-INS package (cairo-dock-plug-ins) to
  have acces to more views, dialogs and many plug-ins and applets.
- Some screenshots are available : http://www.glx-dock.org/mc_album.php?a=3
+ Some screenshots are available : http://pics.glx-dock.org
  .
  This package contains default icons and themes for Cairo-Dock.
diff --git a/debian2/plug-ins/debian/control b/debian2/plug-ins/debian/control
@@ -17,21 +17,19 @@ Build-Depends: 	cdbs,
 		libxml2-dev,
 		libxtst-dev,
 		libglib2.0-dev,
-		cairo-dock-dev (>= 2.0.8.0),
+		cairo-dock-dev (>= 2.1.3),
 		libasound2-dev,
 		libvte-dev,
 		x11proto-xf86vidmode-dev,
 		libgnome-menu-dev,
 		libgnomevfs2-dev,
 		libgnomeui-dev,
 		libthunar-vfs-1-dev,
-		libasound2-dev,
 		libvte-dev,
 		libgnome-keyring-dev,
 		libgnutls-dev,
 		libexif-dev,
 		libxklavier12-dev,
-		libexif-dev,
 		libgtkglext1-dev,
 		libgvfscommon-dev,
 		libetpan-dev

diff --git a/debian2/plug-ins/debian/copyright b/debian2/plug-ins/debian/copyright
@@ -2,7 +2,7 @@ X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
 X-Debianized-By: Julien Lavergne <julien.lavergne@gmail.com>
 X-Debianized-Date: Wed, 16 Jun 2008 13:13:07 +0000.
 X-Source-Downloaded-From: http://developer.berlios.de/projects/cairo-dock/
-X-Upstream-Author: Fabrice Rey <fabounet@users.berlios.de>.
+X-Upstream-Author: Fabrice Rey <fabounet@glx-dock.org>.
 
 Files: systray/src/cd-tray.c: LGPL (v2 or later)
 Copyright: 2007 Neil Jagdish Patel
@@ -82,10 +82,6 @@ Files: 	powermanager/*
 Copyright: 2008 Adrien Pilleboue
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
-Files: 	rhythmbox/*
-Copyright: 2008 Adrien Pilleboue and 2009 Yann Dulieu
-Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
-
 Files: 	mail/*
 Copyright: Christophe Chapuis and Fabrice Rey
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
@@ -104,15 +100,27 @@ Copyright: Romain PEROL
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: 	switcher/*
-Copyright: Cchumi and Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Cchumi and Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: 	musicPlayer/*
-Copyright: Rémy Robertson, Yann Sladek and Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Rémy Robertson, Yann Sladek, Yann Dulieu and Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: dnd2share/*
-Copyright: Yann Dulieu and Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Yann Dulieu and Fabrice Rey <fabounet@glx-dock.org>
+Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
+
+Files: 	RSSreader/*
+Copyright: 2008 Yann Dulieu and Fabrice Rey <fabounet@glx-dock.org>
+Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
+
+Files: 	Doncky/*
+Copyright: 2008 Yann Dulieu
+Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
+
+Files: 	Network-Monitor/*
+Copyright: 2008 Yann Sladek and Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 
@@ -141,7 +149,7 @@ Files: 	alsaMixer/*
 	Toons/*
 	weather/*
 	Xgamma/*
-Copyright: Fabrice Rey <fabounet@users.berlios.de>
+Copyright: Fabrice Rey <fabounet@glx-dock.org>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
 
 Files: 	debian/*

diff --git a/hardy/debian/cairo-dock.1 b/hardy/debian/cairo-dock.1
@@ -1,4 +1,4 @@
-.TH CAIRO-DOCK 1 "Aug. 09, 2009"
+.TH CAIRO-DOCK 1 "Feb. 13, 2010"
 
 .SH NAME
 cairo\-dock \- A dock to launch your programs easily.
@@ -28,7 +28,7 @@ It is recommended to install the PLUG\-INS package (
 .PP
 Some screenshots are available :
 .br
-http://www.cairo\-dock.org/mc_album.php?a=3
+http://pics.glx\-dock.org
 
 .SH OPTIONS
 You can launch
@@ -168,16 +168,15 @@ Updated by Matthieu Baerts (matttbe) <matttbe@gmail.com>.
 Your bug is maybe a
 .B recurrent problem
 (black background, window at startup (use \-c or \-o),
-problem with OpenGL, etc.). Please go to http://www.glx-dock.org/ww_page.php?p=Recurrents%20problems&lang=en
+problem with OpenGL, etc.). Please go to http://www.glx\-dock.org/ww_page.php?p=Recurrents%20problems&lang=en
 .PP
 For any other bugs, you can post them on Cairo\-Dock forum
-(http://www.glx-dock.org/bg_forumlist.php)
+(http://forum.glx\-dock.org)
 .br
 or on Launchpad
 (https://bugs.launchpad.net/cairo\-dock)
 
 .SH WEBSITE
 <
-.B http://www.glx-dock.org
+.B http://glx-dock.org
 >
-