From 94797308dd560932668d54cfbbdea256ed444f48 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sun, 7 Nov 2010 18:28:16 -0600 Subject: [PATCH] debian: take examples from upstream tarball again MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 29f7aabfba33c93a73a1afddfd1d7a2044857d90. v5.0.1~13 (Build: Copy the example programs to $docdir/examples, 2010-10-26) added the sample code to the upstream tarball. We don’t have to carry our own copy any more. --- debian/autogen.sh | 2 -- debian/changelog | 2 ++ debian/examples/.gitignore | 1 - debian/liblzma-dev.examples | 4 ++-- debian/source/local-options | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 debian/examples/.gitignore delete mode 100644 debian/source/local-options diff --git a/debian/autogen.sh b/debian/autogen.sh index 6fdd6bf9..05a3a9fd 100755 --- a/debian/autogen.sh +++ b/debian/autogen.sh @@ -29,6 +29,4 @@ changelog_needs_update() { cp -f m4/.gitignore debian/generated-m4.list cp -f po/.gitignore debian/generated-po.list sed -n 's,^build-aux/,, p' .gitignore > debian/generated-build-aux.list -cp -f doc/examples/xz_pipe_decomp.c debian/examples/xz_pipe_decomp.c -cp -f doc/examples/xz_pipe_comp.c debian/examples/xz_pipe_comp.c ! changelog_needs_update || exec sh debian/changelog.upstream.sh diff --git a/debian/changelog b/debian/changelog index 73006004..4a9dd317 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ xz-utils (5.1.0alpha+20110206-0.1) experimental; urgency=low to name source files. Closes: #572273. - xz: New Polish translation. * Update copyright file. + * Remove example programs from debian/examples. They are included + in the upstream source package now. -- Jonathan Nieder Wed, 16 Mar 2011 23:12:21 -0500 diff --git a/debian/examples/.gitignore b/debian/examples/.gitignore deleted file mode 100644 index 62986578..00000000 --- a/debian/examples/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/xz_pipe_*.c diff --git a/debian/liblzma-dev.examples b/debian/liblzma-dev.examples index 356566d8..bc0c0ae5 100644 --- a/debian/liblzma-dev.examples +++ b/debian/liblzma-dev.examples @@ -1,2 +1,2 @@ -debian/examples/xz_pipe_comp.c -debian/examples/xz_pipe_decomp.c +doc/examples/xz_pipe_comp.c +doc/examples/xz_pipe_decomp.c diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index 02058dcd..00000000 --- a/debian/source/local-options +++ /dev/null @@ -1 +0,0 @@ -extend-diff-ignore = doc/examples/xz_pipe_(?:de)?comp.c$ -- 2.11.4.GIT