Bug#944935: deltarpm: diff for NMU version 3.6+dfsg-1.1

2019-11-18 Thread Mike Miller
On Mon, Nov 18, 2019 at 20:06:44 -0500, Boyuan Yang wrote:
> I've prepared an NMU for deltarpm (versioned as 3.6+dfsg-1.1) and
> uploaded it to DELAYED/1. Please feel free to tell me if I
> should delay it longer.

No, please continue, thank you for taking care of it. Also feel free to
push a branch to salsa if you have permission.

-- 
mike


signature.asc
Description: PGP signature


Bug#944935: deltarpm: diff for NMU version 3.6+dfsg-1.1

2019-11-18 Thread Boyuan Yang
Control: tags 944935 + patch
Control: tags 944935 + pending

Dear maintainer,

I've prepared an NMU for deltarpm (versioned as 3.6+dfsg-1.1) and
uploaded it to DELAYED/1. Please feel free to tell me if I
should delay it longer.

Regards,
Boyuan Yang

diff -Nru deltarpm-3.6+dfsg/debian/changelog deltarpm-
3.6+dfsg/debian/changelog
--- deltarpm-3.6+dfsg/debian/changelog  2013-08-04 00:04:21.0
-0400
+++ deltarpm-3.6+dfsg/debian/changelog  2019-11-18 19:59:25.0
-0500
@@ -1,3 +1,19 @@
+deltarpm (3.6+dfsg-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+
+  [ Boyuan Yang ]
+  * debian/control: Add explicit build-dependency on dh-python.
+(Closes: #944935)
+
+  [ Mike Miller ]
+  * Add DEP-3 headers and refresh all patches.
+  * Set maintainer to RPM packaging team, add myself as uploader.
+  * Update debian/copyright for 2019.
+  * d/control: Update Vcs-* to salsa.debian.org.
+
+ -- Boyuan Yang   Mon, 18 Nov 2019 19:59:25 -0500
+
 deltarpm (3.6+dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru deltarpm-3.6+dfsg/debian/control deltarpm-
3.6+dfsg/debian/control
--- deltarpm-3.6+dfsg/debian/control2013-07-17 21:30:13.0
-0400
+++ deltarpm-3.6+dfsg/debian/control2019-11-18 19:59:17.0
-0500
@@ -1,20 +1,22 @@
 Source: deltarpm
 Section: admin
 Priority: extra
-Maintainer: Mike Miller 
+Maintainer: RPM packaging team 
+Uploaders: Mike Miller 
 Build-Depends: debhelper (>= 9),
+ dh-python,
  libbz2-dev,
  liblzma-dev,
  pkg-config,
  python-all-dev (>= 2.6.6-3~),
  python3-all-dev (>= 3.2),
- zlib1g-dev
+ zlib1g-dev,
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.4
 X-Python3-Version: >= 3.2
 Homepage: http://gitorious.org/deltarpm/deltarpm
-Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=users/mtmiller-guest/deltarpm.git
-Vcs-Git: git://anonscm.debian.org/users/mtmiller-guest/deltarpm.git
+Vcs-Browser: https://salsa.debian.org/pkg-rpm-team/deltarpm
+Vcs-Git: https://salsa.debian.org/pkg-rpm-team/deltarpm.git
 
 Package: deltarpm
 Architecture: any
diff -Nru deltarpm-3.6+dfsg/debian/copyright deltarpm-
3.6+dfsg/debian/copyright
--- deltarpm-3.6+dfsg/debian/copyright  2013-07-17 21:30:13.0
-0400
+++ deltarpm-3.6+dfsg/debian/copyright  2019-11-18 19:58:24.0
-0500
@@ -36,12 +36,12 @@
  Changes by Jonathan Dieter are also in the public domain
 
 Files: debian/*
-Copyright: 2013 Mike Miller 
+Copyright: 2013-2019 Mike Miller 
 License: BSD-3-clause
 
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
- modification, are permitted providing that the following conditions 
+ modification, are permitted providing that the following conditions
  are met:
  .
  1. Redistributions of source code must retain the above copyright
diff -Nru deltarpm-3.6+dfsg/debian/patches/04_omit-rpmdumpheader.patch
deltarpm-3.6+dfsg/debian/patches/04_omit-rpmdumpheader.patch
--- deltarpm-3.6+dfsg/debian/patches/04_omit-rpmdumpheader.patch
2013-07-17 21:30:13.0 -0400
+++ deltarpm-3.6+dfsg/debian/patches/04_omit-rpmdumpheader.patch
2019-11-18 19:58:24.0 -0500
@@ -1,13 +1,15 @@
-Author: Mike Miller 
 Description: Omit building and installing the rpmdumpheader helper
utility
  This patch removes rpmdumpheader from the 'all' and 'install'
targets. The
  only purpose of this utility is to query the system RPM database for
an
  installed package, so it will always fail on a Debian system.
+Author: Mike Miller 
 Forwarded: not-needed
-
+Last-Update: 2019-03-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile
 +++ b/Makefile
-@@ -14,7 +14,7 @@ LDLIBS = -lbz2 $(zlibldflags) -llzma
+@@ -14,7 +14,7 @@
  LDFLAGS =
  PYTHONS = python python3
  
@@ -16,7 +18,7 @@
  
  python: _deltarpmmodule.so
  
-@@ -59,7 +59,6 @@ install:
+@@ -59,7 +59,6 @@
install -m 755 makedeltarpm  $(DESTDIR)$(bindir)
install -m 755 applydeltarpm $(DESTDIR)$(bindir)
install -m 755 combinedeltarpm $(DESTDIR)$(bindir)


signature.asc
Description: This is a digitally signed message part