changeset a87d2bdfb654 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a87d2bdfb654 description: updade debian/patches folder
diffstat: debian/patches/00_debian-copying.diff | 21 +++++++++++++++++++++ debian/patches/00_debian-copying.patch | 20 -------------------- debian/patches/01_configure-ac.diff | 33 +++++++++++++++++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 56 insertions(+), 20 deletions(-) diffs (97 lines): diff -r e1b188df31b3 -r a87d2bdfb654 debian/patches/00_debian-copying.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/patches/00_debian-copying.diff Fri May 20 17:04:25 2011 +0200 @@ -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 -r e1b188df31b3 -r a87d2bdfb654 debian/patches/00_debian-copying.patch --- a/debian/patches/00_debian-copying.patch Fri May 20 17:02:42 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -r e1b188df31b3 -r a87d2bdfb654 debian/patches/01_configure-ac.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/patches/01_configure-ac.diff Fri May 20 17:04:25 2011 +0200 @@ -0,0 +1,34 @@ +Description: don't require python headers to remove build-dep on python-dev and python-gtk2-dev +Author: Yann Leboulanger <[email protected]> +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 -r e1b188df31b3 -r a87d2bdfb654 debian/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/patches/series Fri May 20 17:04:25 2011 +0200 @@ -0,0 +1,2 @@ +00_debian-copying.diff +01_configure-ac.diff _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
