[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.0.9-1-3-gff39164

[Rico Tzschichholz]

The following commit has been merged in the master branch:
commit ff39164eaaabe463003647aef5837579806831dc
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Tue Jan 4 09:35:20 2011 +0100

    New upstream bugfix release 2.0.10

diff --git a/debian/changelog b/debian/changelog
index 2758be2..8f74689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+docky (2.0.10-1) UNRELEASED; urgency=low
+
+  * New upstream release 2.0.10 "Nice and Easy",
+    changes include:
+    + fix unhiding when there are multiple, differently sized monitors
+      (LP: #625332)
+    + fix RecentDocuments (LP: #660179)
+    + add manpage
+    + some optimizations
+  * remove debian/docky.manpages, debian/docky.1
+    + manpage is installed by upstream now
+
+ -- Rico Tzschichholz <ricotz at t-online.de>  Tue, 04 Jan 2011 09:32:03 +0100
+
 docky (2.0.9-1) experimental; urgency=low
 
   * New upstream release 2.0.9 "You can count on us",
diff --git a/debian/docky.1 b/debian/docky.1
deleted file mode 100644
index 145816d..0000000
--- a/debian/docky.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.TH DOCKY "1"
-.SH NAME
-Docky \- The fastest dock in the west!
-.SH SYNOPSIS
-docky [\fIoptions\fR]
-.SH OPTIONS
-.TP
-\-? \fB\-\-help\fR
-Show this help list
-.TP
-\fB\-b\fR \fB\-\-buffer\-time\fR:PARAM
-Maximum time (in minutes) to keep buffers
-.TP
-\fB\-d\fR \fB\-\-debug\fR
-Enable debug level logging
-.TP
-\fB\-m\fR \fB\-\-max\-size\fR:PARAM
-Maximum window dimension (min 500)
-.TP
-\fB\-n\fR \fB\-\-netbook\fR
-Netbook mode
-.TP
-\fB\-p\fR \fB\-\-disable\-polling\fR
-Disable cursor polling (for testing)
-.TP
-\fB\-V\fR \fB\-\-version\fR
-Display version and licensing information
-.TP
-\fB\-\-help2\fR
-Show an additional help list
-.TP
-\fB\-\-nvidia\fR
-Nvidia mode (for Nvidia cards that lag after awhile) [\-b 10]
-.TP
-\fB\-\-usage\fR
-Show usage syntax and exit
-.SH HOMEPAGE
-For more information, please visit http://launchpad.net/docky/
-.SH AUTHORS
-Jason Smith <jassmith at gmail.com>, Robert Dyer <psybers at gmail.com>, Chris Szikszoy <chris at szikszoy.com>, Daniel For? <daniel.p.fore at gmail.com>
diff --git a/debian/docky.manpages b/debian/docky.manpages
deleted file mode 100644
index 6f8f1cb..0000000
--- a/debian/docky.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/docky.1

-- 
docky