Dear maintainer,
Here is the NMU diff according to DevRef 5.11.1[1][2] for bug: #535423.
Please let me know if any chnages are needed or if it is ok to proceed
with the NMU.
Thank you for maintaining the package,
Jari Aalto
[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html
lsdiff(1) of changes:
vstream-client-1.2/debian/changelog
vstream-client-1.2/debian/control
vstream-client-1.2/debian/copyright
vstream-client-1.2/debian/rules
vstream-client-1.2/debian/source/format
vstream-client-1.2/debian/upstream.changelog
vstream-client-1.2/debian/watch
diffstat for vstream-client-1.2 vstream-client-1.2
changelog | 37 ++++++++++++++++++++++++++++++++++++-
control | 12 ++++++------
copyright | 48 ++++++++++++++++++++++++++----------------------
rules | 12 +++++++++---
source/format | 1 +
upstream.changelog | 17 +++++++++++++++++
watch | 3 +++
7 files changed, 98 insertions(+), 32 deletions(-)
diff -Nru vstream-client-1.2/debian/changelog vstream-client-1.2/debian/changelog
--- vstream-client-1.2/debian/changelog 2010-10-24 11:01:32.000000000 +0300
+++ vstream-client-1.2/debian/changelog 2010-10-24 10:54:03.000000000 +0300
@@ -1,7 +1,42 @@
+vstream-client (1.2-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ - Move to packaging format "3.0 (quilt)"
+ * debian/compat
+ - Update to 8.
+ * debian/chnagelog
+ - Fix off by 1 bug number in " -dev does not need...".
+ * debian/control
+ - (Build-Depends): Update to debhelper 8.
+ - (Homepage): Update to current URL.
+ - (Standards-Version): Update to 3.9.1.
+ - (Depends): Add ${misc:Depends}.
+ - (vstream-client::Section): Remove inherited field.
+ - (Vsc-*): Move info from 'XS-VCS-GIT'.
+ - (XS-VCS-GIT): Delete.
+ * debian/copyright
+ - Point to GPL-2. Update layout. Remove URLs that no longer exist.
+ - Update upstream homepage URL.
+ * debian/rules
+ - (binary-arch): Update dh_installchangelogs to use $(CHANGELOG).
+ - (get-changelog): New. Download download upstream change history.
+ - (clean): Fix bashism. Change rm -f *.so{,.1} to "rm -f *.so *.so.1".
+ Patch thanks to Chanchai Junlouchai <neverl...@gmail.com>
+ (important; Closes: #535423).
+ - (install) Update to dh_prep.
+ * debian/source/format
+ - New file.
+ * debian/upstream.changelog
+ - New file.
+ * debian/watch
+ - New file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 24 Oct 2010 10:54:03 +0300
+
vstream-client (1.2-6) unstable; urgency=low
* Replaces older version to (Closes: #496884)
- * -dev does not need to depend on -client (Closes: #496884)
+ * -dev does not need to depend on -client (Closes: #496885)
-- Paul Hedderly <p...@debian.org> Fri, 29 Aug 2008 06:26:03 +0100
diff -Nru vstream-client-1.2/debian/control vstream-client-1.2/debian/control
--- vstream-client-1.2/debian/control 2010-10-24 11:01:32.000000000 +0300
+++ vstream-client-1.2/debian/control 2010-10-24 10:31:08.000000000 +0300
@@ -1,14 +1,14 @@
Source: vstream-client
Priority: extra
Maintainer: Paul Hedderly <p...@debian.org>
-Build-Depends: debhelper (>= 6), autotools-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 8), autotools-dev
+Standards-Version: 3.9.1
+Vcs-Browser: http://git.debian.org/?p=collab-maint/vstream-client.git
+Vcs-Git: git://git.debian.org/git/collab-maint/vstream-client.git
Section: libs
-Homepage: http://armory.nicewarrior.org/projects/vstream-client/
-XS-VCS-GIT: git://git.debian.org/collab-maint/vstream-client.git
+Homepage: http://code.google.com/p/vstream-client
Package: vstream-client
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libvstream-dev
@@ -26,7 +26,7 @@
Package: vstream-client-dev
Section: libdevel
Architecture: any
-Depends:
+Depends: ${misc:Depends}
Conflicts: libvstream-dev
Replaces: vstream-client (<= 1.2-4)
Description: Development headers for vstream-client
diff -Nru vstream-client-1.2/debian/copyright vstream-client-1.2/debian/copyright
--- vstream-client-1.2/debian/copyright 2010-10-24 11:01:32.000000000 +0300
+++ vstream-client-1.2/debian/copyright 2010-10-24 10:20:47.000000000 +0300
@@ -1,22 +1,23 @@
-This package was debianized by Paul Hedderly <p...@debian.org> on
-Fri, 16 May 2008 00:28:14 +0100.
+This package was debianized by:
-It was downloaded from http://www.exit.com/Archives/FreeBSD/
-The original (though broken) site is http://armory.nicewarrior.org/projects/vstream-client/
-The source with Debian changes is stored in a git archive and can be fetched with:
- git clone git://git.debian.org/git/<group>/<project>.git
+ Paul Hedderly <p...@debian.org> on
+ 2008-05-16 00:28:14 +0100 Fri.
-Upstream Authors:
+It was downloaded from
+
+ http://code.google.com/p/vstream-client
+
+Upstream Authors:
Christopher R. Wingert <t...@wingert.org>
Gary S. Brown. <unknown>
- <tri...@samba.org>
+ <tri...@samba.org>
-Copyright:
+Copyright:
- Copyright 2003 Christopher R. Wingert <t...@wingert.org>
- Copyright 1986 Gary S. Brown. <unknown>
- Copyright 1996, 2001 <tri...@samba.org>
+ Copyright (C) 2003 Christopher R. Wingert <t...@wingert.org>
+ Copyright (C) 1986 Gary S. Brown. <unknown>
+ Copyright (C) 1996, 2001 <tri...@samba.org>
License:
@@ -24,22 +25,25 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- SOME parts are licensed under the GPL (version 1) and another (crc.c)
- is licenced without any restriction.
+ SOME parts are licensed under the GPL (version 1) and another (crc.c)
+ is licenced without any restriction.
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in "/usr/share/common-licenses/GPL-2".
+
+The Debian packaging is:
+
+ Copyright (C) 2008 Paul Hedderly <p...@debian.org>
-The Debian packaging is (C) 2008, Paul Hedderly <p...@debian.org> and
-is licensed under the GPL, see above.
+and is licensed under the GPL version 2 or any later version, see
+above.
diff -Nru vstream-client-1.2/debian/rules vstream-client-1.2/debian/rules
--- vstream-client-1.2/debian/rules 2010-10-24 11:01:32.000000000 +0300
+++ vstream-client-1.2/debian/rules 2010-10-24 10:53:42.000000000 +0300
@@ -46,6 +46,12 @@
#CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+CHANGELOG = debian/upstream.changelog
+
+# Run manually
+get-changelog:
+ svn log http://vstream-client.googlecode.com/svn/trunk/ \
+ > $(CHANGELOG)
build: build-stamp
build-stamp: config.status
@@ -64,7 +70,7 @@
# Add here commands to clean up after the build process.
#[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.mak config.sub config.guess
- rm -f *.so{,.1} *.o *.a *~ vstream-client vstream-client.exe
+ rm -f *.so *.so.1 *.o *.a *~ vstream-client vstream-client.exe
dh_clean
@@ -72,7 +78,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tmp
@@ -89,7 +95,7 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs $(CHANGELOG)
dh_installdocs
dh_installexamples
dh_install
diff -Nru vstream-client-1.2/debian/source/format vstream-client-1.2/debian/source/format
--- vstream-client-1.2/debian/source/format 1970-01-01 02:00:00.000000000 +0200
+++ vstream-client-1.2/debian/source/format 2010-10-24 10:40:09.000000000 +0300
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru vstream-client-1.2/debian/upstream.changelog vstream-client-1.2/debian/upstream.changelog
--- vstream-client-1.2/debian/upstream.changelog 1970-01-01 02:00:00.000000000 +0200
+++ vstream-client-1.2/debian/upstream.changelog 2010-10-24 10:38:01.000000000 +0300
@@ -0,0 +1,17 @@
+------------------------------------------------------------------------
+r7 | d...@stilldesigning.com | 2007-11-20 20:08:30 +0200 (Tue, 20 Nov 2007) | 1 line
+
+revert changes to vstream.c and remove vstream_out function to maintain compatibility with existing 3rd part apps like MPlayer
+------------------------------------------------------------------------
+r4 | d...@stilldesigning.com | 2007-11-18 00:31:09 +0200 (Sun, 18 Nov 2007) | 1 line
+
+add support for stdout
+------------------------------------------------------------------------
+r2 | d...@stilldesigning.com | 2007-11-18 00:23:37 +0200 (Sun, 18 Nov 2007) | 1 line
+
+vstream-client 1.2
+------------------------------------------------------------------------
+r1 | (no author) | 2007-11-18 00:13:36 +0200 (Sun, 18 Nov 2007) | 1 line
+
+Initial directory structure.
+------------------------------------------------------------------------
diff -Nru vstream-client-1.2/debian/watch vstream-client-1.2/debian/watch
--- vstream-client-1.2/debian/watch 1970-01-01 02:00:00.000000000 +0200
+++ vstream-client-1.2/debian/watch 2010-10-24 10:31:08.000000000 +0300
@@ -0,0 +1,3 @@
+version=3
+http://code.google.com/p/vstream-client/downloads/list \
+ .*vstream-client-([\d.]+).*\.tar\.bz2
