[Pkg-privacy-commits] [libotr] 183/225: Migrate back to source format 3.0 (quilt), as per new team policy.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit 0bb2f4df9787f1b21b1eeebcd6ffffd0d240ec36
Author: intrigeri <intrigeri at boum.org>
Date:   Fri Mar 14 11:22:37 2014 +0000

    Migrate back to source format 3.0 (quilt), as per new team policy.
    
    This reverts commits:
    
      28384b6d25308078f38b8d5e49b5911f6ddd0d51
      3a709e03b8060172e0f526b001bf8f949a3b19fa
      7ff45ba26f1efea63d254090b0b1db21ec08fe63
      1e8ea4cae23b87128a5cdb3614dd0b55282e58e5
---
 debian/patches/message_fragment_fix.patch | 16 ++++++++++++++++
 debian/patches/series                     |  1 +
 debian/source/format                      |  2 +-
 debian/source/lintian-overrides           |  2 --
 src/message.c                             |  2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/patches/message_fragment_fix.patch b/debian/patches/message_fragment_fix.patch
new file mode 100644
index 0000000..554e335
--- /dev/null
+++ b/debian/patches/message_fragment_fix.patch
@@ -0,0 +1,16 @@
+Pass opdata when sending message fragment
+
+The inject_message callback was missing the opdata when sending message
+fragments.
+
+--- a/src/message.c
++++ b/src/message.c
+@@ -441,7 +441,7 @@ fragment:
+ 	/* Fragment and send according to policy */
+ 	if (!err && messagep && *messagep) {
+ 	    if (context) {
+-		err = fragment_and_send(ops, NULL, context, *messagep,
++		err = fragment_and_send(ops, opdata, context, *messagep,
+ 			fragPolicy, messagep);
+ 	    }
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0f5a01c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+message_fragment_fix.patch
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index dc093d2..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Debian OTR Team is using source format 1.0. The detail of patches is in Git and debian/changelog.
-libotr source: direct-changes-in-diff-but-no-patch-system
diff --git a/src/message.c b/src/message.c
index aa71df2..7c39529 100644
--- a/src/message.c
+++ b/src/message.c
@@ -441,7 +441,7 @@ fragment:
 	/* Fragment and send according to policy */
 	if (!err && messagep && *messagep) {
 	    if (context) {
-		err = fragment_and_send(ops, opdata, context, *messagep,
+		err = fragment_and_send(ops, NULL, context, *messagep,
 			fragPolicy, messagep);
 	    }
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git