Sync debian packaging stuff with official packages

16 files changed, 76 insertions, 164 deletions

diff --git a/debian/changelog b/debian/changelog
index 842481032..49e7fc584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+weechat (0.1.8-2) unstable; urgency=low
+
+  * Switch to cdbs
+  * update debhelper compatibility to 5
+  * update Build-Depends
+  * update debian/copyright
+  * Bump Standards-Version, no changes needed
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 21 Apr 2006 22:39:00 +0200
+
 weechat (0.1.8-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index b8626c4cf..7ed6ff82d 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 4ff11022d..78e3b2978 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
 Priority: optional
 Maintainer: Sebastien Helleu <flashcode@flashtux.org>
 Uploaders: Julien Louis <ptitlouis@sysif.net>
-Build-Depends: debhelper (>> 4.0.0), libncursesw5-dev, ruby, ruby1.8-dev, libperl-dev, python-dev, liblualib50-dev, libgnutls-dev, libtool, xsltproc, docbook-xsl, docbook-xml
-Standards-Version: 3.6.2
+Build-Depends: cdbs, debhelper (>= 5), libncursesw5-dev, ruby, ruby1.8-dev, libperl-dev, python-dev, liblualib50-dev, libgnutls-dev, libtool, xsltproc, docbook-xsl, docbook-xml
+Standards-Version: 3.7.2
 
 Package: weechat
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 72157e3a0..333e3eae9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,9 @@ Sat, 21 May 2005 08:00:00 +0200.
 
 It was downloaded from http://weechat.flashtux.org/download
 
-Upstream Author: FlashCode <flashcode@flashtux.org>
+Upstream Authors:
+ - FlashCode <flashcode@flashtux.org>
+ - kolter <kolter@free.fr>
 
 Copyright:
 
diff --git a/debian/rules b/debian/rules
index 575fc4c0e..d5520ac22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,90 +1,34 @@
 #!/usr/bin/make -f
+# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
+# This file is public domain.
 
-#export DH_VERBOSE=1
+DEB_AUTO_CLEANUP_RCS            := yes
+
+# Add here any variable or target overrides you need
+
+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
 
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
-LDFLAGS +=-lpthread
+ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lpthread"
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	LDFLAGS=$(LDFLAGS) ./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info --with-debug=0
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install
-#	install -o root -g root -m 755 src/gui/curses/weechat-curses $(CURDIR)/debian/weechat-curses/usr/bin
-	# install -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin
+install/weechat-common::
 	install -D -o root -g root -m 644 weechat_icon_32.png $(CURDIR)/debian/weechat-common/usr/share/pixmaps/weechat_icon_32.png
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -pweechat-common -pweechat
-	dh_testroot -pweechat-common -pweechat
-	dh_installchangelogs ChangeLog -pweechat-common
-	dh_installdocs -pweechat-common
-	dh_installinfo -pweechat-common
-	dh_installexamples -pweechat-common
-	dh_compress -pweechat-common -pweechat
-	dh_link -pweechat usr/share/doc/weechat-common usr/share/doc/weechat
-	dh_fixperms -pweechat-common -pweechat
-	dh_installdeb -pweechat-common -pweechat
-	dh_shlibdeps -pweechat-common -pweechat
-	dh_gencontrol -pweechat-common -pweechat
-	dh_md5sums -pweechat-common -pweechat
-	dh_builddeb -pweechat-common -pweechat
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a -pweechat-curses -pweechat-plugins
-	dh_testroot -a -pweechat-curses -pweechat-plugins
-	dh_installchangelogs ChangeLog -pweechat-plugins
-	dh_installdocs -pweechat-plugins
-	dh_installman doc/weechat-curses.1 -pweechat-curses
-	dh_link -pweechat-curses usr/share/doc/weechat-common usr/share/doc/weechat-curses
-	dh_installmenu -pweechat-curses
-	dh_strip -a -pweechat-curses -pweechat-plugins --exclude=libperl.a
-	dh_compress -a -pweechat-curses -p weechat-plugins
-	dh_fixperms -a -pweechat-curses -pweechat-plugins
-	dh_installdeb -a -pweechat-curses -pweechat-plugins
-	dh_shlibdeps -a -pweechat-curses -pweechat-plugins
-	dh_gencontrol -a -pweechat-curses -pweechat-plugins
-	dh_md5sums -a -pweechat-curses -pweechat-plugins
-	dh_builddeb -a -pweechat-curses -pweechat-plugins
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/weechat-common.install b/debian/weechat-common.install
index e66ba4c0f..ff64c3313 100644
--- a/debian/weechat-common.install
+++ b/debian/weechat-common.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/locale/
-debian/tmp/usr/share/doc/weechat/html usr/share/doc/weechat-common
+usr/share/locale/
+usr/share/doc/weechat/html usr/share/doc/weechat-common
diff --git a/debian/weechat-curses.install b/debian/weechat-curses.install
index 3814cea07..49b48af9b 100644
--- a/debian/weechat-curses.install
+++ b/debian/weechat-curses.install
@@ -1 +1 @@
-debian/tmp/usr/bin/weechat-curses
+usr/bin/weechat-curses
diff --git a/debian/weechat-plugins.install b/debian/weechat-plugins.install
index 77a5a592a..663f121d2 100644
--- a/debian/weechat-plugins.install
+++ b/debian/weechat-plugins.install
@@ -1 +1 @@
-debian/tmp/usr/lib/
+usr/lib/weechat/plugins/*so*
diff --git a/weechat/debian/changelog b/weechat/debian/changelog
index 842481032..49e7fc584 100644
--- a/weechat/debian/changelog
+++ b/weechat/debian/changelog
@@ -1,3 +1,13 @@
+weechat (0.1.8-2) unstable; urgency=low
+
+  * Switch to cdbs
+  * update debhelper compatibility to 5
+  * update Build-Depends
+  * update debian/copyright
+  * Bump Standards-Version, no changes needed
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 21 Apr 2006 22:39:00 +0200
+
 weechat (0.1.8-1) unstable; urgency=low
 
   * New upstream release
diff --git a/weechat/debian/compat b/weechat/debian/compat
index b8626c4cf..7ed6ff82d 100644
--- a/weechat/debian/compat
+++ b/weechat/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/weechat/debian/control b/weechat/debian/control
index 4ff11022d..78e3b2978 100644
--- a/weechat/debian/control
+++ b/weechat/debian/control
@@ -3,8 +3,8 @@ Section: net
 Priority: optional
 Maintainer: Sebastien Helleu <flashcode@flashtux.org>
 Uploaders: Julien Louis <ptitlouis@sysif.net>
-Build-Depends: debhelper (>> 4.0.0), libncursesw5-dev, ruby, ruby1.8-dev, libperl-dev, python-dev, liblualib50-dev, libgnutls-dev, libtool, xsltproc, docbook-xsl, docbook-xml
-Standards-Version: 3.6.2
+Build-Depends: cdbs, debhelper (>= 5), libncursesw5-dev, ruby, ruby1.8-dev, libperl-dev, python-dev, liblualib50-dev, libgnutls-dev, libtool, xsltproc, docbook-xsl, docbook-xml
+Standards-Version: 3.7.2
 
 Package: weechat
 Architecture: all
diff --git a/weechat/debian/copyright b/weechat/debian/copyright
index 72157e3a0..333e3eae9 100644
--- a/weechat/debian/copyright
+++ b/weechat/debian/copyright
@@ -3,7 +3,9 @@ Sat, 21 May 2005 08:00:00 +0200.
 
 It was downloaded from http://weechat.flashtux.org/download
 
-Upstream Author: FlashCode <flashcode@flashtux.org>
+Upstream Authors:
+ - FlashCode <flashcode@flashtux.org>
+ - kolter <kolter@free.fr>
 
 Copyright:
 
diff --git a/weechat/debian/rules b/weechat/debian/rules
index 575fc4c0e..d5520ac22 100755
--- a/weechat/debian/rules
+++ b/weechat/debian/rules
@@ -1,90 +1,34 @@
 #!/usr/bin/make -f
+# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
+# This file is public domain.
 
-#export DH_VERBOSE=1
+DEB_AUTO_CLEANUP_RCS            := yes
+
+# Add here any variable or target overrides you need
+
+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
 
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
-LDFLAGS +=-lpthread
+ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lpthread"
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	LDFLAGS=$(LDFLAGS) ./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info --with-debug=0
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install
-#	install -o root -g root -m 755 src/gui/curses/weechat-curses $(CURDIR)/debian/weechat-curses/usr/bin
-	# install -o root -g root -m 755 src/gui/gtk/weechat-gtk $(CURDIR)/debian/weechat-gtk/usr/bin
+install/weechat-common::
 	install -D -o root -g root -m 644 weechat_icon_32.png $(CURDIR)/debian/weechat-common/usr/share/pixmaps/weechat_icon_32.png
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -pweechat-common -pweechat
-	dh_testroot -pweechat-common -pweechat
-	dh_installchangelogs ChangeLog -pweechat-common
-	dh_installdocs -pweechat-common
-	dh_installinfo -pweechat-common
-	dh_installexamples -pweechat-common
-	dh_compress -pweechat-common -pweechat
-	dh_link -pweechat usr/share/doc/weechat-common usr/share/doc/weechat
-	dh_fixperms -pweechat-common -pweechat
-	dh_installdeb -pweechat-common -pweechat
-	dh_shlibdeps -pweechat-common -pweechat
-	dh_gencontrol -pweechat-common -pweechat
-	dh_md5sums -pweechat-common -pweechat
-	dh_builddeb -pweechat-common -pweechat
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a -pweechat-curses -pweechat-plugins
-	dh_testroot -a -pweechat-curses -pweechat-plugins
-	dh_installchangelogs ChangeLog -pweechat-plugins
-	dh_installdocs -pweechat-plugins
-	dh_installman doc/weechat-curses.1 -pweechat-curses
-	dh_link -pweechat-curses usr/share/doc/weechat-common usr/share/doc/weechat-curses
-	dh_installmenu -pweechat-curses
-	dh_strip -a -pweechat-curses -pweechat-plugins --exclude=libperl.a
-	dh_compress -a -pweechat-curses -p weechat-plugins
-	dh_fixperms -a -pweechat-curses -pweechat-plugins
-	dh_installdeb -a -pweechat-curses -pweechat-plugins
-	dh_shlibdeps -a -pweechat-curses -pweechat-plugins
-	dh_gencontrol -a -pweechat-curses -pweechat-plugins
-	dh_md5sums -a -pweechat-curses -pweechat-plugins
-	dh_builddeb -a -pweechat-curses -pweechat-plugins
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/weechat/debian/weechat-common.install b/weechat/debian/weechat-common.install
index e66ba4c0f..ff64c3313 100644
--- a/weechat/debian/weechat-common.install
+++ b/weechat/debian/weechat-common.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/locale/
-debian/tmp/usr/share/doc/weechat/html usr/share/doc/weechat-common
+usr/share/locale/
+usr/share/doc/weechat/html usr/share/doc/weechat-common
diff --git a/weechat/debian/weechat-curses.install b/weechat/debian/weechat-curses.install
index 3814cea07..49b48af9b 100644
--- a/weechat/debian/weechat-curses.install
+++ b/weechat/debian/weechat-curses.install
@@ -1 +1 @@
-debian/tmp/usr/bin/weechat-curses
+usr/bin/weechat-curses
diff --git a/weechat/debian/weechat-plugins.install b/weechat/debian/weechat-plugins.install
index 77a5a592a..663f121d2 100644
--- a/weechat/debian/weechat-plugins.install
+++ b/weechat/debian/weechat-plugins.install
@@ -1 +1 @@
-debian/tmp/usr/lib/
+usr/lib/weechat/plugins/*so*