Update debian packaging

12 files changed, 56 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index dc5273776..543912367 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = config.rpath BUGS FAQ FAQ.fr \
              debian/rules debian/weechat-common.docs \
              debian/weechat-common.install debian/weechat-curses.dirs \
              debian/weechat-curses.install \
+				 debian/weechat-curses.menu debian/NEWS \
              weechat.spec weechat_icon_32.png
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000000000..72a31944d
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,6 @@
+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.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 20:45:46 +0100
diff --git a/debian/changelog b/debian/changelog
index ca9d45426..60098495b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+weechat (0.1.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Add menu entry
+  * Move libperl5.8 and python2.3 from Depends to Recommends
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 22:21:08 +0100
+
 weechat (0.1.5-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 04e479f7a..b5e899e6c 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Description: Fast, light and extensible IRC client
 Package: weechat-curses
 Architecture: any
 Depends: ${shlibs:Depends}, weechat-common (= ${Source-Version})
+Recommends: ${shlibs:Recommends}
 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.
diff --git a/debian/rules b/debian/rules
index 15832c446..e2b5ccad0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ install: build
 	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 -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.
@@ -69,11 +70,17 @@ binary-arch: build install
 	# dh_installdocs -a
 	dh_installman doc/weechat-curses.1 -pweechat-curses
 	dh_link -a usr/share/doc/weechat-common usr/share/doc/weechat-curses
+	dh_installmenu -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
-	dh_shlibdeps -a
+	#dh_shlibdeps -a
+	#dpkg-shlibdeps -Tdebian/weechat-curses.substvars -dDepends debian/weechat-curses/usr/bin/weechat-curses \
+	      -dRecommends `find $(PKGDIR)/usr/lib/weechat -type f -name "*.so"`
+	dh_shlibdeps -a -l debian/weechat-curses/usr/lib -- -dDepends \
+		debian/weechat-curses/usr/bin/weechat-curses -dRecommends \
+		`find debian/weechat-curses/usr/lib/ -type f -name "*.so"`
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
diff --git a/debian/weechat-curses.menu b/debian/weechat-curses.menu
new file mode 100644
index 000000000..1fcd5e5ae
--- /dev/null
+++ b/debian/weechat-curses.menu
@@ -0,0 +1,4 @@
+?package(weechat-curses):needs="text" section="Apps/Net" \
+		title="weechat-curses" \
+		icon="/usr/share/pixmaps/weechat_icon_32.png" \
+		command="/usr/bin/weechat-curses"
diff --git a/weechat/Makefile.am b/weechat/Makefile.am
index dc5273776..543912367 100644
--- a/weechat/Makefile.am
+++ b/weechat/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = config.rpath BUGS FAQ FAQ.fr \
              debian/rules debian/weechat-common.docs \
              debian/weechat-common.install debian/weechat-curses.dirs \
              debian/weechat-curses.install \
+				 debian/weechat-curses.menu debian/NEWS \
              weechat.spec weechat_icon_32.png
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/weechat/debian/NEWS b/weechat/debian/NEWS
new file mode 100644
index 000000000..72a31944d
--- /dev/null
+++ b/weechat/debian/NEWS
@@ -0,0 +1,6 @@
+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.
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 20:45:46 +0100
diff --git a/weechat/debian/changelog b/weechat/debian/changelog
index ca9d45426..60098495b 100644
--- a/weechat/debian/changelog
+++ b/weechat/debian/changelog
@@ -1,3 +1,11 @@
+weechat (0.1.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Add menu entry
+  * Move libperl5.8 and python2.3 from Depends to Recommends
+
+ -- Julien Louis <ptitlouis@sysif.net>  Fri, 11 Nov 2005 22:21:08 +0100
+
 weechat (0.1.5-1) unstable; urgency=low
 
   * New upstream release
diff --git a/weechat/debian/control b/weechat/debian/control
index 04e479f7a..b5e899e6c 100644
--- a/weechat/debian/control
+++ b/weechat/debian/control
@@ -26,6 +26,7 @@ Description: Fast, light and extensible IRC client
 Package: weechat-curses
 Architecture: any
 Depends: ${shlibs:Depends}, weechat-common (= ${Source-Version})
+Recommends: ${shlibs:Recommends}
 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.
diff --git a/weechat/debian/rules b/weechat/debian/rules
index 15832c446..e2b5ccad0 100755
--- a/weechat/debian/rules
+++ b/weechat/debian/rules
@@ -42,6 +42,7 @@ install: build
 	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 -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.
@@ -69,11 +70,17 @@ binary-arch: build install
 	# dh_installdocs -a
 	dh_installman doc/weechat-curses.1 -pweechat-curses
 	dh_link -a usr/share/doc/weechat-common usr/share/doc/weechat-curses
+	dh_installmenu -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
-	dh_shlibdeps -a
+	#dh_shlibdeps -a
+	#dpkg-shlibdeps -Tdebian/weechat-curses.substvars -dDepends debian/weechat-curses/usr/bin/weechat-curses \
+	      -dRecommends `find $(PKGDIR)/usr/lib/weechat -type f -name "*.so"`
+	dh_shlibdeps -a -l debian/weechat-curses/usr/lib -- -dDepends \
+		debian/weechat-curses/usr/bin/weechat-curses -dRecommends \
+		`find debian/weechat-curses/usr/lib/ -type f -name "*.so"`
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
diff --git a/weechat/debian/weechat-curses.menu b/weechat/debian/weechat-curses.menu
new file mode 100644
index 000000000..1fcd5e5ae
--- /dev/null
+++ b/weechat/debian/weechat-curses.menu
@@ -0,0 +1,4 @@
+?package(weechat-curses):needs="text" section="Apps/Net" \
+		title="weechat-curses" \
+		icon="/usr/share/pixmaps/weechat_icon_32.png" \
+		command="/usr/bin/weechat-curses"