Package: pidgin-sipe Version: 1.9.0-1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for pidgin-sipe (versioned as 1.9.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Miguel Angel Ruiz Manzano http://mruiz.openminds.cl Computer Engineer - PUCV - Chile Linux User #323437 PGP key 1024D/0D3FD8A9 2005-06-03
diff -u pidgin-sipe-1.9.0/debian/changelog pidgin-sipe-1.9.0/debian/changelog --- pidgin-sipe-1.9.0/debian/changelog +++ pidgin-sipe-1.9.0/debian/changelog @@ -1,3 +1,20 @@ +pidgin-sipe (1.9.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules + + Added quilt support. + * debian/control + + Added quilt as dependency. + * debian/README.source + + Added according to Debian Policy Manual section 4.14. + * debian/patches + + Patches taken from Ubuntu. + - 01_fix_build.diff - Fixes FTBFS. (Closes: #582998) + - 02_fix_kerberos.diff - Fixes Kerberos error. (Closes: #597437) + - Thanks to Onkar Shinde. + + -- Miguel Ruiz <debiani...@gmail.com> Mon, 04 Oct 2010 23:34:54 -0400 + pidgin-sipe (1.9.0-1) unstable; urgency=low * New upstream version (Closes: #570735) diff -u pidgin-sipe-1.9.0/debian/rules pidgin-sipe-1.9.0/debian/rules --- pidgin-sipe-1.9.0/debian/rules +++ pidgin-sipe-1.9.0/debian/rules @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_EXTRA_FLAGS := --with-purple --without-telepathy --with-krb5=yes # Don't run unnecessary ldconfig on postinst and postrm. diff -u pidgin-sipe-1.9.0/debian/control pidgin-sipe-1.9.0/debian/control --- pidgin-sipe-1.9.0/debian/control +++ pidgin-sipe-1.9.0/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Anibal Avelar <aave...@cofradia.org> Homepage: http://sipe.sourceforge.net/ -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev, pidgin-dev, libpurple-dev (>= 2.4.0), libtool, intltool, libkrb5-dev, libzephyr-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev, pidgin-dev, libpurple-dev (>= 2.4.0), libtool, intltool, libkrb5-dev, libzephyr-dev, quilt Standards-Version: 3.8.4 Package: pidgin-sipe only in patch2: unchanged: --- pidgin-sipe-1.9.0.orig/debian/README.source +++ pidgin-sipe-1.9.0/debian/README.source @@ -0,0 +1,48 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new <patch> + +where <patch> is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add <file> + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P <patch> /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). <patch> as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete <patch> + +You may need to run quilt pop -a to unapply patches first before running +this command. + only in patch2: unchanged: --- pidgin-sipe-1.9.0.orig/debian/patches/01_fix_build.diff +++ pidgin-sipe-1.9.0/debian/patches/01_fix_build.diff @@ -0,0 +1,14 @@ +--- a/src/core/sipe.c ++++ b/src/core/sipe.c +@@ -10045,6 +10045,11 @@ + #if PURPLE_VERSION_CHECK(2,6,0) + NULL, /* initiate_media */ + NULL, /* get_media_caps */ ++#if PURPLE_VERSION_CHECK(2,7,0) ++ NULL, /* get_moods */ ++ NULL, /* initiate_media */ ++ NULL, /* get_media_caps */ ++#endif + #endif + #endif + }; only in patch2: unchanged: --- pidgin-sipe-1.9.0.orig/debian/patches/02_fix_kerberos.diff +++ pidgin-sipe-1.9.0/debian/patches/02_fix_kerberos.diff @@ -0,0 +1,25 @@ +--- a/src/core/sip-sec.c ++++ b/src/core/sip-sec.c +@@ -21,6 +21,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <glib.h> + #include <stdlib.h> + #include <string.h> +@@ -177,7 +181,10 @@ + domain, + username, + password); +- if (!*context) return NULL; ++ if (!*context) { ++ purple_debug_info("sipe", "ERROR: sip_sec_init_context: failed sip_sec_create_context()\n"); ++ return NULL; ++ } + + ret = sip_sec_init_context_step(*context, + target, only in patch2: unchanged: --- pidgin-sipe-1.9.0.orig/debian/patches/series +++ pidgin-sipe-1.9.0/debian/patches/series @@ -0,0 +1,2 @@ +02_fix_kerberos.diff +01_fix_build.diff
