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