Hi,
On Tue, Dec 04, 2012 at 11:45:29AM +0100, Andreas Tille wrote:
> retitle 693700 unblock: blends/0.6.16.2
> In blends-0.6.16.2 bug #694896 is fixed and it would be great if the
> unblock request could be implemented soonish to enable creating of
> Blends metapackages in the next couple of days.
This bug report contains the debdiffs between the different version that were
uploaded to unstable. Given that some unwanted changes were reverted, the
debdiff between testing and unstable might be easier to review. This debdiff
is attached.
Personally, I think blends/0.6.16.2 fits the freeze policy (all the offending
changes are reverted), but obviously, that's not my call.
Cheers,
Ivo
diff -Nru blends-0.6.15/blend-role blends-0.6.16.2/blend-role
--- blends-0.6.15/blend-role 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16.2/blend-role 2012-12-04 11:02:56.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: blend-role 1195 2008-11-02 16:10:33Z tille $
+# $Id$
usage () {
echo "Usage: `basename $0` <action> <Blend> [<role>]"
diff -Nru blends-0.6.15/blend-update-menus blends-0.6.16.2/blend-update-menus
--- blends-0.6.15/blend-update-menus 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16.2/blend-update-menus 2012-12-04 11:02:56.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: blend-update-menus 2111 2010-03-20 21:23:54Z tille $
+# $Id$
usage() {
echo "Usage: `basename $0` [ -u <user> | -b <Blend> ]"
diff -Nru blends-0.6.15/blend-update-usermenus
blends-0.6.16.2/blend-update-usermenus
--- blends-0.6.15/blend-update-usermenus 2010-04-10 19:40:51.000000000
+0200
+++ blends-0.6.16.2/blend-update-usermenus 2012-12-04 11:02:56.000000000
+0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: blend-update-usermenus 1207 2008-11-05 21:21:57Z tille $
+# $Id$
usage() {
echo "Usage: `basename $0` <Blend>"
diff -Nru blends-0.6.15/blend-user blends-0.6.16.2/blend-user
--- blends-0.6.15/blend-user 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16.2/blend-user 2012-12-04 11:02:56.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: blend-user 1208 2008-11-05 21:33:34Z tille $
+# $Id$
usage () {
echo "Usage: `basename $0` <action> <Blend> <user> [<Role>]"
diff -Nru blends-0.6.15/debian/cdd-common.links
blends-0.6.16.2/debian/cdd-common.links
--- blends-0.6.15/debian/cdd-common.links 2010-04-10 19:40:47.000000000
+0200
+++ blends-0.6.16.2/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.2/debian/cdd-dev.links
--- blends-0.6.15/debian/cdd-dev.links 2010-04-10 19:40:47.000000000 +0200
+++ blends-0.6.16.2/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.2/debian/changelog
--- blends-0.6.15/debian/changelog 2010-11-11 23:14:47.000000000 +0100
+++ blends-0.6.16.2/debian/changelog 2012-12-04 11:02:56.000000000 +0100
@@ -1,3 +1,36 @@
+blends (0.6.16.2) unstable; urgency=low
+
+ * Install tasksel desc file to new location since version 3.00 of tasksel
+ (thanks to Petter Reinholdtsen <[email protected]> for the patch)
+ Closes: #694896
+
+ -- Andreas Tille <[email protected]> Tue, 04 Dec 2012 11:00:45 +0100
+
+blends (0.6.16.1) unstable; urgency=low
+
+ * Revert bumping of debhelper and Standards-Version to match the
+ status of 0.6.15 and thus comply with freeze policy
+ * The fix to the sources.list* files to add the missing debian/ dirs
+ is now documented in BTS and this changelog entry
+ Closes: #693864
+
+ -- Andreas Tille <[email protected]> Wed, 21 Nov 2012 08:51:11 +0100
+
+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 <[email protected]> Fri, 16 Nov 2012 14:31:49 +0100
+
blends (0.6.15) unstable; urgency=low
* Documentation changes:
diff -Nru blends-0.6.15/debian/control blends-0.6.16.2/debian/control
--- blends-0.6.15/debian/control 2010-08-03 10:08:48.000000000 +0200
+++ blends-0.6.16.2/debian/control 2012-12-04 11:02:56.000000000 +0100
@@ -11,8 +11,8 @@
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/
+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.2/debian/copyright
--- blends-0.6.15/debian/copyright 2010-04-10 19:40:47.000000000 +0200
+++ blends-0.6.16.2/debian/copyright 2012-12-04 11:02:56.000000000 +0100
@@ -1,37 +1,25 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Andreas Tille <[email protected]>
-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 <[email protected]>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: © 2003-2008 Andreas Tille <[email protected]>
+Copyright: © 2003-2012 Andreas Tille <[email protected]>
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 <[email protected]>
- © 2007-2008 Andreas Tille <[email protected]>
+ © 2007-2012 Andreas Tille <[email protected]>
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 <[email protected]>
- © 2003-2008 Andreas Tille <[email protected]>
+ © 2003-2012 Andreas Tille <[email protected]>
+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/devtools/rules blends-0.6.16.2/devtools/rules
--- blends-0.6.15/devtools/rules 2010-11-10 20:56:14.000000000 +0100
+++ blends-0.6.16.2/devtools/rules 2012-12-04 11:02:56.000000000 +0100
@@ -34,7 +34,7 @@
override_dh_install:
$(BLEND_INSTALL_HELPER)
- dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel
+ dh_install $(BLENDNAME)-tasks.desc usr/share/tasksel/descs
override_dh_installdocs:
dh_installdocs $(INSTALLREADME)
diff -Nru blends-0.6.15/doc/Makefile blends-0.6.16.2/doc/Makefile
--- blends-0.6.15/doc/Makefile 2010-11-10 15:28:17.000000000 +0100
+++ blends-0.6.16.2/doc/Makefile 2012-12-04 11:02:56.000000000 +0100
@@ -27,8 +27,7 @@
## ----------------------------------------------------------------------
# this can and will be overriden by a higher level makefile
-PUBLISHDIR :=
alioth.debian.org:/srv/alioth.debian.org/chroot/home/groups/blends/htdocs/blends
-
+PUBLISHDIR := alioth.debian.org:/srv/home/groups/blends/htdocs/blends
# There is no difference between letter and a4, but a2 for instance works
PAPERSIZE := letter
diff -Nru blends-0.6.15/doc/en/00_titletoc.sgml
blends-0.6.16.2/doc/en/00_titletoc.sgml
--- blends-0.6.15/doc/en/00_titletoc.sgml 2010-11-10 15:28:16.000000000
+0100
+++ blends-0.6.16.2/doc/en/00_titletoc.sgml 2012-12-04 11:02:56.000000000
+0100
@@ -27,7 +27,7 @@
<copyright>
<copyrightsummary>
- Copyright © 2004 - 2010 Andreas Tille
+ Copyright © 2004 - 2011 Andreas Tille, Ben Armstrong
</copyrightsummary>
<p>
@@ -54,8 +54,8 @@
<p>
You can find the source of this article
- <url id="http://svn.debian.org/wsvn/blends/blends/trunk/blends/doc/";
- name="in the Subversion repository at svn.debian.org">.
+ <url id="http://git.debian.org/?p=blends/blends.git;a=tree;f=doc/en";
+ name="in the Git repository at git.debian.org">.
It is also available as Debian package <package>blends-doc</package>.
</p>
diff -Nru blends-0.6.15/doc/en/01_introduction.sgml
blends-0.6.16.2/doc/en/01_introduction.sgml
--- blends-0.6.15/doc/en/01_introduction.sgml 2010-11-10 15:28:16.000000000
+0100
+++ blends-0.6.16.2/doc/en/01_introduction.sgml 2012-12-04 11:02:56.000000000
+0100
@@ -9,7 +9,7 @@
packages tailored in a different way.
</p>
<p>
-Debian Pure Blends (formerly known as Custom Debian Distributions)
+Debian Pure Blends
provide support for special user interests. They implement a new
approach to cover interests of specialised users, who might be
children, lawyers, medical staff, visually impaired people, etc. Of
@@ -19,6 +19,14 @@
the missing link between software developers and users well.
</p>
<p>
+To clarify the relation between a Blend and a derivative which is
+frequently mixed up Ben Armstrong said in a
+<url id="http://lists.debian.org/debian-blends/2011/07/msg00010.html";
+ name="discussion on the Blends mailing list">:
+"While a Blend strives to mainstream with Debian, a derivative
+ strives to differentiate from Debian."
+</p>
+<p>
Using the object oriented approach as an analogy, if Debian as a whole
is an object, a Debian Pure Blend is an instance of this object that
inherits all features while providing certain properties.
diff -Nru blends-0.6.15/doc/en/02_about.sgml
blends-0.6.16.2/doc/en/02_about.sgml
--- blends-0.6.15/doc/en/02_about.sgml 2010-11-10 15:28:16.000000000 +0100
+++ blends-0.6.16.2/doc/en/02_about.sgml 2012-12-04 11:02:56.000000000
+0100
@@ -214,6 +214,98 @@
flavour. So if you obtain the complete Debian GNU/Linux distribution,
you have all available Debian Pure Blends included.
</p>
+<p>
+The concept of what is called <em>Blend</em> in Debian is also known
+in other distributions. For instance nn Fedora there are
+<url id="http://fedoraproject.org/wiki/SIGs"; name="Special Interest Groups
(SIGs)">
+even if some SIGs in Fedora are what in Debian is known as interntal
+project because it is focussed on technical implementetions and not
+on user oriented applications.
+</p>
+</sect>
+
+<sect>
+ <heading>Difference between a Blend and a remastered system</heading>
+
+<p>
+Not necessarily all currently existing Blends are actually providing
+installation media (live media or installer). The reason for this is
+that such installation media are not always necessary / wanted. You
+can just install plain Debian and install some metapackages on top of it.
+However, the metapackage approach makes the creation of installation
+media quite simple by using
+<url id="http://live.debian.net/"; name="Debian Live">.
+Here are some reasons for this approach compared to a remastering
+strategy.
+</p>
+
+<sect1>
+<heading>Technical</heading>
+<p>
+The process for creation of a blend involves starting with a Debian or
+derivative repository and creating an image directly from that (live,
+install or otherwise) that contains a selection of material from that
+repository delivered in such a way that it is usable by a particular
+target user for a particular purpose with a minimum of effort.
+</p>
+<p>
+By contrast, the process of remastering generally involves first
+downloading an image produced by the parent distro (live, install or
+otherwise,) then tearing it apart and reassembling it with your
+customizations applied.
+</p>
+</sect1>
+
+<sect1>
+<heading>Philosophical</heading>
+<p>
+The blends philosophy is to work as closely with the parent distro as
+possible. If possible, the project should be done entirely within the
+distro as a subproject, containing only material supplied by the parent
+distro. We call this a "Pure Blend".
+</p>
+<p>
+The remastering philosophy (if it can be called that) seems to be
+"whatever works" and involves little or no interaction with the parent
+distro. It's a lazy approach used by people who have newly discovered
+that they can hack images to make them into custom images to make
+something uniquely theirs. Probably fine for quick-and-dirty results,
+but hard to support in the long run.
+</p>
+<p>
+The users of a blend are served better than the users of a
+remaster because of the following advantages:
+</p>
+
+<sect2>
+<heading>Technical advantage</heading>
+<p>
+A new version of a well-crafted blend ought to be able to be produced at
+any time directly from the repository simply by building it; the user
+has some assurance that the resulting system remains 'untainted' by
+hacking it up with scripts that 'damage' the original system by removing
+files from packages, changing files in packages, etc. something that
+hurts maintainability / support for such a system.
+</p>
+</sect2>
+
+<sect2>
+<heading>Community advantage</heading>
+<p>
+A blend project aims to leverage support resources from the existing
+community to serve some sub-community within it. They accomplish this by
+not violating Debian packaging policy, producing something that is
+either pure Debian (a "pure blend") or Debian + additional packages,
+rather than some frankendistro artlessly stitched together from someone
+else's distro with scripts that change things everywhere with no regard
+to policy. Thus, normal support channels can be used with a pure blend
+since what you end up with is not a derivative at all, but just Debian,
+set up and ready to go for whatever you wanted to use it for.
+</p>
+</sect2>
+
+</sect1>
+
</sect>
</chapt>
diff -Nru blends-0.6.15/doc/en/08_websentinel.sgml
blends-0.6.16.2/doc/en/08_websentinel.sgml
--- blends-0.6.15/doc/en/08_websentinel.sgml 2010-11-10 15:28:16.000000000
+0100
+++ blends-0.6.16.2/doc/en/08_websentinel.sgml 2012-12-04 11:02:56.000000000
+0100
@@ -38,11 +38,33 @@
user of the Blend. Moreover the page can provide useful information for
developers about things that might be a useful help for the project to
work down the todo list and build Debian packages for software that is
-not yet included in Debian. To get the todo list builded it is
-necessary to add some additional information to the task files which
-are the main database of information for the Blend. The information is
-following the RFC822 syntax as all Debian control files do and is
-kept quite simple:
+not yet included in Debian.
+</p>
+
+ <sect id="edittasksfiles">
+ <heading>Tasks files controling web sentinel content</heading>
+
+<p>
+
+The content of the tasks files that are used to build the metapackage
+content of a Blend is also used to determine the content of the web
+sentinel pages. Thus you can influence the tasks pages by simply
+editing the tasks files inside the SVN of the sources of the Blends
+metapackages. The canonical location of these tasks files inside the
+sources is (with the exception of Debian Edu that is locatet in Debian
+Edu SVN repositories) the Blends SVN at
+<example>
+ svn://svn.debian.org/svn/blends/projects/BLEND/trunk/SRCPKG/tasks
+</example>
+Here you can add or remove additional Dependencies to existing packages
+or you can add additional information about so called prospective
+packages. The syntax how to do this is explained below.
+</p>
+<p>
+To get the todo list builded it is necessary to add some additional
+information to the task files which are the main database of information
+for the Blend. The information is following the RFC822 syntax as all
+Debian control files do and is kept quite simple:
<taglist>
<tag>Depends / Recommends / Suggests</tag>
<item>Even if there is no Debian package available for the moment
@@ -157,45 +179,18 @@
this registration page if the link is given in the tasks file
in the Registration field.
</item>
- <tag>Published-*</tag>
+ <tag>Published-* (deprecated)</tag>
<item>
- <p>Several scientific software asks users of the code to quote the
- publication which was used to describe the algorithm.
- There was a really long discussion on the
- <url id="http://lists.debian.org/debian-science"; name="Mailing
- list of Debian Science Blend">
- (<url id="http://lists.debian.org/debian-science/2008/10/msg00033.html";
- name="see the start of the thread here">) how this might be
- approached. There was some consensus that we need to define a
- general control file featuring the citation information but the
- problem has no real solution in the near future. To find an
- intermediate solution which solves the situation for the tasks
pages of Blends some <tt>Published-*</tt> tags can be inserted
- into the tasks file which are rendered on the according tasks
- pages. Here comes a list of these tags:
- </p>
- <p>
- <taglist>
- <tag>Published-Authors</tag>
- <item>Authors of the publication. For consistency reasons it is
- suggested to use <tt>Firstname1 Lastname1, Firstname2 Lastname2</tt>.
- </item>
- <tag>Published-Title</tag>
- <item>Title of the publication.
- </item>
- <tag>Published-URL</tag>
- <item>URL with online infos of the publication. The title will
- feature a link to this URL - so please make sure there is a
- Published-Title field if you specify Published-URL.
- </item>
- <tag>Published-In</tag>
- <item>Publication journal
- </item>
- <tag>Published-Year</tag>
- <item>Publication year
- </item>
- </taglist>
- </p>
- <p>Any suggestion to enhance these fields is welcome.
+ <p>These tags were previouosely used to specify scientific
+ publications. Its use is now deprecated and you rather
+ should use the file <file>debian/upstream</file> as documented in
+ <url id="http://wiki.debian.org/UpstreamMetadata"; name="Debian
+ Wiki">. The <file>debian/upstream</file> files will be gathered
+ in their state in SVN - so changes become effective after some
+ delay caused by cron jobs. This new way to handle publications
+ prevents code duplication and can be used more flexible by single
+ maintainers and is also useful for other purposes than only for
+ Blends sentinel.
</p>
</item>
</taglist>
diff -Nru blends-0.6.15/doc/en/09_todo.sgml blends-0.6.16.2/doc/en/09_todo.sgml
--- blends-0.6.15/doc/en/09_todo.sgml 2010-11-10 15:28:16.000000000 +0100
+++ blends-0.6.16.2/doc/en/09_todo.sgml 2012-12-04 11:02:56.000000000 +0100
@@ -29,10 +29,10 @@
<example>
blends -+- blends
| |
- | +- tags -----+- cdd -+- 0.3 [older versions of cdd tools]
- | | | +- 0.3.1
- | | | ...
- | | | +- <var><latest></var>
+ | +- tags -----+- blends -+- 0.3 [older versions of blends
tools]
+ | | | +- 0.3.1
+ | | | ...
+ | | | +- <var><latest></var>
| | |
| | +- doc -+- 0.1 [older versions of this doc]
| | +- 0.2
diff -Nru blends-0.6.15/doc/en/A_devel.sgml blends-0.6.16.2/doc/en/A_devel.sgml
--- blends-0.6.15/doc/en/A_devel.sgml 2010-11-10 15:28:16.000000000 +0100
+++ blends-0.6.16.2/doc/en/A_devel.sgml 2012-12-04 11:02:56.000000000 +0100
@@ -394,7 +394,7 @@
<sect id="svn">
- <heading>Working with <file>svn</file></heading>
+ <heading>Working with the source repository (<file>svn</file> in process of
moving to <file>git</file>)</heading>
<p>
Sometimes it might be interesting for developers to check out the
latest code of the Blend tools or a special Blend code for the meta
@@ -404,14 +404,15 @@
<taglist>
<tag>Checkout</tag>
<item>
- For the Blend tools
+ For the Blend tools and this documentation
<example>
- svn checkout
svn+ssh://<var>username</var>@svn.debian.org/svn/blends/blends/trunk/blends
blends
+ git clone git+ssh://<var>username</var>@git.debian.org/git/blends/blends.git
</example>
or for the Debian Pure Blend <var>BLEND-name</var>
<example>
svn checkout
svn+ssh://<var>username</var>@svn.debian.org/svn/blends/projects/<var>BLEND-name</var>/trunk
</example>
+ Note: This will be moved to Git (at least) soon after Wheezy release.
</item>
<tag>Build source package</tag>
<item>
@@ -480,17 +481,16 @@
you like a login on this host.
</p>
<p>
-The code which builds web and tasks pages is available in SVN at
-<tt>svn://svn.debian.org/blends/blends/trunk/webtools</tt>. It is
+The code which builds web and tasks pages is available in Git at
+<tt>git://git.debian.org/git/blends/website.git</tt>. It is
using the <url id="http://genshi.edgewall.org/"; name="Genshi
templating system"> which enables influencing the layout of the pages
-by editing the templates in
-<tt>svn://svn.debian.org/blends/blends/trunk/webtools/templates</tt>.
+by editing the templates in the
+<file>templates</file> directory.
You can also influence some parameters of the web pages in the
-configuration files
-<tt>svn://svn.debian.org/blends/blends/trunk/webtools/webconf</tt>.
+configuration files in the <file>webconf</file> directory.
Last but not least you can provide translations for the web pages in
-<tt>svn://svn.debian.org/blends/blends/trunk/webtools/po</tt>.
+the <file>po</file> directory.
</p>
<p>
Once something on the web pages was changed you can activate the
@@ -500,7 +500,7 @@
<enumlist>
<item>Login to <tt>alioth.debian.org</tt> or
<tt>blends.debian.net</tt></item>
<item><tt>cd /var/lib/gforge/chroot/home/groups/blends/webtools/</tt></item>
- <item><tt>./deploy-svn</tt></item>
+ <item><tt>./deploy-dynamic-pages</tt></item>
</enumlist>
</p>
<p>
@@ -531,8 +531,9 @@
should care for this!
</p>
<p>
-The static pages are maintained in SVN at
-<tt>svn://svn.debian.org/blends/blends/trunk/websites</tt>.
+The static pages are maintained in Git at
+<tt>git://git.debian.org/git/blends/website.git</tt> in the
+<file>websites</file> directory.
Once you have changed the content of the pages you can activate
the changes by doing:
</p>
@@ -540,7 +541,7 @@
<enumlist>
<item>Login to <tt>alioth.debian.org</tt> or
<tt>blends.debian.net</tt></item>
<item><tt>cd /var/lib/gforge/chroot/home/groups/blends/webtools/</tt></item>
- <item><tt>./deploy-static-pages</tt></item>
+ <item><tt>git pull</tt></item>
</enumlist>
</p>
</sect>
diff -Nru blends-0.6.15/doc/en/C_bts.sgml blends-0.6.16.2/doc/en/C_bts.sgml
--- blends-0.6.15/doc/en/C_bts.sgml 2010-11-10 15:28:16.000000000 +0100
+++ blends-0.6.16.2/doc/en/C_bts.sgml 2012-12-04 11:02:56.000000000 +0100
@@ -18,52 +18,14 @@
program <prgn>reportbug</prgn> for this purpose.
</p>
<p>
-If you use wnpp sanely you can even tag this bug for the intended
-purpose to include it in a certain Debian Pure Blend. This was
-described
-in <url
id="http://lists.debian.org/debian-devel-announce/2005/09/msg00002.html";
-name="a mail of Anthony Towns"> and
-<url
-id="http://wiki.debian.org/DebianScience/Sponsoring";
-name="the Debian wiki">. It was also described in
-<url id="http://lists.debian.org/debian-custom/2005/04/msg00017.html";
-name="a mail of Ben Armstrong"> and in short works like this:
-
-<list>
- <item><p>
- Add an usertag to an existing bug by sending to
- [email protected] a mail containing
- <example>
- user <email>
- usertag <bug�number> + wnpp <metapackage name>
- </example>,
- where email is the electronic address of the person or mailing
- list which coordinates the relevant Debian Pure Blend.
- </p>
- <p>
- For instance if you want to tag an ITP with bug number
- #123456 for Debian Med section biology you would send the
- following mail to <email>[email protected] </email>:
- <example>
- user [email protected]
- usertag 123456 + wnpp med-bio
- thanks
- </example>
- </p>
- <p>
- <strong>Note:</strong> Because the search is case sensitive
- please always use lower case tags!
- </p>
- </item>
- <item>To search for WNPP bugs of a certain Debian Pure Blend just
- visit the URL
-<example>
-http://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=wnpp;users=<var>email</var>
-</example>
- </item>
-</list>
-
-
+In Debian Pure Blends some house keeping of interesting packages is done
+and once an ITP is issued it should be mentioned at the relevant tasks
+page to keep other team members informed. To make this happen it is a
+minimum requirement to at least foreward the ITP mail to the relevant
+mailing list crossing fingers that somebody feels responsible to enter
+this information into the according tasks file. It is even better if
+you just include the information yourself (see <ref id="packageslist">
+for more details).
</p>
</sect>
diff -Nru blends-0.6.15/share/blends/blend-actions
blends-0.6.16.2/share/blends/blend-actions
--- blends-0.6.15/share/blends/blend-actions 2010-04-10 19:40:47.000000000
+0200
+++ blends-0.6.16.2/share/blends/blend-actions 2012-12-04 11:02:56.000000000
+0100
@@ -1,4 +1,4 @@
-# $Id: blend-actions 1255 2008-11-19 21:53:43Z tille $
+# $Id$
#
# Backend independant functions for blends package
#
diff -Nru blends-0.6.15/share/blends/blend-update-menus
blends-0.6.16.2/share/blends/blend-update-menus
--- blends-0.6.15/share/blends/blend-update-menus 2010-04-10
19:40:47.000000000 +0200
+++ blends-0.6.16.2/share/blends/blend-update-menus 2012-12-04
11:02:56.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: blend-update-menus 1142 2008-10-26 06:15:36Z tille $
+# $Id$
# check if I am a specific user
amI() {
diff -Nru blends-0.6.15/share/blends/unixgroups/blend-actions
blends-0.6.16.2/share/blends/unixgroups/blend-actions
--- blends-0.6.15/share/blends/unixgroups/blend-actions 2010-04-10
19:40:47.000000000 +0200
+++ blends-0.6.16.2/share/blends/unixgroups/blend-actions 2012-12-04
11:02:56.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: blend-actions 1195 2008-11-02 16:10:33Z tille $
+# $Id$
#
# Backend dependant functions for blends package
#
diff -Nru blends-0.6.15/sources.list blends-0.6.16.2/sources.list
--- blends-0.6.15/sources.list 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16.2/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.UNRELEASED
blends-0.6.16.2/sources.list.UNRELEASED
--- blends-0.6.15/sources.list.UNRELEASED 2010-04-10 19:40:51.000000000
+0200
+++ blends-0.6.16.2/sources.list.UNRELEASED 2012-12-04 11:02:56.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.experimental
blends-0.6.16.2/sources.list.experimental
--- blends-0.6.15/sources.list.experimental 2010-04-10 19:40:51.000000000
+0200
+++ blends-0.6.16.2/sources.list.experimental 2012-12-04 11:02:56.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.2/sources.list.stable
--- blends-0.6.15/sources.list.stable 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16.2/sources.list.stable 2012-12-04 11:02:56.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.2/sources.list.testing
--- blends-0.6.15/sources.list.testing 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16.2/sources.list.testing 2012-12-04 11:02:56.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.unstable
blends-0.6.16.2/sources.list.unstable
--- blends-0.6.15/sources.list.unstable 2010-04-10 19:40:51.000000000 +0200
+++ blends-0.6.16.2/sources.list.unstable 2012-12-04 11:02:56.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
