Merge lp:~logan/ubuntu/raring/blends/debian-merge into lp:ubuntu/raring/blends
- Raring (13.04)
- debian-merge
- Merge into raring
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merged at revision: | 15 |
Proposed branch: | lp:~logan/ubuntu/raring/blends/debian-merge |
Merge into: | lp:ubuntu/raring/blends |
Diff against target: |
765 lines (+231/-194) 26 files modified
blend-role (+1/-1) blend-update-menus (+1/-1) blend-update-usermenus (+1/-1) blend-user (+1/-1) debian/cdd-common.links (+0/-17) debian/cdd-dev.links (+0/-7) debian/changelog (+35/-1) debian/control (+3/-22) debian/copyright (+10/-22) doc/Makefile (+1/-2) doc/en/00_titletoc.sgml (+3/-3) doc/en/01_introduction.sgml (+9/-1) doc/en/02_about.sgml (+92/-0) doc/en/08_websentinel.sgml (+38/-43) doc/en/09_todo.sgml (+4/-4) doc/en/A_devel.sgml (+15/-14) doc/en/C_bts.sgml (+8/-46) share/blends/blend-actions (+1/-1) share/blends/blend-update-menus (+1/-1) share/blends/unixgroups/blend-actions (+1/-1) sources.list.UNRELEASED (+1/-1) sources.list.experimental (+1/-1) sources.list.raring (+1/-0) sources.list.stable (+1/-1) sources.list.testing (+1/-1) sources.list.unstable (+1/-1) |
To merge this branch: | bzr merge lp:~logan/ubuntu/raring/blends/debian-merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Starr-Bochicchio (community) | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+137443@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'blend-role' |
2 | --- blend-role 2009-01-30 19:30:53 +0000 |
3 | +++ blend-role 2012-12-02 20:31:28 +0000 |
4 | @@ -1,6 +1,6 @@ |
5 | #!/bin/bash |
6 | # |
7 | -# $Id: blend-role 1195 2008-11-02 16:10:33Z tille $ |
8 | +# $Id$ |
9 | |
10 | usage () { |
11 | echo "Usage: `basename $0` <action> <Blend> [<role>]" |
12 | |
13 | === modified file 'blend-update-menus' |
14 | --- blend-update-menus 2010-11-10 20:32:31 +0000 |
15 | +++ blend-update-menus 2012-12-02 20:31:28 +0000 |
16 | @@ -1,6 +1,6 @@ |
17 | #!/bin/bash |
18 | # |
19 | -# $Id: blend-update-menus 2111 2010-03-20 21:23:54Z tille $ |
20 | +# $Id$ |
21 | |
22 | usage() { |
23 | echo "Usage: `basename $0` [ -u <user> | -b <Blend> ]" |
24 | |
25 | === modified file 'blend-update-usermenus' |
26 | --- blend-update-usermenus 2009-01-30 19:30:53 +0000 |
27 | +++ blend-update-usermenus 2012-12-02 20:31:28 +0000 |
28 | @@ -1,6 +1,6 @@ |
29 | #!/bin/bash |
30 | # |
31 | -# $Id: blend-update-usermenus 1207 2008-11-05 21:21:57Z tille $ |
32 | +# $Id$ |
33 | |
34 | usage() { |
35 | echo "Usage: `basename $0` <Blend>" |
36 | |
37 | === modified file 'blend-user' |
38 | --- blend-user 2009-01-30 19:30:53 +0000 |
39 | +++ blend-user 2012-12-02 20:31:28 +0000 |
40 | @@ -1,6 +1,6 @@ |
41 | #!/bin/bash |
42 | # |
43 | -# $Id: blend-user 1208 2008-11-05 21:33:34Z tille $ |
44 | +# $Id$ |
45 | |
46 | usage () { |
47 | echo "Usage: `basename $0` <action> <Blend> <user> [<Role>]" |
48 | |
49 | === removed file 'debian/cdd-common.links' |
50 | --- debian/cdd-common.links 2009-01-30 19:30:53 +0000 |
51 | +++ debian/cdd-common.links 1970-01-01 00:00:00 +0000 |
52 | @@ -1,17 +0,0 @@ |
53 | -usr/share/blends/unixgroups/blend-actions usr/share/cdd/unixgroups/cdd-actions |
54 | -usr/share/blends/blend-actions usr/share/cdd/cdd-actions |
55 | -usr/share/blends/blend-update-menus usr/share/cdd/cdd-update-menus |
56 | -usr/share/blends/blend-utils usr/share/cdd/cdd-utils |
57 | -usr/share/blends/blend-task-lister usr/share/cdd/cdd-task-lister |
58 | -usr/share/man/man8/blend-actions.8.gz usr/share/man/man8/cdd-actions.8.gz |
59 | -usr/share/man/man8/blend-update-menus.8.gz usr/share/man/man8/cdd-update-menus.8.gz |
60 | -usr/share/man/man8/blend-utils.8.gz usr/share/man/man8/cdd-utils.8.gz |
61 | -usr/share/man/man8/blend-task-lister.8.gz usr/share/man/man8/cdd-task-lister.8.gz |
62 | -usr/sbin/blend-user usr/sbin/cdd-user |
63 | -usr/sbin/blend-role usr/sbin/cdd-role |
64 | -usr/sbin/blend-update-menus usr/sbin/cdd-update-menus |
65 | -usr/sbin/blend-update-usermenus usr/sbin/cdd-update-usermenus |
66 | -usr/share/doc/blends-common usr/share/doc/cdd-common |
67 | -usr/share/man/man8/blend-role.8.gz usr/share/man/man8/cdd-role.8.gz |
68 | -usr/share/man/man8/blend-update-usermenus.8.gz usr/share/man/man8/cdd-update-usermenus.8.gz |
69 | -usr/share/man/man8/blend-user.8.gz usr/share/man/man8/cdd-user.8.gz |
70 | |
71 | === removed file 'debian/cdd-dev.links' |
72 | --- debian/cdd-dev.links 2009-01-30 19:30:53 +0000 |
73 | +++ debian/cdd-dev.links 1970-01-01 00:00:00 +0000 |
74 | @@ -1,7 +0,0 @@ |
75 | -usr/share/blends/templates usr/share/cdd/templates |
76 | -usr/share/blends-dev/blend-gen-control usr/share/cdd-dev/cdd-gen-control |
77 | -usr/share/blends-dev/blend-get-names usr/share/cdd-dev/cdd-get-names |
78 | -usr/share/blends-dev/blend-install-helper usr/share/cdd-dev/cdd-install-helper |
79 | -usr/share/blends-dev/Makefile usr/share/cdd-dev/Makefile |
80 | -usr/share/blends-dev/rules usr/share/cdd-dev/rules |
81 | -usr/share/doc/blends-dev usr/share/doc/cdd-dev |
82 | |
83 | === modified file 'debian/changelog' |
84 | --- debian/changelog 2012-07-03 00:01:04 +0000 |
85 | +++ debian/changelog 2012-12-02 20:31:28 +0000 |
86 | @@ -1,3 +1,37 @@ |
87 | +blends (0.6.16.1ubuntu1) raring; urgency=low |
88 | + |
89 | + * Merge from Debian unstable. Remaining changes: |
90 | + - Add sources.list.{karmic,lucid,maverick,natty,oneiric,precise,quantal} |
91 | + so blends can be built for Ubuntu. |
92 | + * Add sources.list.raring. |
93 | + |
94 | + -- Logan Rosen <logatronico@gmail.com> Sun, 02 Dec 2012 15:23:54 -0500 |
95 | + |
96 | +blends (0.6.16.1) unstable; urgency=low |
97 | + |
98 | + * Revert bumping of debhelper and Standards-Version to match the |
99 | + status of 0.6.15 and thus comply with freeze policy |
100 | + * The fix to the sources.list* files to add the missing debian/ dirs |
101 | + is now documented in BTS and this changelog entry |
102 | + Closes: #693864 |
103 | + |
104 | + -- Andreas Tille <tille@debian.org> Wed, 21 Nov 2012 08:51:11 +0100 |
105 | + |
106 | +blends (0.6.16) unstable; urgency=low |
107 | + |
108 | + * Enhanced doc |
109 | + * sources.list/*: Add the missing debian/ dirs |
110 | + * debian/control: |
111 | + - Standards-Version: 3.9.3 |
112 | + - Vcs-Fields now point to Git |
113 | + * Debhelper 9 (control+compat) |
114 | + * Drop transitional cdd-* packages completely |
115 | + Closes: #692946 |
116 | + * DEP5 formated copyright while checking this in connection to |
117 | + bug #692946 |
118 | + |
119 | + -- Andreas Tille <tille@debian.org> Fri, 16 Nov 2012 14:31:49 +0100 |
120 | + |
121 | blends (0.6.15ubuntu3) quantal; urgency=low |
122 | |
123 | * Add sources.list.quantal |
124 | @@ -63,7 +97,7 @@ |
125 | for Ubuntu 9.10 and 10.04. |
126 | * Added sources.list.maverick |
127 | |
128 | - -- Fabrice Coutadeur <fabricesp@ubuntu.com> Tue, 18 May 2010 19:30:16 +0000 |
129 | + -- Fabrice Coutadeur <fabricesp@ubuntu.com> Tue, 18 May 2010 19:30:16 +0000 |
130 | |
131 | blends (0.6.13) unstable; urgency=low |
132 | |
133 | |
134 | === modified file 'debian/control' |
135 | --- debian/control 2010-08-04 11:41:01 +0000 |
136 | +++ debian/control 2012-12-02 20:31:28 +0000 |
137 | @@ -12,8 +12,8 @@ |
138 | Build-Depends-Indep: debiandoc-sgml, texlive-latex-base, texlive-latex-extra, |
139 | texlive-latex-recommended, texlive-fonts-recommended, ghostscript |
140 | Standards-Version: 3.9.1 |
141 | -Vcs-Browser: http://svn.debian.org/wsvn/blends/blends/trunk/blends/?rev=0&sc=0 |
142 | -Vcs-Svn: svn://svn.debian.org/blends/blends/trunk/blends/ |
143 | +Vcs-Browser: http://git.debian.org/?p=blends/blends.git |
144 | +Vcs-Git: git://git.debian.org/git/blends/blends.git |
145 | |
146 | Package: blends-dev |
147 | Architecture: all |
148 | @@ -21,21 +21,13 @@ |
149 | Depends: debconf (>= 0.5) | debconf-2.0, make | build-essential, apt, |
150 | debhelper (>= 7), ${misc:Depends} |
151 | Suggests: blends-doc |
152 | +Replaces: cdd-dev |
153 | Description: Debian Pure Blends common files for developing metapackages |
154 | This package makes life easier when packaging metapackages. Perhaps |
155 | this will also encourage other people to build metapackages if there are |
156 | easy to use templates where only the packages, the metapackage is depending |
157 | from, to insert into the right place. |
158 | |
159 | -Package: cdd-dev |
160 | -Architecture: all |
161 | -Section: devel |
162 | -Depends: blends-dev, ${misc:Depends} |
163 | -Description: Debian Pure Blends dummy package for upgrades from cdd-dev |
164 | - After renaming Custom Debian Distributions to Debian Pure Blends we |
165 | - have to make sure that upgrades work smoothly. This package provides |
166 | - symlinks to all the tools of blends-dev with the old cdd names. |
167 | - |
168 | Package: blends-common |
169 | Architecture: all |
170 | Section: misc |
171 | @@ -49,23 +41,12 @@ |
172 | system users in a group named according to the name of the |
173 | Debian Pure Blend. |
174 | |
175 | -Package: cdd-common |
176 | -Architecture: all |
177 | -Section: misc |
178 | -Depends: blends-common, ${misc:Depends} |
179 | -Description: Debian Pure Blends dummy package for upgrades from cdd-common |
180 | - After renaming Custom Debian Distributions to Debian Pure Blends we |
181 | - have to make sure that upgrades work smoothly. This package provides |
182 | - symlinks to all the tools of blends-common with the old cdd names. |
183 | - |
184 | Package: blends-doc |
185 | Architecture: all |
186 | Section: doc |
187 | Depends: ${misc:Depends} |
188 | Suggests: www-browser, postscript-viewer |
189 | -Provides: cdd-doc |
190 | Replaces: cdd-doc |
191 | -Conflicts: cdd-doc |
192 | Description: Debian Pure Blends documentation |
193 | This paper is intended to people who are interested in the philosophy |
194 | of Debian Pure Blends and the technique which is used to |
195 | |
196 | === modified file 'debian/copyright' |
197 | --- debian/copyright 2009-01-30 19:30:53 +0000 |
198 | +++ debian/copyright 2012-12-02 20:31:28 +0000 |
199 | @@ -1,37 +1,25 @@ |
200 | -X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat |
201 | -X-Debianized-By: Andreas Tille <tille@debian.org> |
202 | -X-Debinized-Date: Tue, 23 Mar 2004 18:41:20 +0100 |
203 | -X-Source-Downloaded-From: http://bio.math.berkeley.edu/amap/download |
204 | -X-Upstream-Author: 2003-2008 Andreas Tille <tille@debian.org> |
205 | +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ |
206 | |
207 | Files: * |
208 | -Copyright: © 2003-2008 Andreas Tille <tille@debian.org> |
209 | +Copyright: © 2003-2012 Andreas Tille <tille@debian.org> |
210 | License: GPL-2+ |
211 | - This package is free software; you can redistribute it and/or modify |
212 | - it under the terms of the GNU General Public License as published by |
213 | - the Free Software Foundation; either version 2 of the License, or |
214 | -,(at your option) any later version. |
215 | -X-Comment: On Debian systems, the complete text of the GNU GPL version 2 |
216 | - can be found in: `/usr/share/common-licenses/GPL-2' |
217 | |
218 | Files: devtools/blend-gen-control |
219 | Copyright: © 2003-2007 Petter Reinholdtsen <pere@debian.org> |
220 | - © 2007-2008 Andreas Tille <tille@debian.org> |
221 | + © 2007-2012 Andreas Tille <tille@debian.org> |
222 | License: GPL-2+ |
223 | - This package is free software; you can redistribute it and/or modify |
224 | - it under the terms of the GNU General Public License as published by |
225 | - the Free Software Foundation; either version 2 of the License, or |
226 | -,(at your option) any later version. |
227 | -X-Comment: On Debian systems, the complete text of the GNU GPL version 2 |
228 | - can be found in: `/usr/share/common-licenses/GPL-2' |
229 | |
230 | Files: share/blends/* |
231 | Copyright: © 2003 Cosimo Alfarano <kalfa@debian.org> |
232 | - © 2003-2008 Andreas Tille <tille@debian.org> |
233 | + © 2003-2012 Andreas Tille <tille@debian.org> |
234 | +License: GPL-2+ |
235 | + |
236 | License: GPL-2+ |
237 | This package is free software; you can redistribute it and/or modify |
238 | it under the terms of the GNU General Public License as published by |
239 | the Free Software Foundation; either version 2 of the License, or |
240 | -,(at your option) any later version. |
241 | -X-Comment: On Debian systems, the complete text of the GNU GPL version 2 |
242 | + (at your option) any later version. |
243 | + . |
244 | + On Debian systems, the complete text of the GNU GPL version 2 |
245 | can be found in: `/usr/share/common-licenses/GPL-2' |
246 | + |
247 | |
248 | === modified file 'doc/Makefile' |
249 | --- doc/Makefile 2009-01-30 19:30:53 +0000 |
250 | +++ doc/Makefile 2012-12-02 20:31:28 +0000 |
251 | @@ -27,8 +27,7 @@ |
252 | |
253 | ## ---------------------------------------------------------------------- |
254 | # this can and will be overriden by a higher level makefile |
255 | -PUBLISHDIR := alioth.debian.org:/srv/alioth.debian.org/chroot/home/groups/blends/htdocs/blends |
256 | - |
257 | +PUBLISHDIR := alioth.debian.org:/srv/home/groups/blends/htdocs/blends |
258 | # There is no difference between letter and a4, but a2 for instance works |
259 | PAPERSIZE := letter |
260 | |
261 | |
262 | === modified file 'doc/en/00_titletoc.sgml' |
263 | --- doc/en/00_titletoc.sgml 2010-08-03 10:03:45 +0000 |
264 | +++ doc/en/00_titletoc.sgml 2012-12-02 20:31:28 +0000 |
265 | @@ -27,7 +27,7 @@ |
266 | |
267 | <copyright> |
268 | <copyrightsummary> |
269 | - Copyright © 2004 - 2010 Andreas Tille |
270 | + Copyright © 2004 - 2011 Andreas Tille, Ben Armstrong |
271 | </copyrightsummary> |
272 | |
273 | <p> |
274 | @@ -54,8 +54,8 @@ |
275 | |
276 | <p> |
277 | You can find the source of this article |
278 | - <url id="http://svn.debian.org/wsvn/blends/blends/trunk/blends/doc/" |
279 | - name="in the Subversion repository at svn.debian.org">. |
280 | + <url id="http://git.debian.org/?p=blends/blends.git;a=tree;f=doc/en" |
281 | + name="in the Git repository at git.debian.org">. |
282 | It is also available as Debian package <package>blends-doc</package>. |
283 | </p> |
284 | |
285 | |
286 | === modified file 'doc/en/01_introduction.sgml' |
287 | --- doc/en/01_introduction.sgml 2009-04-10 21:26:00 +0000 |
288 | +++ doc/en/01_introduction.sgml 2012-12-02 20:31:28 +0000 |
289 | @@ -9,7 +9,7 @@ |
290 | packages tailored in a different way. |
291 | </p> |
292 | <p> |
293 | -Debian Pure Blends (formerly known as Custom Debian Distributions) |
294 | +Debian Pure Blends |
295 | provide support for special user interests. They implement a new |
296 | approach to cover interests of specialised users, who might be |
297 | children, lawyers, medical staff, visually impaired people, etc. Of |
298 | @@ -19,6 +19,14 @@ |
299 | the missing link between software developers and users well. |
300 | </p> |
301 | <p> |
302 | +To clarify the relation between a Blend and a derivative which is |
303 | +frequently mixed up Ben Armstrong said in a |
304 | +<url id="http://lists.debian.org/debian-blends/2011/07/msg00010.html" |
305 | + name="discussion on the Blends mailing list">: |
306 | +"While a Blend strives to mainstream with Debian, a derivative |
307 | + strives to differentiate from Debian." |
308 | +</p> |
309 | +<p> |
310 | Using the object oriented approach as an analogy, if Debian as a whole |
311 | is an object, a Debian Pure Blend is an instance of this object that |
312 | inherits all features while providing certain properties. |
313 | |
314 | === modified file 'doc/en/02_about.sgml' |
315 | --- doc/en/02_about.sgml 2009-11-04 22:25:05 +0000 |
316 | +++ doc/en/02_about.sgml 2012-12-02 20:31:28 +0000 |
317 | @@ -214,6 +214,98 @@ |
318 | flavour. So if you obtain the complete Debian GNU/Linux distribution, |
319 | you have all available Debian Pure Blends included. |
320 | </p> |
321 | +<p> |
322 | +The concept of what is called <em>Blend</em> in Debian is also known |
323 | +in other distributions. For instance nn Fedora there are |
324 | +<url id="http://fedoraproject.org/wiki/SIGs" name="Special Interest Groups (SIGs)"> |
325 | +even if some SIGs in Fedora are what in Debian is known as interntal |
326 | +project because it is focussed on technical implementetions and not |
327 | +on user oriented applications. |
328 | +</p> |
329 | +</sect> |
330 | + |
331 | +<sect> |
332 | + <heading>Difference between a Blend and a remastered system</heading> |
333 | + |
334 | +<p> |
335 | +Not necessarily all currently existing Blends are actually providing |
336 | +installation media (live media or installer). The reason for this is |
337 | +that such installation media are not always necessary / wanted. You |
338 | +can just install plain Debian and install some metapackages on top of it. |
339 | +However, the metapackage approach makes the creation of installation |
340 | +media quite simple by using |
341 | +<url id="http://live.debian.net/" name="Debian Live">. |
342 | +Here are some reasons for this approach compared to a remastering |
343 | +strategy. |
344 | +</p> |
345 | + |
346 | +<sect1> |
347 | +<heading>Technical</heading> |
348 | +<p> |
349 | +The process for creation of a blend involves starting with a Debian or |
350 | +derivative repository and creating an image directly from that (live, |
351 | +install or otherwise) that contains a selection of material from that |
352 | +repository delivered in such a way that it is usable by a particular |
353 | +target user for a particular purpose with a minimum of effort. |
354 | +</p> |
355 | +<p> |
356 | +By contrast, the process of remastering generally involves first |
357 | +downloading an image produced by the parent distro (live, install or |
358 | +otherwise,) then tearing it apart and reassembling it with your |
359 | +customizations applied. |
360 | +</p> |
361 | +</sect1> |
362 | + |
363 | +<sect1> |
364 | +<heading>Philosophical</heading> |
365 | +<p> |
366 | +The blends philosophy is to work as closely with the parent distro as |
367 | +possible. If possible, the project should be done entirely within the |
368 | +distro as a subproject, containing only material supplied by the parent |
369 | +distro. We call this a "Pure Blend". |
370 | +</p> |
371 | +<p> |
372 | +The remastering philosophy (if it can be called that) seems to be |
373 | +"whatever works" and involves little or no interaction with the parent |
374 | +distro. It's a lazy approach used by people who have newly discovered |
375 | +that they can hack images to make them into custom images to make |
376 | +something uniquely theirs. Probably fine for quick-and-dirty results, |
377 | +but hard to support in the long run. |
378 | +</p> |
379 | +<p> |
380 | +The users of a blend are served better than the users of a |
381 | +remaster because of the following advantages: |
382 | +</p> |
383 | + |
384 | +<sect2> |
385 | +<heading>Technical advantage</heading> |
386 | +<p> |
387 | +A new version of a well-crafted blend ought to be able to be produced at |
388 | +any time directly from the repository simply by building it; the user |
389 | +has some assurance that the resulting system remains 'untainted' by |
390 | +hacking it up with scripts that 'damage' the original system by removing |
391 | +files from packages, changing files in packages, etc. something that |
392 | +hurts maintainability / support for such a system. |
393 | +</p> |
394 | +</sect2> |
395 | + |
396 | +<sect2> |
397 | +<heading>Community advantage</heading> |
398 | +<p> |
399 | +A blend project aims to leverage support resources from the existing |
400 | +community to serve some sub-community within it. They accomplish this by |
401 | +not violating Debian packaging policy, producing something that is |
402 | +either pure Debian (a "pure blend") or Debian + additional packages, |
403 | +rather than some frankendistro artlessly stitched together from someone |
404 | +else's distro with scripts that change things everywhere with no regard |
405 | +to policy. Thus, normal support channels can be used with a pure blend |
406 | +since what you end up with is not a derivative at all, but just Debian, |
407 | +set up and ready to go for whatever you wanted to use it for. |
408 | +</p> |
409 | +</sect2> |
410 | + |
411 | +</sect1> |
412 | + |
413 | </sect> |
414 | |
415 | </chapt> |
416 | |
417 | === modified file 'doc/en/08_websentinel.sgml' |
418 | --- doc/en/08_websentinel.sgml 2010-08-03 10:03:45 +0000 |
419 | +++ doc/en/08_websentinel.sgml 2012-12-02 20:31:28 +0000 |
420 | @@ -38,11 +38,33 @@ |
421 | user of the Blend. Moreover the page can provide useful information for |
422 | developers about things that might be a useful help for the project to |
423 | work down the todo list and build Debian packages for software that is |
424 | -not yet included in Debian. To get the todo list builded it is |
425 | -necessary to add some additional information to the task files which |
426 | -are the main database of information for the Blend. The information is |
427 | -following the RFC822 syntax as all Debian control files do and is |
428 | -kept quite simple: |
429 | +not yet included in Debian. |
430 | +</p> |
431 | + |
432 | + <sect id="edittasksfiles"> |
433 | + <heading>Tasks files controling web sentinel content</heading> |
434 | + |
435 | +<p> |
436 | + |
437 | +The content of the tasks files that are used to build the metapackage |
438 | +content of a Blend is also used to determine the content of the web |
439 | +sentinel pages. Thus you can influence the tasks pages by simply |
440 | +editing the tasks files inside the SVN of the sources of the Blends |
441 | +metapackages. The canonical location of these tasks files inside the |
442 | +sources is (with the exception of Debian Edu that is locatet in Debian |
443 | +Edu SVN repositories) the Blends SVN at |
444 | +<example> |
445 | + svn://svn.debian.org/svn/blends/projects/BLEND/trunk/SRCPKG/tasks |
446 | +</example> |
447 | +Here you can add or remove additional Dependencies to existing packages |
448 | +or you can add additional information about so called prospective |
449 | +packages. The syntax how to do this is explained below. |
450 | +</p> |
451 | +<p> |
452 | +To get the todo list builded it is necessary to add some additional |
453 | +information to the task files which are the main database of information |
454 | +for the Blend. The information is following the RFC822 syntax as all |
455 | +Debian control files do and is kept quite simple: |
456 | <taglist> |
457 | <tag>Depends / Recommends / Suggests</tag> |
458 | <item>Even if there is no Debian package available for the moment |
459 | @@ -157,45 +179,18 @@ |
460 | this registration page if the link is given in the tasks file |
461 | in the Registration field. |
462 | </item> |
463 | - <tag>Published-*</tag> |
464 | + <tag>Published-* (deprecated)</tag> |
465 | <item> |
466 | - <p>Several scientific software asks users of the code to quote the |
467 | - publication which was used to describe the algorithm. |
468 | - There was a really long discussion on the |
469 | - <url id="http://lists.debian.org/debian-science" name="Mailing |
470 | - list of Debian Science Blend"> |
471 | - (<url id="http://lists.debian.org/debian-science/2008/10/msg00033.html" |
472 | - name="see the start of the thread here">) how this might be |
473 | - approached. There was some consensus that we need to define a |
474 | - general control file featuring the citation information but the |
475 | - problem has no real solution in the near future. To find an |
476 | - intermediate solution which solves the situation for the tasks pages of Blends some <tt>Published-*</tt> tags can be inserted |
477 | - into the tasks file which are rendered on the according tasks |
478 | - pages. Here comes a list of these tags: |
479 | - </p> |
480 | - <p> |
481 | - <taglist> |
482 | - <tag>Published-Authors</tag> |
483 | - <item>Authors of the publication. For consistency reasons it is |
484 | - suggested to use <tt>Firstname1 Lastname1, Firstname2 Lastname2</tt>. |
485 | - </item> |
486 | - <tag>Published-Title</tag> |
487 | - <item>Title of the publication. |
488 | - </item> |
489 | - <tag>Published-URL</tag> |
490 | - <item>URL with online infos of the publication. The title will |
491 | - feature a link to this URL - so please make sure there is a |
492 | - Published-Title field if you specify Published-URL. |
493 | - </item> |
494 | - <tag>Published-In</tag> |
495 | - <item>Publication journal |
496 | - </item> |
497 | - <tag>Published-Year</tag> |
498 | - <item>Publication year |
499 | - </item> |
500 | - </taglist> |
501 | - </p> |
502 | - <p>Any suggestion to enhance these fields is welcome. |
503 | + <p>These tags were previouosely used to specify scientific |
504 | + publications. Its use is now deprecated and you rather |
505 | + should use the file <file>debian/upstream</file> as documented in |
506 | + <url id="http://wiki.debian.org/UpstreamMetadata" name="Debian |
507 | + Wiki">. The <file>debian/upstream</file> files will be gathered |
508 | + in their state in SVN - so changes become effective after some |
509 | + delay caused by cron jobs. This new way to handle publications |
510 | + prevents code duplication and can be used more flexible by single |
511 | + maintainers and is also useful for other purposes than only for |
512 | + Blends sentinel. |
513 | </p> |
514 | </item> |
515 | </taglist> |
516 | |
517 | === modified file 'doc/en/09_todo.sgml' |
518 | --- doc/en/09_todo.sgml 2010-11-10 20:32:31 +0000 |
519 | +++ doc/en/09_todo.sgml 2012-12-02 20:31:28 +0000 |
520 | @@ -29,10 +29,10 @@ |
521 | <example> |
522 | blends -+- blends |
523 | | | |
524 | - | +- tags -----+- cdd -+- 0.3 [older versions of cdd tools] |
525 | - | | | +- 0.3.1 |
526 | - | | | ... |
527 | - | | | +- <var><latest></var> |
528 | + | +- tags -----+- blends -+- 0.3 [older versions of blends tools] |
529 | + | | | +- 0.3.1 |
530 | + | | | ... |
531 | + | | | +- <var><latest></var> |
532 | | | | |
533 | | | +- doc -+- 0.1 [older versions of this doc] |
534 | | | +- 0.2 |
535 | |
536 | === modified file 'doc/en/A_devel.sgml' |
537 | --- doc/en/A_devel.sgml 2009-11-04 22:25:05 +0000 |
538 | +++ doc/en/A_devel.sgml 2012-12-02 20:31:28 +0000 |
539 | @@ -394,7 +394,7 @@ |
540 | |
541 | |
542 | <sect id="svn"> |
543 | - <heading>Working with <file>svn</file></heading> |
544 | + <heading>Working with the source repository (<file>svn</file> in process of moving to <file>git</file>)</heading> |
545 | <p> |
546 | Sometimes it might be interesting for developers to check out the |
547 | latest code of the Blend tools or a special Blend code for the meta |
548 | @@ -404,14 +404,15 @@ |
549 | <taglist> |
550 | <tag>Checkout</tag> |
551 | <item> |
552 | - For the Blend tools |
553 | + For the Blend tools and this documentation |
554 | <example> |
555 | - svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/blends/blends/trunk/blends blends |
556 | + git clone git+ssh://<var>username</var>@git.debian.org/git/blends/blends.git |
557 | </example> |
558 | or for the Debian Pure Blend <var>BLEND-name</var> |
559 | <example> |
560 | svn checkout svn+ssh://<var>username</var>@svn.debian.org/svn/blends/projects/<var>BLEND-name</var>/trunk |
561 | </example> |
562 | + Note: This will be moved to Git (at least) soon after Wheezy release. |
563 | </item> |
564 | <tag>Build source package</tag> |
565 | <item> |
566 | @@ -480,17 +481,16 @@ |
567 | you like a login on this host. |
568 | </p> |
569 | <p> |
570 | -The code which builds web and tasks pages is available in SVN at |
571 | -<tt>svn://svn.debian.org/blends/blends/trunk/webtools</tt>. It is |
572 | +The code which builds web and tasks pages is available in Git at |
573 | +<tt>git://git.debian.org/git/blends/website.git</tt>. It is |
574 | using the <url id="http://genshi.edgewall.org/" name="Genshi |
575 | templating system"> which enables influencing the layout of the pages |
576 | -by editing the templates in |
577 | -<tt>svn://svn.debian.org/blends/blends/trunk/webtools/templates</tt>. |
578 | +by editing the templates in the |
579 | +<file>templates</file> directory. |
580 | You can also influence some parameters of the web pages in the |
581 | -configuration files |
582 | -<tt>svn://svn.debian.org/blends/blends/trunk/webtools/webconf</tt>. |
583 | +configuration files in the <file>webconf</file> directory. |
584 | Last but not least you can provide translations for the web pages in |
585 | -<tt>svn://svn.debian.org/blends/blends/trunk/webtools/po</tt>. |
586 | +the <file>po</file> directory. |
587 | </p> |
588 | <p> |
589 | Once something on the web pages was changed you can activate the |
590 | @@ -500,7 +500,7 @@ |
591 | <enumlist> |
592 | <item>Login to <tt>alioth.debian.org</tt> or <tt>blends.debian.net</tt></item> |
593 | <item><tt>cd /var/lib/gforge/chroot/home/groups/blends/webtools/</tt></item> |
594 | - <item><tt>./deploy-svn</tt></item> |
595 | + <item><tt>./deploy-dynamic-pages</tt></item> |
596 | </enumlist> |
597 | </p> |
598 | <p> |
599 | @@ -531,8 +531,9 @@ |
600 | should care for this! |
601 | </p> |
602 | <p> |
603 | -The static pages are maintained in SVN at |
604 | -<tt>svn://svn.debian.org/blends/blends/trunk/websites</tt>. |
605 | +The static pages are maintained in Git at |
606 | +<tt>git://git.debian.org/git/blends/website.git</tt> in the |
607 | +<file>websites</file> directory. |
608 | Once you have changed the content of the pages you can activate |
609 | the changes by doing: |
610 | </p> |
611 | @@ -540,7 +541,7 @@ |
612 | <enumlist> |
613 | <item>Login to <tt>alioth.debian.org</tt> or <tt>blends.debian.net</tt></item> |
614 | <item><tt>cd /var/lib/gforge/chroot/home/groups/blends/webtools/</tt></item> |
615 | - <item><tt>./deploy-static-pages</tt></item> |
616 | + <item><tt>git pull</tt></item> |
617 | </enumlist> |
618 | </p> |
619 | </sect> |
620 | |
621 | === modified file 'doc/en/C_bts.sgml' |
622 | --- doc/en/C_bts.sgml 2009-01-30 19:30:53 +0000 |
623 | +++ doc/en/C_bts.sgml 2012-12-02 20:31:28 +0000 |
624 | @@ -18,52 +18,14 @@ |
625 | program <prgn>reportbug</prgn> for this purpose. |
626 | </p> |
627 | <p> |
628 | -If you use wnpp sanely you can even tag this bug for the intended |
629 | -purpose to include it in a certain Debian Pure Blend. This was |
630 | -described |
631 | -in <url id="http://lists.debian.org/debian-devel-announce/2005/09/msg00002.html" |
632 | -name="a mail of Anthony Towns"> and |
633 | -<url |
634 | -id="http://wiki.debian.org/DebianScience/Sponsoring" |
635 | -name="the Debian wiki">. It was also described in |
636 | -<url id="http://lists.debian.org/debian-custom/2005/04/msg00017.html" |
637 | -name="a mail of Ben Armstrong"> and in short works like this: |
638 | - |
639 | -<list> |
640 | - <item><p> |
641 | - Add an usertag to an existing bug by sending to |
642 | - request@bugs.debian.org a mail containing |
643 | - <example> |
644 | - user <email> |
645 | - usertag <bug number> + wnpp <metapackage name> |
646 | - </example>, |
647 | - where email is the electronic address of the person or mailing |
648 | - list which coordinates the relevant Debian Pure Blend. |
649 | - </p> |
650 | - <p> |
651 | - For instance if you want to tag an ITP with bug number |
652 | - #123456 for Debian Med section biology you would send the |
653 | - following mail to <email>request@bugs.debian.org </email>: |
654 | - <example> |
655 | - user debian-med@lists.debian.org |
656 | - usertag 123456 + wnpp med-bio |
657 | - thanks |
658 | - </example> |
659 | - </p> |
660 | - <p> |
661 | - <strong>Note:</strong> Because the search is case sensitive |
662 | - please always use lower case tags! |
663 | - </p> |
664 | - </item> |
665 | - <item>To search for WNPP bugs of a certain Debian Pure Blend just |
666 | - visit the URL |
667 | -<example> |
668 | -http://bugs.debian.org/cgi-bin/pkgreport.cgi?tag=wnpp;users=<var>email</var> |
669 | -</example> |
670 | - </item> |
671 | -</list> |
672 | - |
673 | - |
674 | +In Debian Pure Blends some house keeping of interesting packages is done |
675 | +and once an ITP is issued it should be mentioned at the relevant tasks |
676 | +page to keep other team members informed. To make this happen it is a |
677 | +minimum requirement to at least foreward the ITP mail to the relevant |
678 | +mailing list crossing fingers that somebody feels responsible to enter |
679 | +this information into the according tasks file. It is even better if |
680 | +you just include the information yourself (see <ref id="packageslist"> |
681 | +for more details). |
682 | </p> |
683 | </sect> |
684 | |
685 | |
686 | === modified file 'share/blends/blend-actions' |
687 | --- share/blends/blend-actions 2009-01-30 19:30:53 +0000 |
688 | +++ share/blends/blend-actions 2012-12-02 20:31:28 +0000 |
689 | @@ -1,4 +1,4 @@ |
690 | -# $Id: blend-actions 1255 2008-11-19 21:53:43Z tille $ |
691 | +# $Id$ |
692 | # |
693 | # Backend independant functions for blends package |
694 | # |
695 | |
696 | === modified file 'share/blends/blend-update-menus' |
697 | --- share/blends/blend-update-menus 2009-01-30 19:30:53 +0000 |
698 | +++ share/blends/blend-update-menus 2012-12-02 20:31:28 +0000 |
699 | @@ -1,4 +1,4 @@ |
700 | -# $Id: blend-update-menus 1142 2008-10-26 06:15:36Z tille $ |
701 | +# $Id$ |
702 | |
703 | # check if I am a specific user |
704 | amI() { |
705 | |
706 | === modified file 'share/blends/unixgroups/blend-actions' |
707 | --- share/blends/unixgroups/blend-actions 2009-01-30 19:30:53 +0000 |
708 | +++ share/blends/unixgroups/blend-actions 2012-12-02 20:31:28 +0000 |
709 | @@ -1,4 +1,4 @@ |
710 | -# $Id: blend-actions 1195 2008-11-02 16:10:33Z tille $ |
711 | +# $Id$ |
712 | # |
713 | # Backend dependant functions for blends package |
714 | # |
715 | |
716 | === removed symlink 'sources.list' |
717 | === target was u'sources.list.unstable' |
718 | === modified file 'sources.list.UNRELEASED' |
719 | --- sources.list.UNRELEASED 2009-07-29 10:40:04 +0000 |
720 | +++ sources.list.UNRELEASED 2012-12-02 20:31:28 +0000 |
721 | @@ -2,4 +2,4 @@ |
722 | # good practice to use UNRELEASED in the changelog as target distribution |
723 | # for not yet finished packages and blends-dev should also work in this |
724 | # case |
725 | -deb http://ftp.debian.org/ unstable main |
726 | +deb http://ftp.debian.org/debian unstable main |
727 | |
728 | === modified file 'sources.list.experimental' |
729 | --- sources.list.experimental 2009-01-30 19:30:53 +0000 |
730 | +++ sources.list.experimental 2012-12-02 20:31:28 +0000 |
731 | @@ -1,3 +1,3 @@ |
732 | # If a Blend should be uploaded to experimental it needs a sources.list |
733 | # file matching this target. |
734 | -deb http://ftp.debian.org/ unstable main |
735 | +deb http://ftp.debian.org/debian unstable main |
736 | |
737 | === added file 'sources.list.raring' |
738 | --- sources.list.raring 1970-01-01 00:00:00 +0000 |
739 | +++ sources.list.raring 2012-12-02 20:31:28 +0000 |
740 | @@ -0,0 +1,1 @@ |
741 | +deb http://archive.ubuntu.com/ubuntu/ raring main universe |
742 | |
743 | === modified file 'sources.list.stable' |
744 | --- sources.list.stable 2009-01-30 19:30:53 +0000 |
745 | +++ sources.list.stable 2012-12-02 20:31:28 +0000 |
746 | @@ -1,1 +1,1 @@ |
747 | -deb http://ftp.debian.org/ stable main |
748 | +deb http://ftp.debian.org/debian stable main |
749 | |
750 | === modified file 'sources.list.testing' |
751 | --- sources.list.testing 2009-01-30 19:30:53 +0000 |
752 | +++ sources.list.testing 2012-12-02 20:31:28 +0000 |
753 | @@ -1,1 +1,1 @@ |
754 | -deb http://ftp.debian.org/ testing main |
755 | +deb http://ftp.debian.org/debian testing main |
756 | |
757 | === modified file 'sources.list.unstable' |
758 | --- sources.list.unstable 2009-01-30 19:30:53 +0000 |
759 | +++ sources.list.unstable 2012-12-02 20:31:28 +0000 |
760 | @@ -4,4 +4,4 @@ |
761 | # distribution. You are free to provide your own source.list.unstable |
762 | # in the source of your meta package building code to force unstable as |
763 | # target or alternatively you could change this file (/etc/blends/sources.list.unstable). |
764 | -deb http://ftp.debian.org/ testing main |
765 | +deb http://ftp.debian.org/debian testing main |
Uploaded. Thanks!