Update Debian packaging.

10 files changed, 140 insertions, 176 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 72a31944d..81642884c 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,7 @@
 weechat (0.1.6-1) unstable; urgency=low
 
- This release introduces some incompatible changes with old scripts and locale
- support, you can read the upstream NEWS file for more information.
+  * This release introduces some incompatible changes with old scripts
+  and locale support, you can read the upstream NEWS file for more
+  information.
 
  -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 20:45:46 +0100
diff --git a/debian/changelog b/debian/changelog
index 0deed4a10..acde84877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,67 @@
+weechat (0.2.7-1) unstable; urgency=low
+
+  * New (major) upstream release.
+  * 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).
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 30 Nov 2008 16:38:56 +0100
+
+weechat (0.2.6-2) unstable; urgency=low
+
+  * Setting me as maintainer with previous maintainer agreement.
+  * Remove Uploaders field.
+  * Add quilt to Build-Depends.
+  * Add a patch to fix probable pthread mutex locks on hppa architecture
+  with perl plugin (Closes: #495080).
+  * Add a Homepage field.
+  * Update Standards-Version to 3.8.0.
+  * Reformat NEWS file to avoid lintian warnings.
+  * Fix typos in control file.
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Sun, 30 Nov 2008 16:38:54 +0100
+
+weechat (0.2.6-1) unstable; urgency=low
+
+  * New Upstream Version
+  * Switch to GPLv3 (update copyright)
+  * Update menu entry
+
+ -- Emmanuel Bouthenot <kolter@openics.org>  Thu, 06 Sep 2007 20:10:26 +0200
+
+weechat (0.2.5-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Julien Louis <ptitlouis@sysif.net>  Tue, 12 Jun 2007 19:42:15 +0200
+
+weechat (0.2.4-2) unstable; urgency=low
+
+  * Backport iso-2022-jp patch from upstream CVS (Closes: #421833).
+  * Set myself as Maintainer with previous Maintainer agreement.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Thu, 03 May 2007 21:15:59 +0200
+
+weechat (0.2.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Julien Louis <ptitlouis@sysif.net>  Thu, 29 Mar 2007 21:01:46 +0200
+
+weechat (0.2.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump lua build-dependency to liblua5.1-0-dev
+  * Add pkg-config to Build-Depends
+  * Remove some duplited changelog entries.
+  * Improve weechat-plugins description
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 12 Jan 2007 09:01:46 +0100
+
 weechat (0.2.1-1) unstable; urgency=low
 
   * New upstream release
@@ -215,129 +279,3 @@ weechat (0.0.1-1) unstable; urgency=low
   * First version.
   
  -- FlashCode <flashcode@flashtux.org>  Sat, 27 Sep 2003 12:00:00 +0200
-weechat (0.1.5-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Julien Louis <ptitlouis@sysif.net>  Sat, 24 Sep 2005 14:08:55 +0200
-
-weechat (0.1.4-2) unstable; urgency=low
-
-  * Add autotools-dev to Build-Depends.
-  * update autotools stuff automatically to always
-    have up-to-date config.{guess,sub}
-  * Update Build-Depends: libgnutls11-dev -> libgnutls-dev
-
- -- Julien Louis <ptitlouis@sysif.net>  Mon,  1 Aug 2005 11:46:39 +0200
-
-weechat (0.1.4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Julien Louis <ptitlouis@sysif.net>  Sat, 30 Jul 2005 16:26:55 +0200
-
-weechat (0.1.3-2) unstable; urgency=low
-
-  * Update config.{guess,sub} to fix FTBFS on k*BSD (Closes: #316791)
-
- -- Julien Louis <ptitlouis@sysif.net>  Fri,  8 Jul 2005 21:30:38 +0200
-
-weechat (0.1.3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Julien Louis <ptitlouis@sysif.net>  Sat,  2 Jul 2005 20:06:29 +0200
-
-weechat (0.1.2-3) unstable; urgency=low
-
-  * Apply patch against gui-display.c to fix curses color bug.
-  * remove dh_install --sourcedir to allow builds on woody.
-
- -- Julien Louis <ptitlouis@sysif.net>  Sun, 19 Jun 2005 22:37:11 +0200
-
-weechat (0.1.2-2) unstable; urgency=low
-
-  * Patch src/gui/curse/gui-display.c to fix segfault
-    when config file does not exists (Closes: #310589).
-
- -- Julien Louis <ptitlouis@sysif.net>  Tue, 24 May 2005 20:55:02 +0200
-
-weechat (0.1.2-1) unstable; urgency=low
-
-  * WeeChat version 0.1.2, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
-
-weechat (0.1.1-2) unstable; urgency=low
-
-  * debian/control:
-    - Add myself to uploaders.
-    - Remove unecessary dependency on weechat-gtk (Closes: #308287).
-
- -- Julien Louis <ptitlouis@sysif.net>  Tue, 10 May 2005 22:38:52 +0200
-
-weechat (0.1.1-1) unstable; urgency=low
-
-  * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
-
-weechat (0.1.0-1) unstable; urgency=low
-
-  * WeeChat version 0.1.0, see ChangeLog for detail.
-  
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
-
-weechat (0.0.9-1) unstable; urgency=low
-
-  * WeeChat version 0.0.9, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Sat, 01 Jan 2005 13:00:00 +0200
-
-weechat (0.0.8-1) unstable; urgency=low
-
-  * WeeChat version 0.0.8, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Sat, 30 Oct 2004 11:40:00 +0200
-
-weechat (0.0.7-1) unstable; urgency=low
-
-  * WeeChat version 0.0.7, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Sat, 08 Aug 2004 21:00:00 +0200
-
-weechat (0.0.6-1) unstable; urgency=low
-
-  * WeeChat version 0.0.6, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Sat, 05 Jun 2004 11:30:00 +0200
-
-weechat (0.0.5-1) unstable; urgency=low
-
-  * WeeChat version 0.0.5, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Sat, 07 Feb 2004 20:30:00 +0200
-
-weechat (0.0.4-1) unstable; urgency=low
-
-  * WeeChat version 0.0.4, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Thu, 01 Jan 2004 13:00:00 +0200
-
-weechat (0.0.3-1) unstable; urgency=low
-
-  * WeeChat version 0.0.3, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Mon, 03 Nov 2003 23:15:00 +0200
-
-weechat (0.0.2-1) unstable; urgency=low
-
-  * WeeChat version 0.0.2, see ChangeLog for detail.
-  
- -- FlashCode <flashcode@flashtux.org>  Sun, 05 Oct 2003 12:00:00 +0200
-
-weechat (0.0.1-1) unstable; urgency=low
-
-  * First version.
-  
- -- FlashCode <flashcode@flashtux.org>  Sat, 27 Sep 2003 12:00:00 +0200
diff --git a/debian/control b/debian/control
index ce2816fb8..243f40b07 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,17 @@
 Source: weechat
 Section: net
 Priority: optional
-Maintainer: Sebastien Helleu <flashcode@flashtux.org>
-Uploaders: Julien Louis <ptitlouis@sysif.net>
+Maintainer: Emmanuel Bouthenot <kolter@openics.org>
 Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml
-Build-Depends: cdbs, debhelper (>= 5), libncursesw5-dev, ruby, ruby1.8-dev, libperl-dev, python-dev, libaspell-dev, liblualib50-dev, libgnutls-dev, libtool, dpkg-dev (>= 1.13.19)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.37), cmake, libncursesw5-dev,
+ ruby, ruby1.8-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
+ tcl8.4-dev, libgnutls-dev, dpkg-dev (>= 1.13.19), pkg-config
+Standards-Version: 3.8.0
+Homepage: http://weechat.flashtux.org/
 
 Package: weechat
 Architecture: all
-Depends: weechat-common (= ${source:Version}), weechat-curses (>= ${binary:Version})
+Depends: ${misc:Depends}, weechat-curses (>= ${source:Version})
 Description: Fast, light and extensible IRC 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.
@@ -21,12 +23,10 @@ Description: Fast, light and extensible IRC client
   - double charset support (decode/encode)
   - FIFO pipe for remote control
   - and much more!
- .
- Homepage: http://weechat.flashtux.org/
 
 Package: weechat-curses
 Architecture: any
-Depends: ${shlibs:Depends}, weechat-common (= ${source:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
 Recommends: weechat-plugins (= ${binary:Version})
 Description: Fast, light and extensible IRC client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC client
@@ -39,21 +39,34 @@ Description: Fast, light and extensible IRC client
   - double charset support (decode/encode)
   - FIFO pipe for remote control
   - and much more!
- .
- Homepage: http://weechat.flashtux.org/
 
-Package: weechat-common
-Architecture: all
-Replaces: weechat
-Recommends: weechat-curses
-Description: Common files for WeeChat
- Documentation, examples, and locale files for WeeChat - fast, light and
- extensible IRC client. It is useless without weechat-curses.
+Package: weechat-core
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary: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: xfer, notify, irc, charset and logger.
 
 Package: weechat-plugins
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
 Suggests: weechat-scripts
 Description: Plugins for WeeChat
- This package provides some plugins to enhance weechat with scripting languages
- such as perl python or ruby.
+ This package provides some plugins to enhance WeeChat. It currently ships
+ the following plugins: Perl, Python, Ruby, Lua, Tcl, Aspell and Fifo.
+
+Package: weechat-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Documentation for WeeChat
+ This package contains the html documentation for WeeChat.
+
+Package: weechat-dbg
+Priority: extra
+Architecture: any
+Depends: ${misc:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-core (= ${binary:Version}), weechat-plugins (= ${binary:Version})
+Description: Debugging symbols for WeeChat
+ This package contains gdb debugging symbols for the WeeChat packages.
diff --git a/debian/copyright b/debian/copyright
index 333e3eae9..a62cfa96c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,17 +3,17 @@ Sat, 21 May 2005 08:00:00 +0200.
 
 It was downloaded from http://weechat.flashtux.org/download
 
-Upstream Authors:
- - FlashCode <flashcode@flashtux.org>
- - kolter <kolter@free.fr>
-
 Copyright:
+	(2003)	FlashCode <flashcode@flashtux.org>
+		Emmanuel Bouthenot <kolter@openics.org>
+	(2008)	Dmitry Kobylin <fnfal@academ.tsc.ru> (tcl plugin)
+
 
 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
-the Free Software Foundation; either version 2 of the License, or (at
+the Free Software Foundation; either version 3 of the License, or (at
 your option) any later version.
 
 On Debian systems, the complete text of the GNU General Public
-License, Version 2 can be found in the file
-/usr/share/common-licenses/GPL
+License, Version 3 can be found in the file
+/usr/share/common-licenses/GPL-3
diff --git a/debian/rules b/debian/rules
index 3184cc32b..b06da34fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,28 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
-# This file is public domain.
 
-DEB_AUTO_CLEANUP_RCS            := yes
-
-# Add here any variable or target overrides you need
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 
-DEB_CONFIGURE_USER_FLAGS := --with-debug=0
 DEB_STRIP_EXCLUDE := libperl.a
 DEB_DH_INSTALL_SOURCEDIR := $(CURDIR)/debian/tmp
-DEB_INSTALL_DOCS_weechat-common :=  FAQ FAQ.fr
-DEB_DH_MAKESHLIBS_ARGS_weechat-plugins := -n
-
-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
+	CFLAGS += -O0
 else
-        CFLAGS += -O2
+	CFLAGS += -O2
 endif
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM += -s
+	INSTALL_PROGRAM += -s
 endif
 
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
- DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lpthread"
+	DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lpthread"
 endif
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-install/weechat-common::
-	install -D -o root -g root -m 644 debian/weechat.xpm $(CURDIR)/debian/weechat-common/usr/share/pixmaps/weechat.xpm
+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
diff --git a/debian/weechat-core.install b/debian/weechat-core.install
new file mode 100644
index 000000000..9f632a466
--- /dev/null
+++ b/debian/weechat-core.install
@@ -0,0 +1,7 @@
+usr/share/locale/
+usr/lib/weechat/plugins/alias.so
+usr/lib/weechat/plugins/xfer.so
+usr/lib/weechat/plugins/notify.so
+usr/lib/weechat/plugins/irc.so
+usr/lib/weechat/plugins/charset.so
+usr/lib/weechat/plugins/logger.so
diff --git a/debian/weechat-curses.menu b/debian/weechat-curses.menu
index 4ec19cd1d..5c5f5f994 100644
--- a/debian/weechat-curses.menu
+++ b/debian/weechat-curses.menu
@@ -1,4 +1,4 @@
-?package(weechat-curses):needs="text" section="Apps/Net" \
+?package(weechat-curses):needs="text" section="Applications/Network/Communication" \
 		title="weechat-curses" \
 		icon="/usr/share/pixmaps/weechat.xpm" \
 		command="/usr/bin/weechat-curses"
diff --git a/debian/weechat-doc.docs b/debian/weechat-doc.docs
new file mode 100644
index 000000000..379955df5
--- /dev/null
+++ b/debian/weechat-doc.docs
@@ -0,0 +1,7 @@
+AUTHORS
+BUGS
+FAQ
+FAQ.fr
+NEWS
+README
+TODO
diff --git a/debian/weechat-doc.install b/debian/weechat-doc.install
new file mode 100644
index 000000000..af4e1e0ba
--- /dev/null
+++ b/debian/weechat-doc.install
@@ -0,0 +1 @@
+usr/share/doc/weechat/html usr/share/doc/weechat-doc
diff --git a/debian/weechat-plugins.install b/debian/weechat-plugins.install
index 663f121d2..a5ed3eeb0 100644
--- a/debian/weechat-plugins.install
+++ b/debian/weechat-plugins.install
@@ -1 +1,7 @@
-usr/lib/weechat/plugins/*so*
+usr/lib/weechat/plugins/fifo.so
+usr/lib/weechat/plugins/perl.so
+usr/lib/weechat/plugins/python.so
+usr/lib/weechat/plugins/ruby.so
+usr/lib/weechat/plugins/lua.so
+usr/lib/weechat/plugins/aspell.so
+usr/lib/weechat/plugins/tcl.so