diff --git a/debian/changelog b/debian/changelog
index 04a9de027..b4c7c23ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,119 +1,6 @@
gajim (0.7.1-1) unstable; urgency=low
- * Transports icon as an option and error/mesage icon for transports
- * Gajim is more HIG compatible
- * Editing registration information on transports
- * Messages stanza without
element are not printed
- * SASL bugfix
- * GtkSpell capabilities
- * Support SSL (legacy) connection
- * Assign gpg key to specific contact
- * Contacts are sortable by status
- * Gajim remembers last lines when reopening chat
- * New translations available: German, Russian, Spanish, Bulgarian
+ * Initial Release. Closes: #311215
+ * GnuPGInterface module is in debian, no need to keep it in sources.
- -- Yann Le Boulanger Sat, 4 Jun 2005 17:24:05 +0200
-
-gajim (0.7-1) unstable; urgency=low
-
- * Ability for groupchat reserved rooms with full affiliations and roles support
- * Popup notification for incoming events
- * Protocol icons for contacts from transports
- * Gajim's user interface is now more HIG compliant
- * Gajim now detects and can send operating system information
- * Gajim can now inform the user about new version availability
- * Gajim jabber library migration from jabberpy to xmpppy
- * Rewrite of the plugin system to remove threads and improve latency
- * Gajim now supports Nodes in Service Discovery
-
- -- Yann Le Boulanger Mon, 23 May 2005 10:28:40 +0200
-
-gajim (0.6.1-1) unstable; urgency=low
-
- * Rewrite of service discovery. It doesn't freeze Gajim anymore.
- * More HIG Compliant.
- * Gajim is faster (do not redraw preferences_window each time we open it, use of psyco if available)
-
- -- Yann Le Boulanger Sun, 3 Apr 2005 12:32:49 +0200
-
-gajim (0.6-1) unstable; urgency=low
-
- * GUI improvements
- * Groupchat improvements
- * URL, mailto and ascii formation (* / _) detection
- * Better transports detection
- * Better group management
- * Many bugfixes
-
- -- Yann Le Boulanger Tue, 22 Mar 2005 18:56:18 +0100
-
-gajim (0.5.1-1) unstable; urgency=low
-
- * bugfixs
- * GUI improvements
-
- -- Yann Le Boulanger Sun, 27 Feb 2005 11:34:08 +0100
-
-gajim (0.5) unstable; urgency=low
-
- * tabbed chat window
- * GUI improvements
- * new add contact window
- * sound support (linux only)
- * idle module available for windows 2k/XP
-
- -- Yann Le Boulanger Sat, 26 Feb 2005 15:07:25 +0100
-
-gajim (0.4.1) unstable; urgency=low
-
- * new option parser that support ; and # in option's value
- * bugfix with GPG signatures
-
- -- Yann Le Boulanger Sun, 23 Jan 2005 19:19:03 +0100
-
-gajim (0.4) unstable; urgency=low
-
- * GUI improvements
- * new option : regroup accounts
- * emoticons support with a binder
- * bugfixes
-
- -- Yann Le Boulanger Fri, 21 Jan 2005 08:59:31 +0100
-
-gajim (0.3) unstable; urgency=low
-
- * GUI improvements
- * group chat support with MUC (JEP 45)
- * New agent browser (JEP 30)
- * GnuPG support
- * Autoconnect at startup
- * New socket plugin
-
- -- Yann Le Boulanger Sat, 18 Dec 2004 14:52:07 +0100
-
-gajim (0.2.1) unstable; urgency=low
-
- * bugfixes : when configfile is incomplete
- * icon in systray with popup menu (for linux)
- * "auto away even if not online" option
- * always show contacts with unread messages
- * new imageCellRenderer to show animated gifs
- * allow agents unregistration
-
- -- Yann Le Boulanger Thu, 1 Jul 2004 23:45:02 +0200
-
-gajim (0.2) unstable; urgency=low
-
- * bugfix for french translation
- * multi-resource support
- * auto away support (for linux)
- * invisible support
- * priority support
-
- -- Yann Le Boulanger Tue, 8 Jun 2004 04:52:36 +0200
-
-gajim (0.1) unstable; urgency=low
-
- * Initial release.
-
- -- Yann Le Boulanger Fri, 21 May 2004 18:15:28 -0400
+ -- Yann Le Boulanger Wed, 15 Jun 2005 23:22:19 +0200
diff --git a/debian/control b/debian/control
index 58299956e..73f445ee8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Section: net
Priority: optional
Maintainer: Yann Le Boulanger
Standards-Version: 3.6.1.1
-Build-Depends: debmake, python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev
+Build-Depends: debmake, python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext
Package: gajim
Architecture: any
Section: net
Priority: optional
Depends: python (>= 2.3), python-glade2 (>= 2.4.0), python-gtk2 (>= 2.4.0)
+Suggests: python-gnupginterface
Description: Jabber client written in PyGTK
Gajim is a jabber client written in python, with a GTK frontend.
diff --git a/debian/copyright b/debian/copyright
index 60e2f7a82..fa1627ebd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
This package was debianized by Yann L.B. asterix@lagaule.org on
-Fri, 21 May 2004 18:15:28 -0400.
+Wed, 16 Jun 2005 20:00:00 +0100.
-Gajim Team:
+Upstream Authors:
- Yann Le Boulanger
- Vincent Hanquez
- Nikos Kouremenos
diff --git a/debian/dirs b/debian/dirs
index 36d70ee22..cee31ca42 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -3,5 +3,5 @@ usr/share/gajim
usr/share/man/man1
usr/share/pixmaps
usr/share/applications
-usr/lib/menu
+usr/share/menu
usr/lib/gajim
diff --git a/debian/menu b/debian/menu
index 1a0ed102c..f1efc22e2 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,7 +2,7 @@
needs="X11" \
section="Apps/Net" \
command="/usr/bin/gajim" \
- icon="/usr/share/pixmaps/gajim.png" \
+ icon="/usr/share/pixmaps/gajim.xpm" \
title="Gajim" \
longtitle="Gajim: GTK Jabber Client" \
description="GTK Jabber Client."
diff --git a/debian/rules b/debian/rules
index f8057d9c6..0cd18c650 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,17 +25,13 @@ install-stamp: build-stamp
install -d debian/tmp
cd debian/tmp && install -d `cat ../dirs`
make install PREFIX=/usr DESTDIR=`pwd`/debian/tmp
+ rm debian/tmp/usr/share/gajim/src/common/GnuPGInterface.py
binary-indep: checkroot build
$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package. If there were any they would be
-# made here.
binary-arch: checkroot build install
$(checkdir)
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
debstd
dpkg-gencontrol -isp
chown -R root:root debian/tmp