update debian folder from 0.14 branch

4 files changed, 59 insertions, 22 deletions

diff --git a/debian/patches/00_debian-copying.diff b/debian/patches/00_debian-copying.diff
new file mode 100644
index 000000000..6c9cc7700
--- /dev/null
+++ b/debian/patches/00_debian-copying.diff
@@ -0,0 +1,23 @@
+Description: don't install useless COPYING file
+Forwarded: not-neded
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,7 +8,6 @@
+ docfiles_DATA = README \
+ 				README.html \
+ 				ChangeLog \
+-				COPYING \
+ 				THANKS \
+ 				THANKS.artists \
+ 				AUTHORS 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -299,7 +299,6 @@
+ docfiles_DATA = README \
+ 				README.html \
+ 				ChangeLog \
+-				COPYING \
+ 				THANKS \
+ 				THANKS.artists \
+ 				AUTHORS 
diff --git a/debian/patches/00_debian-copying.patch b/debian/patches/00_debian-copying.patch
deleted file mode 100644
index 85797fe57..000000000
--- a/debian/patches/00_debian-copying.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 7202)
-+++ Makefile.am	(working copy)
-@@ -9,7 +9,6 @@
- docfiles_DATA = README \
- 				README.html \
- 				ChangeLog \
--				COPYING \
- 				THANKS \
- 				AUTHORS 
- 
---- Makefile.in
-+++ Makefile.in
-@@ -273,7 +273,6 @@
- docfiles_DATA = README \
- 				README.html \
- 				ChangeLog \
--				COPYING \
- 				THANKS \
- 				AUTHORS 
- 
diff --git a/debian/patches/01_configure-ac.diff b/debian/patches/01_configure-ac.diff
new file mode 100644
index 000000000..cae1e2368
--- /dev/null
+++ b/debian/patches/01_configure-ac.diff
@@ -0,0 +1,34 @@
+Description: don't require python headers to remove build-dep on python-dev and python-gtk2-dev
+Author: Yann Leboulanger <asterix@lagaule.org>
+Origin: upstream,http://hg.gajim.org/gajim/diff/252bb3cf2c59/configure.ac
+Last-Update: 2011-05-07
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,25 +36,10 @@
+ AM_NLS
+ 
+ 
+-dnl ****
+-dnl pygtk and gtk+
+-dnl ****
+-PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0])
+-AC_SUBST(PYGTK_CFLAGS)
+-AC_SUBST(PYGTK_LIBS)
+-PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+-AC_SUBST(PYGTK_DEFS)
+-
+-AM_PATH_PYTHON([2.5])
+-if test "x$PYTHON" = "x:"; then
+-	AC_MSG_ERROR([Python not found])
+-fi
+-
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+ AC_SUBST(ACLOCAL_AMFLAGS)
+ 
+-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+-AC_SUBST([PYTHON_INCLUDES])
++AM_PATH_PYTHON([2.5])
+ 
+ dnl ****
+ dnl enable installation in python-2.x/site-packages/gajim
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..789adce6e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+00_debian-copying.diff
+01_configure-ac.diff