[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.11-2-3-gfcb9f0a

Rico Tzschichholz ricotz at t-online.de
Sat Feb 12 19:12:23 UTC 2011 

The following commit has been merged in the master branch:
commit fcb9f0aae8270ae4d22a3c02f1de2881db9d9a83
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sat Feb 12 20:02:21 2011 +0100

    update packaging for new feature release

diff --git a/debian/changelog b/debian/changelog
index d261fe9..49b0be4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+docky (2.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release 2.1.0 "This is it",
+    changes include:
+    + new docklets:
+      - Clippy, Desktop, SessionManager, Timer, WorkspaceSwitcher
+    + many new hidden gconf-settings for power-users ;-)
+    + implement DockManager DBus API
+      - all helper scripts are moved to dockmanager project on launchpad.net
+    + a whole bunch of Wishlist bug-fixes!!!
+  * use debian source format 3.0 (quilt)
+  * debian/patches:
+    + use-system-gio-sharp.patch dropped, applied upstream
+  * debian/*:
+    + changed to fit new upstream source and build dependencies
+    + update copyright file
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Sat, 12 Feb 2011 20:00:20 +0100
+
 docky (2.0.11-2) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/control b/debian/control
index 4d59b39..e0ba2fe 100644
--- a/debian/control
+++ b/debian/control
@@ -2,35 +2,30 @@ Source: docky
 Section: x11
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>
+Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Rico Tzschichholz <ricotz at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50~),
- quilt (>= 0.46-7~),
  autotools-dev,
  intltool,
- python-support (>= 0.9),
  cli-common-dev (>= 0.7)
 Build-Depends-Indep:
  mono-devel (>= 2.4.3),
  gtk-sharp2-gapi,
  libgconf2.0-cil-dev,
- libglade2.0-cil-dev,
  libgnomedesktop2.0-cil-dev,
  libgnome-keyring1.0-cil-dev,
- libgnome-vfs2.0-cil-dev,
  libgtk2.0-cil-dev,
+ libgio2.0-cil-dev (>= 2.22.2),
  librsvg2-2.0-cil-dev,
  libmono-addins-cil-dev,
  libmono-addins-gui-cil-dev,
- libndesk-dbus1.0-cil-dev,
- libndesk-dbus-glib1.0-cil-dev,
+ libdbus1.0-cil-dev (>= 0.7),
+ libdbus-glib1.0-cil-dev (>= 0.5),
  libnotify-cil-dev,
  libwnck1.0-cil-dev,
  libgtk2.0-dev,
  libglib2.0-dev,
- libgconf2-dev,
- libgio2.0-cil-dev (>= 2.22.2),
+ libgconf2-dev
 Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/docky.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/docky.git
 Homepage: https://launchpad.net/docky
@@ -38,11 +33,12 @@ Homepage: https://launchpad.net/docky
 Package: docky
 Architecture: all
 Depends: ${shlibs:Depends},
- ${misc:Depends},
  ${cli:Depends},
- python,
- librsvg2-common,
- python-docky
+ ${misc:Depends},
+ librsvg2-common
+Recommends: dockmanager
+Conflicts: python-docky (<< 2.0.99)
+Replaces: python-docky (<< 2.0.99)
 Description: Elegant, powerful, clean dock
  A full fledged dock application that makes opening common applications and
  managing windows easier and quicker. Docky is fully integrated into the GNOME
@@ -59,29 +55,3 @@ Description: Elegant, powerful, clean dock
  Rhythmbox, Deluge, Tomboy and Zeitgeist.
  .
  Docky is derived from the GNOME Do "docky" interface.
-
-Package: python-docky
-Section: python
-Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends},
- python-gobject,
- python-dbus
-XB-Python-Version: ${python:Versions}
-Description: Elegant, powerful, clean dock - Python support library
- A full fledged dock application that makes opening common applications and
- managing windows easier and quicker. Docky is fully integrated into the GNOME
- Desktop and features a no non-sense approach to configuration and usage.
- It just works.
- .
- Docky provides an application launcher, running application management, and
- various "docklets" including a CPU monitor, weather report and clock.  It is
- similar to other docks such as AWN and cairo-dock.
- .
- Applications can integrate with Docky to add extra items to their context
- menus or modify their icons to display more information.  This package
- includes integration helpers for a number of applications, including Banshee,
- Rhythmbox, Deluge, Tomboy and Zeitgeist.
- .
- This package contains a Python library to assist with integrating applications
- with docky.
diff --git a/debian/copyright b/debian/copyright
index db94028..5f4c865 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,12 +8,9 @@ Copyright: © 2008-2010 Jason Smith <jassmith at gmail.com>,
            © 2008-2010 Robert Dyer <psybers at gmail.com>,
            © 2008-2010 Chris Szikszoy <chris at szikszoy.com>,
            © 2008-2010 Rico Tzschichholz <ricotz at t-online.de>,
-           © 2008-2010 Seif Lofty <seif at lotfy.com>,
            © 2008-2010 Chris Halse Rogers <raof at ubuntu.com>,
            © 2008-2010 Alex Launi <alex.launi at gmail.com>,
-           © 2009 Siegfried Gevatter <siegfried at gevatter.com>
-	   © 2010 Stefan Bethge < stefan+launchpad at lanpartei.de>
-	   © 2010 Lukasz Piepiora
+           © 2010 Claudio Melis
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -34,69 +31,14 @@ License: GPL-3+
 Files: Docky.Services/Docky.Services/Logging/ConsoleCrayon.cs,
        Docky.Widgets/Docky.Widgets/TileView.cs,
        Docky.Widgets/Docky.Widgets/WrapLabel.cs,
-       Docky.Widgets/Docky.Widgets/SingleActorStage.cs,
        Docky.Widgets/Docky.Widgets/Tile.cs,
-       Docky.Widgets/Docky.Widgets/Actor.cs,
        Docky.Widgets/Docky.Widgets/SearchEntry.cs,
        Docky.Widgets/Docky.Widgets/HoverImageButton.cs,
-       Docky.Widgets/Docky.Widgets/Stage.cs,
        Docky.Windowing/Xlib/Xlib.cs,
        Docky.Windowing/Xlib/X11Atoms.cs
 Copyright: © 2006-2008 Novell, Inc.
 License: MIT
 
-Files: Docky.Widgets/Docky.Widgets/AnimatedBox.cs,
-       Docky.Widgets/Docky.Widgets/AnimatedVBox.cs,
-       Docky.Widgets/Docky.Widgets/AnimatedWidget.cs,
-       Docky.Widgets/Docky.Widgets/AnimatedHBox.cs,
-       Docky.Widgets/Docky.Widgets/Choreographer.cs
-Copyright: © 2008 Scott Peterson
-License: MIT
-
-Files: lib/gio-sharp/generator/*
-Copyright: © 2001-2003 Mike Kestner <mkestner at speakeasy.net>,
-           © 2003-2008 Novell, Inc,
-           © 2002-2003 Rachel Hestilow <hestilow at ximian.com>,
-           © 2003 Ximian Inc.
-License: GPL-2
- This program is free software; you can redistribute it and/or
- modify it under the terms of version 2 of the GNU General Public
- License as published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: lib/gio-sharp/gio/*
-Copyright: © 2008 Novell, Inc.,
-           © 2008 Stephane Delcroix
-License: LGPL-2
- This program is free software; you can redistribute it and/or
- modify it under the terms of version 2 of the Lesser GNU General
- Public License as published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301, USA.
- .
- On Debian systems, the complete text of the Lesser GNU General Public License
- can be found in `/usr/share/common-licenses/LGPL-2'.
-
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
diff --git a/debian/docky.install b/debian/docky.install
deleted file mode 100644
index ad756d2..0000000
--- a/debian/docky.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/lib/docky
-usr/share
-etc/
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6fb8d90..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use-system-gio-sharp.patch
diff --git a/debian/patches/use-system-gio-sharp.patch b/debian/patches/use-system-gio-sharp.patch
deleted file mode 100644
index edfe054..0000000
--- a/debian/patches/use-system-gio-sharp.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: docky/configure.ac
-===================================================================
---- docky.orig/configure.ac
-+++ docky/configure.ac
-@@ -138,7 +138,18 @@
- DOCKY_WINDOWING_LIBS="-r:$(pwd)/build/Docky.Windowing.dll"
- AC_SUBST([DOCKY_WINDOWING_LIBS])
- 
--GIO_SHARP_LIBS="-r:$(pwd)/build/gio-sharp.dll"
-+dnl gio-sharp is an unstable api library
-+GIO_SHARP_REQUIRED_VERSION=2.22.2
-+PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0 >= $GIO_SHARP_REQUIRED_VERSION])
-+files="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0`"
-+for file in $files; do
-+	[ mkdir -p $top_srcdir/build ] && [ cp -vu $file $top_srcdir/build/ ]
-+	GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file)"
-+	GIO_SHARP_LIBS="$GIO_SHARP_LIBS -r:$top_srcdir/build/$(basename $file)"
-+	[[ -r "$file.config" ]] && [ mkdir -p $top_srcdir/build ] && [ cp -vu $file.config $top_srcdir/build/ ]
-+	[[ -r "$file.config" ]] && GIO_SHARP_ASSEMBLIES="$GIO_SHARP_ASSEMBLIES $top_srcdir/build/$(basename $file).config"
-+done
-+AC_SUBST([GIO_SHARP_ASSEMBLIES])
- AC_SUBST([GIO_SHARP_LIBS])
- 
- PKG_CHECK_MODULES([NUNIT], [nunit], have_nunit=yes, have_nunit=no)
-@@ -175,9 +186,6 @@
- 
- AC_CONFIG_FILES([
- lib/Makefile
--lib/gio-sharp/Makefile
--lib/gio-sharp/generator/Makefile
--lib/gio-sharp/gio/Makefile
- scripts/Makefile
- scripts/docky/Makefile
- scripts/docky/docky.py
-Index: docky/Makefile.am
-===================================================================
---- docky.orig/Makefile.am
-+++ docky/Makefile.am
-@@ -5,11 +5,15 @@
- 
- ACLOCAL_AMFLAGS = -I m4 -I m4/shamrock
- 
-+# Install copied assemblies to our libdir
-+copiedlibsdir = $(pkglibdir)
-+copiedlibs_DATA = \
-+	$(GIO_SHARP_ASSEMBLIES)
-+
- SUBDIRS = \
- 	. \
- 	data \
- 	scripts \
--	lib \
- 	po \
- 	Docky.CairoHelper \
- 	Docky.Services \
diff --git a/debian/python-docky.install b/debian/python-docky.install
deleted file mode 100644
index 607c065..0000000
--- a/debian/python-docky.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*
diff --git a/debian/rules b/debian/rules
index c4956a9..604ba01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,32 +4,13 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cli-common/cli.make
-include /usr/share/quilt/quilt.make
-
-override_dh_pysupport:
-# Don't byte compile helpers — causes broken ones to also show up in prefs
-	dh_pysupport -X /usr/share/docky/helpers/
 
 override_dh_auto_configure:
-	autoreconf -vi
 	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
-override_dh_auto_clean:
-	dh_auto_clean
-# Clean up the autofoo changes
-	find . -name Makefile.in -type f -delete
-	-rm configure aclocal.m4 lib/Makefile
-
-override_dh_auto_install:
-	dh_auto_install
-# Upstream installs the metadata as executable.
-	chmod -x debian/tmp/usr/share/docky/helpers/metadata/*.info
-# The NetworkManager docklet requires an unreleased ndesk-dbus to work.
-	rm debian/tmp/usr/lib/docky/plugins/NetworkManager.dll
-
 override_dh_makeclilibs:
-# Docky's gio-sharp is private
+# Docky's dlls are private
 	dh_makeclilibs -X usr/lib/docky/*
 
 %:
-	dh --with quilt $@
+	dh  $@
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)

-- 
docky

More information about the Pkg-cli-apps-commits mailing list