[xml-security-c] 02/05: Convert to gbp pq patch management

[Russ Allbery]

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

rra pushed a commit to branch master
in repository xml-security-c.

commit 2b8a7136a2b1b51ac46df6dcafab74c72204d379
Author: Russ Allbery <rra at debian.org>
Date:   Mon Apr 7 16:55:51 2014 -0700

    Convert to gbp pq patch management
    
    Rather than commit changes directly, maintain all changes from
    upstream as separate patches managed with gbp pq.  This will make
    feeding patches upstream easier.
---
 debian/changelog                                   |  6 ++
 .../0001-Add-xsec-prefix-to-utilities.patch        | 75 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 82 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 78dbd85..181b15b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xml-security-c (1.7.2-3) UNRELEASED; urgency=medium
+
+  * Convert all Debian patches to separate patch files managed via gbp pq.
+
+ -- Russ Allbery <rra at debian.org>  Mon, 07 Apr 2014 16:56:34 -0700
+
 xml-security-c (1.7.2-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/0001-Add-xsec-prefix-to-utilities.patch b/debian/patches/0001-Add-xsec-prefix-to-utilities.patch
new file mode 100644
index 0000000..7c09f79
--- /dev/null
+++ b/debian/patches/0001-Add-xsec-prefix-to-utilities.patch
@@ -0,0 +1,75 @@
+From: Russ Allbery <rra at debian.org>
+Date: Mon, 7 Apr 2014 16:43:45 -0700
+Subject: Add xsec prefix to utilities
+
+Many of the utilities that come with the package have very
+generic names.  Add xsec- to the beginning of all of the binary
+names to avoid colliding with other packages or claiming too
+generic of a namespace.
+---
+ xsec/Makefile.am | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/xsec/Makefile.am b/xsec/Makefile.am
+index 7c48495..850ce94 100644
+--- a/xsec/Makefile.am
++++ b/xsec/Makefile.am
+@@ -69,42 +69,42 @@ tools =
+ 
+ # xtest
+ 
+-tools += xtest
+-xtest_SOURCES = \
++tools += xsec-xtest
++xsec_xtest_SOURCES = \
+   tools/xtest/xtest.cpp
+ 
+-tools += c14n
+-c14n_SOURCES = \
++tools += xsec-c14n
++xsec_c14n_SOURCES = \
+   tools/c14n/c14n.cpp
+ 
+-tools += checksig
+-checksig_SOURCES = \
++tools += xsec-checksig
++xsec_checksig_SOURCES = \
+   tools/checksig/checksig.cpp \
+   tools/checksig/AnonymousResolver.hpp \
+   tools/checksig/AnonymousResolver.cpp \
+   tools/checksig/InteropResolver.hpp \
+   tools/checksig/InteropResolver.cpp
+ 
+-tools += templatesign
+-templatesign_SOURCES = \
++tools += xsec-templatesign
++xsec_templatesign_SOURCES = \
+   tools/templatesign/templatesign.cpp
+ 
+-tools += txfmout
+-txfmout_SOURCES = \
++tools += xsec-txfmout
++xsec_txfmout_SOURCES = \
+   tools/txfmout/txfmout.cpp
+ 
+-tools += siginf
+-siginf_SOURCES = \
++tools += xsec-siginf
++xsec_siginf_SOURCES = \
+   tools/siginf/siginf.cpp
+ 
+-tools += cipher
+-cipher_SOURCES = \
++tools += xsec-cipher
++xsec_cipher_SOURCES = \
+   tools/cipher/cipher.cpp \
+   tools/cipher/XencInteropResolver.hpp \
+   tools/cipher/XencInteropResolver.cpp
+ 
+-tools += xklient
+-xklient_SOURCES = \
++tools += xsec-xklient
++xsec_xklient_SOURCES = \
+   tools/xklient/xklient.cpp
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..819815e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-xsec-prefix-to-utilities.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xml-security-c.git