From 122bfa53744e7e3e3ccdaf2a7d5a97172ab91c37 Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Sun, 17 Nov 2013 18:54:44 -0500 Subject: [PATCH] Revert "debian: added single-debian-patch in source/options" This reverts commit df395a3f04ad4eb809f9451b65d657d396ccc08c, with edits for Debian changelog. --- debian/changelog | 2 ++ debian/source/options | 1 - debian/source/patch-header | 8 -------- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 debian/source/options delete mode 100644 debian/source/patch-header diff --git a/debian/changelog b/debian/changelog index faca521f..18773905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ barry (0.18.5-1) unstable; urgency=low * New upstream version 0.18.5 + * Removed source/options and source/patch-header, using upstream versions + instead. -- Chris Frey Sun, 17 Nov 2013 17:29:40 -0500 diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index 7423a2df..00000000 --- a/debian/source/options +++ /dev/null @@ -1 +0,0 @@ -single-debian-patch diff --git a/debian/source/patch-header b/debian/source/patch-header deleted file mode 100644 index 7e7ffa33..00000000 --- a/debian/source/patch-header +++ /dev/null @@ -1,8 +0,0 @@ -From: Chris Frey -Subject: in-tree changes from git - - * Added single-debian-patch in source/options since Barry debian changes - are handled in the upstream git repository. Changes motivated by - Debian policy are not always the cause for a new upstream point - release, so are included in patch form here. - -- 2.11.4.GIT