[hamradio-commits] [chirp] 16/19: Refreshed patches

[Iain R. Learmonth]

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

irl pushed a commit to branch master
in repository chirp.

commit 533923c7705e6105bafe93baeaf92aa3e3ae5005
Author: Iain R. Learmonth <irl at debian.org>
Date:   Sun Nov 1 15:25:47 2015 +0000

    Refreshed patches
---
 debian/changelog                     |  3 +++
 debian/patches/01-fix-manifest.patch |  3 +--
 debian/patches/02-fix-setup-py.patch | 13 +++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bad10b7..1e36be4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 chirp (1:20151023-1) UNRELEASED; urgency=medium
 
   * New upstream version (Closes: #798947)
+  * Refreshed patches:
+   - 01-fix-manifest.patch
+   - 02-fix-setup-py.patch
 
  -- Iain R. Learmonth <irl at debian.org>  Sun, 01 Nov 2015 15:16:40 +0000
 
diff --git a/debian/patches/01-fix-manifest.patch b/debian/patches/01-fix-manifest.patch
index 1f2557e..4ded6f9 100644
--- a/debian/patches/01-fix-manifest.patch
+++ b/debian/patches/01-fix-manifest.patch
@@ -1,7 +1,7 @@
 Description: Add required pieces to MANIFEST.IN file
 Author: Steve Conklin <steve at conklinhouse.com>
 
---- a//dev/null
+--- /dev/null
 +++ b/MANIFEST.IN
 @@ -0,0 +1,5 @@
 +include *.xsd
@@ -9,4 +9,3 @@ Author: Steve Conklin <steve at conklinhouse.com>
 +include share/chirp.png
 +include share/*.1
 +include stock_configs/*
-+include COPYING
diff --git a/debian/patches/02-fix-setup-py.patch b/debian/patches/02-fix-setup-py.patch
index 1088490..44f635f 100644
--- a/debian/patches/02-fix-setup-py.patch
+++ b/debian/patches/02-fix-setup-py.patch
@@ -4,13 +4,13 @@ Author: Steve Conklin <steve at conklinhouse.com>
 
 --- a/setup.py
 +++ b/setup.py
-@@ -117,44 +117,10 @@
-                     ('share/chirp/stock_configs', stock_configs),
+@@ -136,45 +136,9 @@
                      ] + locale_files)
  
+ 
 -def rpttool_build():
 -    from distutils.core import setup
--    
+-
 -    setup(name="rpttool",
 -          packages=["chirp"],
 -          version="0.3",
@@ -19,6 +19,7 @@ Author: Steve Conklin <steve at conklinhouse.com>
 -          data_files=[('/usr/sbin', ["tools/icomsio.sh"])],
 -          )
 -
+-
 -def nuke_manifest(*files):
 -    for i in ["MANIFEST", "MANIFEST.in"]:
 -        if os.path.exists(i):
@@ -31,7 +32,8 @@ Author: Steve Conklin <steve at conklinhouse.com>
 -    for fn in files:
 -        print >>f, fn
 -    f.close()
--                    
+-
+-
  if sys.platform == "darwin":
      macos_build()
  elif sys.platform == "win32":
@@ -40,7 +42,7 @@ Author: Steve Conklin <steve at conklinhouse.com>
 -    if os.path.exists("rpttool"):
 -        nuke_manifest("include tools/icomsio.sh", "include README.rpttool")
 -        rpttool_build()
--    if os.path.exists("chirpui"):
+-    if os.path.exists("chirp/ui"):
 -        nuke_manifest("include *.xsd",
 -                      "include share/*.desktop",
 -                      "include share/chirp.png",
@@ -49,4 +51,3 @@ Author: Steve Conklin <steve at conklinhouse.com>
 -                      "include COPYING")
 -        default_build()
 +    default_build()
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/chirp.git