Bug#693700: unblock: blends/0.6.16
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package blends
The just uploaded package closes #692946 by droping the two transitional
packages cdd-dev and cdd-common.
Note to the diff between previous version 0.6.15 and the candidate for
testing 0.6.16.
1. Packaging was moved to Git which is reflected in changed Vcs fields
and updated docs (see below for other docs changes)
2. Some additional changes
- debhelper 9 instead of 7
- Standards-Version 3.9.3 instead of 3.9.1
-> I'm aware that I should avoid such additional changes to reduce the
amount of changes to the version in testing to a bare minimum.
However, it did seem to me quite unreasonable to revert these changes
done in Vcs just to follow this requirement because I do not expect
any problem in this
3. debian/copyright: bug #692946 was about a missing copyright - I took the
freedom to generally update the copyright file to match DEP5
Other "upstream" changes of this native Debian package
4. when creating metapackages targeting at tesing I learned that the
sources.list.* files did not worked out of the box because of a the lack
of the debian/ dir on official Debian mirrors. I do not see any reason
to revert a change in Vcs and by doing so making the package a pain for
possible users who need to find out themselved that they need to adapt
their configuration examples in any case. I simply forgot to report a
bug severity important to file because I'm currently possibly the only
user who actively builds those metapackages for several Blends.
5. Enhanced documentation
The documentation for Debian Pure Blends is maintained inside the
package source Vcs and published[1] at the Blends homepage. The changes
do not only reflect the change of Vcs from SVN to Git but also other
things which are constantly updated and will enhance the understanding
of using blends-dev and other tools (not necessarily inside the
resulting binary packages). So there is a fair amount of changes inside
the doc/ directory of the packaging source and in blends-doc binary
package. I decided to strip these changes from the attached debdiff to
keep the inspection of the diff more simple. As said above I do not see
any sense to revert very reasonable changes from Vcs and by doing so
making the package inferior than it could be just to follow the minimum
changes policy.
I confirm that I'm fully aware that I'm violating the minimum changes
request of release team for an unblock request but I hope the reasoning
is convincing that these changes on one hand are non-invasive regarding
the functionality and make perfectly sense on the other hand.
Kind regards and thanks for your work on Wheezy release
Andreas.
[1] http://blends.alioth.debian.org/blends/
unblock blends/0.6.16
-- System Information:
Debian Release: 6.0.6
Architecture: i386 (i686)
Kernel: Linux 2.6.36-xenU-4814-i386 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru blends-0.6.15/debian/cdd-common.links blends-0.6.16/debian/cdd-common.links
--- blends-0.6.15/debian/cdd-common.links 2010-04-10 19:40:47.000000000 +0200
+++ blends-0.6.16/debian/cdd-common.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-usr/share/blends/unixgroups/blend-actions usr/share/cdd/unixgroups/cdd-actions
-usr/share/blends/blend-actions usr/share/cdd/cdd-actions
-usr/share/blends/blend-update-menus usr/share/cdd/cdd-update-menus
-usr/share/blends/blend-utils usr/share/cdd/cdd-utils
-usr/share/blends/blend-task-lister usr/share/cdd/cdd-task-lister
-usr/share/man/man8/blend-actions.8.gz usr/share/man/man8/cdd-actions.8.gz
-usr/share/man/man8/blend-update-menus.8.gz usr/share/man/man8/cdd-update-menus.8.gz
-usr/share/man/man8/blend-utils.8.gz usr/share/man/man8/cdd-utils.8.gz
-usr/share/man/man8/blend-task-lister.8.gz usr/share/man/man8/cdd-task-lister.8.gz
-usr/sbin/blend-user usr/sbin/cdd-user
-usr/sbin/blend-role usr/sbin/cdd-role
-usr/sbin/blend-update-menus usr/sbin/cdd-update-menus
-usr/sbin/blend-update-usermenus usr/sbin/cdd-update-usermenus
-usr/share/doc/blends-common usr/share/doc/cdd-common
-usr/share/man/man8/blend-role.8.gz usr/share/man/man8/cdd-role.8.gz
-usr/share/man/man8/blend-update-usermenus.8.gz usr/share/man/man8/cdd-update-usermenus.8.gz
-usr/share/man/man8/blend-user.8.gz usr/share/man/man8/cdd-user.8.gz
diff -Nru blends-0.6.15/debian/cdd-dev.links blends-0.6.16/debian/cdd-dev.links
--- blends-0.6.15/debian/cdd-dev.links 2010-04-10 19:40:47.000000000 +0200
+++ blends-0.6.16/debian/cdd-dev.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-usr/share/blends/templates usr/share/cdd/templates
-usr/share/blends-dev/blend-gen-control usr/share/cdd-dev/cdd-gen-control
-usr/share/blends-dev/blend-get-names usr/share/cdd-dev/cdd-get-names
-usr/share/blends-dev/blend-install-helper usr/share/cdd-dev/cdd-install-helper
-usr/share/blends-dev/Makefile usr/share/cdd-dev/Makefile
-usr/share/blends-dev/rules usr/share/cdd-dev/rules
-usr/share/doc/blends-dev usr/share/doc/cdd-dev
diff -Nru blends-0.6.15/debian/changelog blends-0.6.16/debian/changelog
--- blends-0.6.15/debian/changelog 2010-11-11 23:14:47.000000000 +0100
+++ blends-0.6.16/debian/changelog 2012-11-18 21:49:04.000000000 +0100
@@ -1,3 +1,18 @@
+blends (0.6.16) unstable; urgency=low
+
+ * Enhanced doc
+ * sources.list/*: Add the missing debian/ dirs
+ * debian/control:
+ - Standards-Version: 3.9.3
+ - Vcs-Fields now point to Git
+ * Debhelper 9 (control+compat)
+ * Drop transitional cdd-* packages completely
+ Closes: #692946
+ * DEP5 formated copyright while checking this in connection to
+ bug #692946
+
+ -- Andreas Tille <tille@debian.org> Fri, 16 Nov 2012 14:31:49 +0100
+
blends (0.6.15) unstable; urgency=low
* Documentation changes:
diff -Nru blends-0.6.15/debian/compat blends-0.6.16/debian/compat
--- blends-0.6.15/debian/compat 2010-04-10 19:40:47.000000000 +0200
+++ blends-0.6.16/debian/compat 2012-11-18 21:49:04.000000000 +0100
@@ -1 +1 @@
-7
+9
diff -Nru blends-0.6.15/debian/control blends-0.6.16/debian/control
--- blends-0.6.15/debian/control 2010-08-03 10:08:48.000000000 +0200
+++ blends-0.6.16/debian/control 2012-11-18 21:49:04.000000000 +0100
@@ -7,12 +7,12 @@
Cosimo Alfarano <kalfa@debian.org>,
José L. Redrejo Rodríguez <jredrejo@debian.org>,
Jonas Smedegaard <dr@jones.dk>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra,
texlive-latex-recommended, texlive-fonts-recommended, ghostscript
-Standards-Version: 3.9.1
-Vcs-Browser: http://svn.debian.org/wsvn/blends/blends/trunk/blends/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/blends/blends/trunk/blends/
+Standards-Version: 3.9.3
+Vcs-Browser: http://git.debian.org/?p=blends/blends.git
+Vcs-Git: git://git.debian.org/git/blends/blends.git
Package: blends-dev
Architecture: all
@@ -20,21 +20,13 @@
Depends: debconf (>= 0.5) | debconf-2.0, make | build-essential, apt,
debhelper (>= 7), ${misc:Depends}
Suggests: blends-doc
+Replaces: cdd-dev
Description: Debian Pure Blends common files for developing metapackages
This package makes life easier when packaging metapackages. Perhaps
this will also encourage other people to build metapackages if there are
easy to use templates where only the packages, the metapackage is depending
from, to insert into the right place.
-Package: cdd-dev
-Architecture: all
-Section: devel
-Depends: blends-dev, ${misc:Depends}
-Description: Debian Pure Blends dummy package for upgrades from cdd-dev
- After renaming Custom Debian Distributions to Debian Pure Blends we
- have to make sure that upgrades work smoothly. This package provides
- symlinks to all the tools of blends-dev with the old cdd names.
-
Package: blends-common
Architecture: all
Section: misc
@@ -48,23 +40,12 @@
system users in a group named according to the name of the
Debian Pure Blend.
-Package: cdd-common
-Architecture: all
-Section: misc
-Depends: blends-common, ${misc:Depends}
-Description: Debian Pure Blends dummy package for upgrades from cdd-common
- After renaming Custom Debian Distributions to Debian Pure Blends we
- have to make sure that upgrades work smoothly. This package provides
- symlinks to all the tools of blends-common with the old cdd names.
-
Package: blends-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
Suggests: www-browser, postscript-viewer
-Provides: cdd-doc
Replaces: cdd-doc
-Conflicts: cdd-doc
Description: Debian Pure Blends documentation
This paper is intended to people who are interested in the philosophy
of Debian Pure Blends and the technique which is used to
diff -Nru blends-0.6.15/debian/copyright blends-0.6.16/debian/copyright
--- blends-0.6.15/debian/copyright 2010-04-10 19:40:47.000000000 +0200
+++ blends-0.6.16/debian/copyright 2012-11-18 21:49:04.000000000 +0100
@@ -1,37 +1,25 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Andreas Tille <tille@debian.org>
-X-Debinized-Date: Tue, 23 Mar 2004 18:41:20 +0100
-X-Source-Downloaded-From: http://bio.math.berkeley.edu/amap/download
-X-Upstream-Author: 2003-2008 Andreas Tille <tille@debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: © 2003-2008 Andreas Tille <tille@debian.org>
+Copyright: © 2003-2012 Andreas Tille <tille@debian.org>
License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- 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.
-X-Comment: On Debian systems, the complete text of the GNU GPL version 2
- can be found in: `/usr/share/common-licenses/GPL-2'
Files: devtools/blend-gen-control
Copyright: © 2003-2007 Petter Reinholdtsen <pere@debian.org>
- © 2007-2008 Andreas Tille <tille@debian.org>
+ © 2007-2012 Andreas Tille <tille@debian.org>
License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- 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.
-X-Comment: On Debian systems, the complete text of the GNU GPL version 2
- can be found in: `/usr/share/common-licenses/GPL-2'
Files: share/blends/*
Copyright: © 2003 Cosimo Alfarano <kalfa@debian.org>
- © 2003-2008 Andreas Tille <tille@debian.org>
+ © 2003-2012 Andreas Tille <tille@debian.org>
+License: GPL-2+
+
License: GPL-2+
This package is free software; you can redistribute it and/or modify
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.
-X-Comment: On Debian systems, the complete text of the GNU GPL version 2
+ (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU GPL version 2
can be found in: `/usr/share/common-licenses/GPL-2'
+
diff -Nru blends-0.6.15/sources.list blends-0.6.16/sources.list
--- blends-0.6.15/sources.list 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16/sources.list 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-# using unstable as target distribution for the meta package dependencies
-# does actually not sound reasonable. The idea is to enable a smooth transition
-# to testing for all meta packages and thus here testing is used as target
-# distribution. You are free to provide your own source.list.unstable
-# in the source of your meta package building code to force unstable as
-# target or alternatively you could change this file (/etc/blends/sources.list.unstable).
-deb http://ftp.debian.org/ testing main
diff -Nru blends-0.6.15/sources.list.experimental blends-0.6.16/sources.list.experimental
--- blends-0.6.15/sources.list.experimental 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16/sources.list.experimental 2012-11-18 21:49:04.000000000 +0100
@@ -1,3 +1,3 @@
# If a Blend should be uploaded to experimental it needs a sources.list
# file matching this target.
-deb http://ftp.debian.org/ unstable main
+deb http://ftp.debian.org/debian unstable main
diff -Nru blends-0.6.15/sources.list.stable blends-0.6.16/sources.list.stable
--- blends-0.6.15/sources.list.stable 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16/sources.list.stable 2012-11-18 21:49:04.000000000 +0100
@@ -1 +1 @@
-deb http://ftp.debian.org/ stable main
+deb http://ftp.debian.org/debian stable main
diff -Nru blends-0.6.15/sources.list.testing blends-0.6.16/sources.list.testing
--- blends-0.6.15/sources.list.testing 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16/sources.list.testing 2012-11-18 21:49:04.000000000 +0100
@@ -1 +1 @@
-deb http://ftp.debian.org/ testing main
+deb http://ftp.debian.org/debian testing main
diff -Nru blends-0.6.15/sources.list.UNRELEASED blends-0.6.16/sources.list.UNRELEASED
--- blends-0.6.15/sources.list.UNRELEASED 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16/sources.list.UNRELEASED 2012-11-18 21:49:04.000000000 +0100
@@ -2,4 +2,4 @@
# good practice to use UNRELEASED in the changelog as target distribution
# for not yet finished packages and blends-dev should also work in this
# case
-deb http://ftp.debian.org/ unstable main
+deb http://ftp.debian.org/debian unstable main
diff -Nru blends-0.6.15/sources.list.unstable blends-0.6.16/sources.list.unstable
--- blends-0.6.15/sources.list.unstable 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16/sources.list.unstable 2012-11-18 21:49:04.000000000 +0100
@@ -4,4 +4,4 @@
# distribution. You are free to provide your own source.list.unstable
# in the source of your meta package building code to force unstable as
# target or alternatively you could change this file (/etc/blends/sources.list.unstable).
-deb http://ftp.debian.org/ testing main
+deb http://ftp.debian.org/debian testing main
Reply to: