changeset e1b188df31b3 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e1b188df31b3
description: update debian folder with current debian package
diffstat:
debian/changelog | 22 +++++++++++++++++-----
debian/control | 9 +++------
debian/copyright | 3 +--
debian/dirs | 8 --------
debian/rules | 28 +++++++++++++++-------------
5 files changed, 36 insertions(+), 34 deletions(-)
diffs (123 lines):
diff -r 994d7a0f50f7 -r e1b188df31b3 debian/changelog
--- a/debian/changelog Fri May 20 13:21:47 2011 +0200
+++ b/debian/changelog Fri May 20 17:02:42 2011 +0200
@@ -1,14 +1,26 @@
-gajim (0.14-1) unstable; urgency=low
+gajim (0.14.1-1) unstable; urgency=low
- * New upstream release.
+ [ Yann Leboulanger ]
+ * New upstream release. Closes: #604966
* Correctly sanitize menuentries in chat window action context menu.
Closes: #574839
* Fix traceback when closing file request dialog. Closes: #587186
- * Recommand python-openssl >= 0.9. Closes: #594772
+ * Recommend python-openssl >= 0.9. Closes: #594772
* Improve a string. Closes: #553527
- * Fix canceling file transfer. Closes: #587679
+ * Fix cancelling file transfer. Closes: #587679
- -- Yann Leboulanger <[email protected]> Thu, 02 Sep 2010 19:25:26 +0200
+ [ Julien Valroff ]
+ * Switch to dh from CDBS and drop unused (build-)dependencies.
+ * Switch to dh_python2 from pysupport. Closes: #616819
+ * Drop useless debian/dirs.
+ * Switch to 3.0 (quilt) source format.
+ * Update Standards-Version to 3.9.2.
+ * Remove useless and unused shlibs:Depends substvar.
+ * Add a note about python-farsight in README.Debian.
+ * Add patch and use dh_autoreconf to remove build-dependencies on
+ python-dev, python-gtk2-dev and libgtk2.0-dev.
+
+ -- Yann Leboulanger <[email protected]> Sat, 07 May 2011 16:01:37 +0200
gajim (0.13.4-1) unstable; urgency=low
diff -r 994d7a0f50f7 -r e1b188df31b3 debian/control
--- a/debian/control Fri May 20 13:21:47 2011 +0200
+++ b/debian/control Fri May 20 17:02:42 2011 +0200
@@ -2,18 +2,15 @@
Section: net
Priority: optional
Maintainer: Yann Leboulanger <[email protected]>
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.43), python-support (>= 0.7.1),
python-dev, libgtk2.0-dev, python-gtk2-dev, gettext (>= 0.17-4), intltool (>=
0.40.1), imagemagick
-Build-Conflicts: python2.3
-XS-Python-Version: >= 2.5
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), dh-autoreconf,
gettext (>= 0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev
+Standards-Version: 3.9.2
Homepage: http://www.gajim.org
Vcs-Hg: http://hg.gajim.org/gajim/
Vcs-Browser: http://hg.gajim.org/gajim/file
Package: gajim
Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support
(>= 0.7.1), python-glade2 (>= 2.12.0), python-gtk2 (>= 2.12.0), dnsutils
+Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils
Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface,
python-openssl (>= 0.9), python-crypto
Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon,
python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring,
gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base,
dvipng, python-farsight, gstreamer0.10-plugins-ugly
Description: Jabber client written in PyGTK
diff -r 994d7a0f50f7 -r e1b188df31b3 debian/copyright
--- a/debian/copyright Fri May 20 13:21:47 2011 +0200
+++ b/debian/copyright Fri May 20 17:02:42 2011 +0200
@@ -7,10 +7,9 @@
Upstream Authors:
- Alexander Cherniuk <[email protected]>
- Yann Le Boulanger <[email protected]>
- - Jonathan Schleifer <[email protected]>
-Copyright: (c) 2003-2010 Gajim Team
+Copyright: (c) 2003-2011 Gajim Team
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
diff -r 994d7a0f50f7 -r e1b188df31b3 debian/dirs
--- a/debian/dirs Fri May 20 13:21:47 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-usr/bin
-usr/share/gajim
-usr/share/man/man1
-usr/share/pixmaps
-usr/share/applications
-usr/share/menu
-usr/share/lintian/overrides
-usr/lib/gajim
diff -r 994d7a0f50f7 -r e1b188df31b3 debian/rules
--- a/debian/rules Fri May 20 13:21:47 2011 +0200
+++ b/debian/rules Fri May 20 17:02:42 2011 +0200
@@ -1,17 +1,19 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
-# Debhelper must be included before python-distutils to use
-# # # dh_python / dh_pycentral / dh_pysupport
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+ dh $@ --with python2,autoreconf
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr
-DEB_MAKE_BUILD_TARGET := all
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
+# test target is broken
+override_dh_auto_test:
-binary-install/gajim::
- rm $(DEB_DESTDIR)/usr/share/gajim/src/common/GnuPGInterface.py*
- dh_pysupport -pgajim
- convert $(DEB_DESTDIR)/usr/share/icons/hicolor/64x64/apps/gajim.png
-resize 32x32 $(DEB_DESTDIR)/usr/share/pixmaps/gajim.xpm
+override_dh_auto_configure:
+ convert icons/hicolor/64x64/apps/gajim.png -resize 32x32
debian/gajim.xpm
+ dh_auto_configure
+
+override_dh_auto_install:
+ dh_auto_install
+ rm debian/gajim/usr/share/gajim/src/common/GnuPGInterface.py*
+
+override_dh_auto_clean:
+ -rm -f debian/gajim.xpm
+ dh_auto_clean
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
