10 files changed, 74 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog
index acde84877..96af42221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,19 @@
-weechat (0.2.7-1) unstable; urgency=low
+weechat (0.2.7-1) experimental; urgency=low
 
   * New (major) upstream release.
+    - Fix the excessive number of wakeups (Closes: #461945)
   * Packaging changes:
     - Drop weechat-common
     - Add weechat-doc (Documentation)
     - Add weechat-core (locales files, essential plugins)
     - Add weechat-dbg (gdb debugging symbols)
   * Adjust Build-Depends for new tcl plugin (update debian/copyright).
-  * Remove quilt from Build-Depends (patch merged upstream).
+  * Remove quilt from Build-Depends (patches merged upstream).
+  * Switch packaging from cdbs to plain debhelper.
+  * Update packages descriptions.
+  * Add a lintian-override against manpage line wrapping error.
 
- -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 30 Nov 2008 16:38:56 +0100
+ -- Emmanuel Bouthenot <kolter@openics.org>  Fri, 08 May 2009 13:36:39 +0000
 
 weechat (0.2.6-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff82d..7f8f011eb 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 0b7bbdd73..55051bb14 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@openics.org>
 Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.37), cmake, libncursesw5-dev,
+Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
  ruby, ruby1.8-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
- tcl8.5-dev, libgnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
-Standards-Version: 3.8.0
+ tcl-dev, libgnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
+Standards-Version: 3.8.1
 Homepage: http://weechat.flashtux.org/
 
 Package: weechat
@@ -28,7 +28,7 @@ Package: weechat-curses
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
 Recommends: weechat-plugins (= ${binary:Version})
-Description: Fast, light and extensible IRC client
+Description: Fast, light and extensible IRC client - console client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
  for many operating systems. Everything can be done with a keyboard.
  It is customizable and extensible with plugins/scripts, and includes:
@@ -39,34 +39,55 @@ Description: Fast, light and extensible IRC client
   - double charset support (decode/encode)
   - FIFO pipe for remote control
   - and much more!
+ .
+ This package provides the console client (ncurses).
 
 Package: weechat-core
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: weechat-doc (= ${source:Version})
 Conflicts: weechat-common, weechat-plugins (<< 0.2.7)
-Description: Core files for WeeChat
- This package provides core plugins and locales files for WeeChat. It currently
- ships the following plugins: irc, xfer, charset and logger.
+Description: Fast, light and extensible IRC client - core files
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
+ for many operating systems. Everything can be done with a keyboard.
+ .
+ This package provides core plugins and locales files for WeeChat. It
+ currently ships the following plugins: xfer, notify, irc, charset and
+ logger. It is useless without weechat-curses.
 
 Package: weechat-plugins
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
 Suggests: weechat-scripts
-Description: Plugins for WeeChat
- This package provides some plugins to enhance WeeChat. It currently ships
- the following plugins: Perl, Python, Ruby, Lua, Tcl, Aspell, Relay and Fifo.
+Description: Fast, light and extensible IRC client - plugins
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
+ for many operating systems. Everything can be done with a keyboard.
+ .
+ This package provides some plugins to enhance WeeChat. It currently
+ ships the following plugins:
+  - Perl, Python, Ruby, Lua, and Tcl scripting.
+  - Spell checking (thanks to aspell).
+  - Charsets management
+  - And many others (Relay, Fifo, ...)
 
 Package: weechat-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: Documentation for WeeChat
+Description: Fast, light and extensible IRC client - documentation
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
+ for many operating systems. Everything can be done with a keyboard.
+ .
  This package contains the html documentation for WeeChat.
 
 Package: weechat-dbg
+Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, weechat-curses (= ${binary:Version}) |
  weechat-core (= ${binary:Version}), weechat-plugins (= ${binary:Version})
-Description: Debugging symbols for WeeChat
+Description: Fast, light and extensible IRC client - debugging symbols
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
+ for many operating systems. Everything can be done with a keyboard.
+ .
  This package contains gdb debugging symbols for the WeeChat packages.
diff --git a/debian/lintian-override b/debian/lintian-override
deleted file mode 100644
index 263f3f03a..000000000
--- a/debian/lintian-override
+++ /dev/null
@@ -1 +0,0 @@
-weechat-curses: menu-icon-missing /usr/share/pixmaps/weechat.xpm
diff --git a/debian/rules b/debian/rules
index b06da34fb..62bfa08f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,32 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+builddir/Makefile:
+	mkdir -p builddir
+	cd builddir && \
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_C_FLAGS="$(CFLAGS)" \
+		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_VERBOSE_MAKEFILE=ON
 
-DEB_STRIP_EXCLUDE := libperl.a
-DEB_DH_INSTALL_SOURCEDIR := $(CURDIR)/debian/tmp
+build: build-stamp
+build-stamp: builddir/Makefile 
+	dh_testdir
+	$(MAKE) -C builddir
+	touch $@
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+override_dh_install:
+	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install
+	dh_install
 
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+override_dh_strip:
+	dh_strip --dbg-package=weechat-dbg
 
-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-ifeq ($(DEB_HOST_ARCH_OS),hurd)
-	DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lpthread"
-endif
+clean:
+	rm -rf builddir
+	dh $@
 
-install/weechat-core::
-	install -D -o root -g root -m 644 debian/weechat.xpm $(CURDIR)/debian/weechat-core/usr/share/pixmaps/weechat.xpm
-
-install/weechat-curses::
-	install -D -o root -g root -m 644 debian/lintian-override $(CURDIR)/debian/weechat-curses/usr/share/lintian/overrides/weechat-curses
+%:
+	dh $@
diff --git a/debian/weechat-core.docs b/debian/weechat-core.docs
new file mode 100644
index 000000000..ba6c8ac4b
--- /dev/null
+++ b/debian/weechat-core.docs
@@ -0,0 +1,5 @@
+AUTHORS
+BUGS
+NEWS
+README
+TODO
diff --git a/debian/weechat-curses.dirs b/debian/weechat-curses.dirs
index e77248175..b85d017bf 100644
--- a/debian/weechat-curses.dirs
+++ b/debian/weechat-curses.dirs
@@ -1 +1,2 @@
 usr/bin
+usr/share/pixmaps
diff --git a/debian/weechat-curses.install b/debian/weechat-curses.install
index 49b48af9b..b2b395c82 100644
--- a/debian/weechat-curses.install
+++ b/debian/weechat-curses.install
@@ -1 +1,2 @@
 usr/bin/weechat-curses
+debian/weechat.xpm usr/share/pixmaps
diff --git a/debian/weechat-curses.lintian-overrides b/debian/weechat-curses.lintian-overrides
new file mode 100644
index 000000000..f467c9ce4
--- /dev/null
+++ b/debian/weechat-curses.lintian-overrides
@@ -0,0 +1 @@
+weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 54: warning [p 1, 8.2i]: cannot adjust line
diff --git a/debian/weechat-doc.docs b/debian/weechat-doc.docs
index 379955df5..8e714f795 100644
--- a/debian/weechat-doc.docs
+++ b/debian/weechat-doc.docs
@@ -1,7 +1,2 @@
-AUTHORS
-BUGS
 FAQ
 FAQ.fr
-NEWS
-README
-TODO