On Sun, Feb 20, 2011 at 04:07:43PM -0500, Scott Howard wrote:
> tags 327894 + patch
> tags 327894 + pending
> tags 356872 + patch
> tags 356872 + pending
> tags 601872 + patch
> tags 601872 + pending
> thanks
>
> Dear maintainer,
Hello Scott,
> I've prepared an NMU for vdkxdb2 (versioned as 2.4.0-3.2) and
> uploaded it to DELAYED/10. Please feel free to tell me if I
> should delay it longer.
Thanks a lot for your work on this! Much appreciated that you took the
time to fix those bugs. DELAYED/10 means 10 days I presume? I would
not mind getting it in earlier :)
Cheers,
Michael
> Below is an edited diff, I removed the sections updating
> config.{sub,guess}
>
> Regards.
> diff -Nru vdkxdb2-2.4.0/debian/changelog vdkxdb2-2.4.0/debian/changelog
> --- vdkxdb2-2.4.0/debian/changelog 2011-02-20 16:07:42.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/changelog 2011-02-20 10:26:08.000000000 -0500
> @@ -1,3 +1,26 @@
> +vdkxdb2 (2.4.0-3.2) unstable; urgency=low
> +
> + * Non-maintainer upload.
> + * dh 7 build system to use dh-autoreconf (Closes: #327894)
> + - Build system now finds cairo (Closes: #356872)
> + * Lintian fixing:
> + - E: removed empty manpage
> + - W: Updated debian/copyright
> + - W: moved libvdkxdb2.so to -dev package
> + - W: Debian Policy 3.9.1
> + - W: added misc:Depends to debian/control
> + - W: dh 7 fixes clean errors
> + - W: dh 7 removes call to dh_undocumented
> + - W: added source section:libs to debian/control
> + - W: debian/compat changed for version 7
> + - W: use {binary:Version} in debian/control instead of {Source-version}
> + * source format 3.0 (quilt)
> + * Added Section: libs to source package (Closes: #601872)
> + * Removed Debian maintainer changes to config.{guess,sub},
> + use autotools-dev to update (prevent further bitrot)
> +
> + -- Scott Howard <[email protected]> Sun, 20 Feb 2011 10:25:57 -0500
> +
> vdkxdb2 (2.4.0-3.1) unstable; urgency=low
>
> * Non-maintainer upload.
> diff -Nru vdkxdb2-2.4.0/debian/compat vdkxdb2-2.4.0/debian/compat
> --- vdkxdb2-2.4.0/debian/compat 2011-02-20 16:07:42.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/compat 2010-10-09 20:35:05.000000000 -0400
> @@ -1 +1 @@
> -4
> +7
> diff -Nru vdkxdb2-2.4.0/debian/control vdkxdb2-2.4.0/debian/control
> --- vdkxdb2-2.4.0/debian/control 2011-02-20 16:07:42.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/control 2011-02-19 20:30:37.000000000 -0500
> @@ -1,13 +1,16 @@
> Source: vdkxdb2
> +Section: libs
> Priority: optional
> Maintainer: Michael Vogt <[email protected]>
> -Standards-Version: 3.6.2.1
> -Build-Depends: debhelper (>> 4.0), libgtk2.0-dev, libglib2.0-dev ,
> libvdk2-dev (>= 2.4.0-3), libxbase2.0-dev, doxygen, autotools-dev, chrpath
> +Standards-Version: 3.9.1
> +Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, libglib2.0-dev,
> + libvdk2-dev (>= 2.4.0-3), libxbase2.0-dev, doxygen, autotools-dev,
> + dh-autoreconf, chrpath
>
> Package: libvdkxdb2-2c2
> Section: libs
> Architecture: any
> -Depends: ${shlibs:Depends}, libxbase2.0-0
> +Depends: ${shlibs:Depends}, ${misc:Depends}, libxbase2.0-0
> Conflicts: libvdkxdb2c102, libvdkxdb2-2
> Replaces: libvdkxdb2c102, libvdkxdb2-2
> Description: VDK data-aware widgets
> @@ -20,7 +23,7 @@
> Package: libvdkxdb2-dev
> Section: libdevel
> Architecture: any
> -Depends: libvdkxdb2-2c2 (= ${Source-Version}), libxbase2.0-dev, libc6-dev
> +Depends: ${misc:Depends}, libvdkxdb2-2c2 (= ${binary:Version}),
> libxbase2.0-dev, libc6-dev
> Description: development files for libvdkxdb
> VDKXdb is a set of data-aware widgets made to build
> lightweight database applications using the VDK library.
> diff -Nru vdkxdb2-2.4.0/debian/copyright vdkxdb2-2.4.0/debian/copyright
> --- vdkxdb2-2.4.0/debian/copyright 2011-02-20 16:07:42.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/copyright 2010-10-09 22:14:26.000000000 -0400
> @@ -8,5 +8,6 @@
> Upstream Authors:
> please see the original AUTHORS file.
>
> -Copyright:
> +Copyright 2000 Mario Motta <[email protected]>
> +License:
> LGPL (see /usr/share/common-licenses/LGPL)
> diff -Nru vdkxdb2-2.4.0/debian/dirs vdkxdb2-2.4.0/debian/dirs
> --- vdkxdb2-2.4.0/debian/dirs 2011-02-20 16:07:42.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/dirs 1969-12-31 19:00:00.000000000 -0500
> @@ -1,4 +0,0 @@
> -usr/bin
> -usr/lib
> -usr/include
> -usr/share/doc/libvdkxdb2-dev/html
> diff -Nru vdkxdb2-2.4.0/debian/docs vdkxdb2-2.4.0/debian/docs
> --- vdkxdb2-2.4.0/debian/docs 2011-02-20 16:07:42.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/docs 1969-12-31 19:00:00.000000000 -0500
> @@ -1,3 +0,0 @@
> -AUTHORS
> -NEWS
> -README
> diff -Nru vdkxdb2-2.4.0/debian/libvdkxdb2-2c2.install
> vdkxdb2-2.4.0/debian/libvdkxdb2-2c2.install
> --- vdkxdb2-2.4.0/debian/libvdkxdb2-2c2.install 1969-12-31
> 19:00:00.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/libvdkxdb2-2c2.install 2010-10-09
> 22:40:29.000000000 -0400
> @@ -0,0 +1 @@
> +debian/tmp/usr/lib/*.so.* /usr/lib
> diff -Nru vdkxdb2-2.4.0/debian/libvdkxdb2-dev.docs
> vdkxdb2-2.4.0/debian/libvdkxdb2-dev.docs
> --- vdkxdb2-2.4.0/debian/libvdkxdb2-dev.docs 1969-12-31 19:00:00.000000000
> -0500
> +++ vdkxdb2-2.4.0/debian/libvdkxdb2-dev.docs 2010-10-09 22:28:32.000000000
> -0400
> @@ -0,0 +1,4 @@
> +AUTHORS
> +NEWS
> +README
> +doc/doxy/html/*.html
> diff -Nru vdkxdb2-2.4.0/debian/libvdkxdb2-dev.examples
> vdkxdb2-2.4.0/debian/libvdkxdb2-dev.examples
> --- vdkxdb2-2.4.0/debian/libvdkxdb2-dev.examples 1969-12-31
> 19:00:00.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/libvdkxdb2-dev.examples 2010-10-09
> 21:43:37.000000000 -0400
> @@ -0,0 +1 @@
> +testxdb
> diff -Nru vdkxdb2-2.4.0/debian/libvdkxdb2-dev.install
> vdkxdb2-2.4.0/debian/libvdkxdb2-dev.install
> --- vdkxdb2-2.4.0/debian/libvdkxdb2-dev.install 1969-12-31
> 19:00:00.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/libvdkxdb2-dev.install 2010-10-09
> 22:27:10.000000000 -0400
> @@ -0,0 +1,5 @@
> +debian/tmp/usr/include/vdkxdb2/* /usr/include/vdkxdb2
> +debian/tmp/usr/lib/*.la /usr/lib
> +debian/tmp/usr/lib/*.a /usr/lib
> +debian/tmp/usr/lib/*.so /usr/lib
> +debian/tmp/usr/bin/* /usr/bin
> diff -Nru vdkxdb2-2.4.0/debian/rules vdkxdb2-2.4.0/debian/rules
> --- vdkxdb2-2.4.0/debian/rules 2011-02-20 16:07:42.000000000 -0500
> +++ vdkxdb2-2.4.0/debian/rules 2011-02-20 10:25:39.000000000 -0500
> @@ -3,105 +3,15 @@
> # GNU copyright 1997 to 1999 by Joey Hess.
>
> # Uncomment this to turn on verbose mode.
> -export DH_VERBOSE=1
> +# export DH_VERBOSE=1
>
> -build: build-stamp
> -build-stamp:
> - dh_testdir
> - ./configure --prefix=/usr --mandir=\$${prefix}/share/man
> --includedir=\$${prefix}/include/vdkxdb2
> - # Add here commands to compile the package.
> - $(MAKE)
> - $(MAKE) docs
> - touch build-stamp
> +%:
> + dh --with autotools-dev --with autoreconf $@
>
> -clean:
> - dh_testdir
> - dh_testroot
> - rm -f build-stamp install-stamp
> - # Add here commands to clean up after the build process.
> - -$(MAKE) distclean
> - find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o
> -name '.deps' | xargs rm -rf
> +override_dh_clean:
> dh_clean
> - # autotools-dev support
> - -test -r /usr/share/misc/config.sub && \
> - cp -f /usr/share/misc/config.sub config.sub
> - -test -r /usr/share/misc/config.guess && \
> - cp -f /usr/share/misc/config.guess config.guess
> + -rm -r testxdb/CVS
>
> -
> -install: install-stamp
> -install-stamp: build
> - dh_testdir
> - dh_testroot
> - dh_clean
> - $(MAKE) DESTDIR=`pwd`/debian/libvdkxdb2-2c2 install
> - touch install-stamp
> -
> -
> -# Build architecture-independent files here.
> -binary-indep:
> -# We have nothing to do by default.
> -
> -# Build architecture-dependent files here.
> -binary-arch: build install libvdkxdb2-dev libvdkxdb2-2c2
> -
> -libvdkxdb2-2c2: build
> - dh_testdir -plibvdkxdb2-2c2
> - dh_testroot -plibvdkxdb2-2c2
> - dh_installdirs -plibvdkxdb2-2c2
> -# rm -rf debian/tmp/usr/bin \
> -# debian/tmp/usr/include
> -# dh_movefiles -plibvdkxdb2-2c2
> - dh_installdocs -plibvdkxdb2-2c2
> -# dh_undocumented
> - dh_installchangelogs -plibvdkxdb2-2c2 ChangeLog
> - dh_link -plibvdkxdb2-2c2
> - dh_strip -plibvdkxdb2-2c2
> - dh_compress -plibvdkxdb2-2c2
> - dh_fixperms -plibvdkxdb2-2c2
> - chrpath -d debian/$@/usr/lib/*.so
> - dh_makeshlibs -plibvdkxdb2-2c2 -V 'libvdkxdb2-2c2 (>= 2.0.2-5.2)'
> - dh_shlibdeps -plibvdkxdb2-2c2
> - dh_gencontrol -plibvdkxdb2-2c2
> - dh_installdeb -plibvdkxdb2-2c2
> - dh_md5sums -plibvdkxdb2-2c2
> - dh_builddeb -plibvdkxdb2-2c2
> -
> -libvdkxdb2-dev: build
> - dh_testdir -plibvdkxdb2-dev
> - dh_testroot -plibvdkxdb2-dev
> - dh_clean -v -plibvdkxdb2-dev -k
> - dh_installdirs -plibvdkxdb2-dev
> - dh_movefiles -plibvdkxdb2-dev --sourcedir=debian/libvdkxdb2-2c2
> -
> - # copy the examples
> - install -d \
> - debian/libvdkxdb2-dev/usr/share/doc/libvdkxdb2-dev/examples/testxdb
> - cp testxdb/* \
> - debian/libvdkxdb2-dev/usr/share/doc/libvdkxdb2-dev/examples/testxdb \
> - || true
> - rm -f
> debian/libvdkxdb2-dev/usr/share/doc/libvdkxdb2-dev/examples/testxdb/COPYING
> -
> - # man-page
> - dh_undocumented -plibvdkxdb2-dev vdkxdb-config-2.1
> - # copy documentation
> - install -d \
> - debian/libvdkxdb2-dev/usr/share/doc/libvdkxdb2-dev/html
> - cp doc/doxy/html/* \
> - debian/libvdkxdb2-dev/usr/share/doc/libvdkxdb2-dev/html
> -
> - dh_installdocs -plibvdkxdb2-dev
> -
> - dh_installchangelogs -plibvdkxdb2-dev ChangeLog
> - dh_link -plibvdkxdb2-dev
> - dh_strip -plibvdkxdb2-dev
> - dh_compress -plibvdkxdb2-dev
> - dh_fixperms -plibvdkxdb2-dev
> - dh_installdeb -plibvdkxdb2-dev
> - dh_shlibdeps -plibvdkxdb2-dev
> - dh_gencontrol -plibvdkxdb2-dev
> - dh_md5sums -plibvdkxdb2-dev
> - dh_builddeb -plibvdkxdb2-dev
> -
> -binary: binary-indep binary-arch
> -.PHONY: build clean binary-indep binary-arch binary install
> +override_dh_auto_build:
> + make docs
> + dh_auto_build
> diff -Nru vdkxdb2-2.4.0/debian/source/format
> vdkxdb2-2.4.0/debian/source/format
> --- vdkxdb2-2.4.0/debian/source/format 1969-12-31 19:00:00.000000000
> -0500
> +++ vdkxdb2-2.4.0/debian/source/format 2010-10-09 20:55:10.000000000
> -0400
> @@ -0,0 +1 @@
> +3.0 (quilt)
>
>
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
