[Blends-commit] [SCM] science branch, master, updated. 7520490455f6f83b81018fca17fac61bbdf90c4b

2014-04-11 Thread Ole Streicher 
The following commit has been merged in the master branch:
commit 7520490455f6f83b81018fca17fac61bbdf90c4b
Author: Ole Streicher 
Date:   Fri Apr 11 19:43:18 2014 +0200

Added audela

diff --git a/tasks/astronomy b/tasks/astronomy
index 0aed087..1c8d010 100644
--- a/tasks/astronomy
+++ b/tasks/astronomy
@@ -176,3 +176,5 @@ Remark: Removed from Debian
  from http://snapshot.debian.org/
  .
  Reasons are given here: http://bugs.debian.org/460795
+
+Depends: audela

-- 
Debian Science Blend

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit b8c7dad543dbc015f4b9cbfa15b3db17e7deeff3
Author: Franklin Weng 
Date:   Tue Apr 1 10:42:04 2014 +0800

Chapter 4: add debian-ezgo.

diff --git a/doc/en/04_existing_blends.xml b/doc/en/04_existing_blends.xml
index da5d78c..86f5177 100644
--- a/doc/en/04_existing_blends.xml
+++ b/doc/en/04_existing_blends.xml
@@ -577,6 +577,47 @@ Debian for blind and visually impaired people
 
 
 
+
+  Debian ezgo Project
+
+
+ Debian for ezgo project.  ezgo (all small-case) is a project launched by Open 
Source Software Application Consulting Center
+ (OSSACC), which is responsible for promoting free and open source software in 
Taiwan's schools.  ezgo collects more than one
+ hundred FOSS, as well as many public resource tutorials like PhET 
(http://phet.colorado.edu/), and has a special designed menu
+ style.  ezgo aims to introduce the world of FOSS to those who have never 
heard or touched it.  It is also good for teaching and
+ self-learning.  Debian-ezgo is a Debian Pure Blends which integrates ezgo 
artwork, ezgo menu style, many good FOSS and public
+ resource tutorials into debian.
+
+
+
+
+  Start
+Nov 2009
+
+
+
+  URL
+https://wiki.debian.org/DebianEzGo";>Debian 
ezgo wiki (Outdated)
+
+
+
+  Tasks
+http://blends.debian.org/ezgo/tasks/";>Tasks of 
Debian ezgo (Outdated)
+
+
+
+  Mailing list
+https://alioth.debian.org/mail/?group_id=100426";>debian-ezgo-packag...@lists.alioth.debian.org
+
+
+
+  Responsible
+Franklin Weng 
frank...@goodhorse.idv.tw
+
+
+
+
+
 
 
   Blends that were announced but development is stalled

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit 971db1fd8755f43d1e4c6b30f1e95cfeb680403c
Author: Andreas Tille 
Date:   Wed Mar 26 10:44:51 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 0869533..d4327e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-blends (0.6.91) UNRELEASED; urgency=low
+blends (0.6.91) unstable; urgency=low
 
   [ Emmanouil Kiagias ]
   * Documentation converted to XML

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit 94e570935da88d5cc5befe25be94599b7a4f57c2
Author: Andreas Tille 
Date:   Fri Mar 28 11:21:03 2014 +0100

Be more precise about how to update tasks manually

diff --git a/debian/changelog b/debian/changelog
index d4327e8..e1a57c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+blends (0.6.92) UNRELEASED; urgency=medium
+
+  * Updated doc
+
+ -- Andreas Tille   Fri, 28 Mar 2014 11:14:30 +0100
+
 blends (0.6.91) unstable; urgency=low
 
   [ Emmanouil Kiagias ]
diff --git a/doc/en/A_devel.xml b/doc/en/A_devel.xml
index 12ab8c0..7e9dbbf 100644
--- a/doc/en/A_devel.xml
+++ b/doc/en/A_devel.xml
@@ -748,10 +748,11 @@ effect immediately the steps to do are as follows:
 
 
 
-  Login to 
blends.debian.org
+  Login to 
dillon.debian.org
   sudo -u blends -s
   cd 
/srv/blends.debian.org/webtools/
   ./tasks.py 

+  /usr/local/bin/static-update-component 
blends.debian.org
 
 
 

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit 4c7dfca3130adbbdc316fb811334308fc3efdde5
Author: Andreas Tille 
Date:   Wed Mar 26 10:05:54 2014 +0100

Verbose changelog entry about `cme fix dpkg-control` changes

diff --git a/debian/changelog b/debian/changelog
index 47ccaef..0869533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ blends (0.6.91) UNRELEASED; urgency=low
   * debian/control: Adapt Build-Depends to XML version of docs
   * debtools/rules: Do not remove postinst scripts which are not
 autogenerated
-  * Standards-Version: 3.9.5
-  * Unversioned dependency from debconf
+  * cme fix dpkg-control:
+ - Unversioned dependency from debconf and menu
+ - Standatde-Version: 3.9.5
+ - Canonical Vcs URLs
+ - Drop Linux from "Debian Linux"
 
  -- Andreas Tille   Wed, 26 Mar 2014 08:07:45 +0100
 

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit fd05a763bdfb145d93b8ce27b13c7c2bd69e6459
Author: Andreas Tille 
Date:   Wed Mar 26 08:28:06 2014 +0100

Do not remove postinst scripts which are not autogenerated

diff --git a/debian/changelog b/debian/changelog
index f5d2074..47ccaef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-blends (0.6.99) UNRELEASED; urgency=low
+blends (0.6.91) UNRELEASED; urgency=low
 
   [ Emmanouil Kiagias ]
   * Documentation converted to XML
 
   [ Andreas Tille ]
   * debian/control: Adapt Build-Depends to XML version of docs
+  * debtools/rules: Do not remove postinst scripts which are not
+autogenerated
+  * Standards-Version: 3.9.5
+  * Unversioned dependency from debconf
 
- -- Andreas Tille   Sun, 24 Nov 2013 09:11:44 +0100
+ -- Andreas Tille   Wed, 26 Mar 2014 08:07:45 +0100
 
 blends (0.6.16.4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bd11f4e..a07cc5d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,13 @@ Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: xmlto,
  dblatex,
  w3m
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 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
-Depends: debconf (>= 0.5) | debconf-2.0,
+Depends: debconf,
  make | build-essential,
  apt,
  debhelper (>= 9),
diff --git a/devtools/rules b/devtools/rules
index 4bf7aff..309d629 100755
--- a/devtools/rules
+++ b/devtools/rules
@@ -55,8 +55,11 @@ override_dh_clean:
rm -rf tmp
# Remove backup files from source tarball
rm -f tasks/*~
-   # Remove auto generated post{inst,rm} scripts
-   rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.prerm 
debian/$(PREFIX)-*.postrm debian/$(PREFIX)-*.preinst
+   # Remove auto generated post{inst,rm} scripts; but only if an according 
*.stub file exists
+   for task in `ls tasks | grep -v '^[a-z]*:$$*' | grep -v '^$$'` ; do \
+   rm -f debian/$(PREFIX)-$${task}.postinst 
debian/$(PREFIX)-$${task}.prerm ; \
+   done
+   # rm -f debian/$(PREFIX)-*.postinst debian/$(PREFIX)-*.prerm 
debian/$(PREFIX)-*.postrm debian/$(PREFIX)-*.preinst
# remove auto generated files for config package
rm -f debian/$(PREFIX)-config.templates debian/$(PREFIX)-config.config \
  debian/$(PREFIX)-config.install   debian/$(PREFIX)-config.links  \

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit 5c76ffd0dc5a517d97d669fcbad29d09de0291ee
Author: Andreas Tille 
Date:   Wed Mar 26 09:34:15 2014 +0100

cme fix dpkg-control

diff --git a/debian/control b/debian/control
index a07cc5d..4b1d0ec 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,4 @@
 Source: blends
-Priority: optional
-Section: devel
 Maintainer: Debian Pure Blend Team 
 Uploaders: Petter Reinholdtsen ,
Andreas Tille ,
@@ -8,19 +6,20 @@ Uploaders: Petter Reinholdtsen ,
José L. Redrejo Rodríguez ,
Jonas Smedegaard ,
Emmanouil Kiagias 
+Section: devel
+Priority: optional
 Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: xmlto,
  dblatex,
  w3m
 Standards-Version: 3.9.5
-Vcs-Browser: http://git.debian.org/?p=blends/blends.git
-Vcs-Git: git://git.debian.org/git/blends/blends.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=blends/blends.git
+Vcs-Git: git://anonscm.debian.org/blends/blends.git
 
 Package: blends-dev
 Architecture: all
 Depends: debconf,
  make | build-essential,
- apt,
  debhelper (>= 9),
  ${misc:Depends}
 Suggests: blends-doc
@@ -35,8 +34,8 @@ Package: blends-common
 Architecture: all
 Section: misc
 Depends: adduser,
- menu (>= 2.1.25),
- debconf (>= 0.5) | debconf-2.0,
+ menu,
+ debconf,
  ${misc:Depends}
 Suggests: blends-doc
 Description: Debian Pure Blends common package
@@ -60,7 +59,7 @@ Description: Debian Pure Blends documentation
  manage those projects.
  .
  It is explained in detail why these are no forks from Debian but reside
- completely inside the Debian GNU/Linux distribution and which
+ completely inside the Debian GNU distribution and which
  advantages can be gathered by this approach.  The concept of
  metapackages and user role based menus is explained.  In short: This
  document describes why Debian Pure Blends are important to

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit 597635f1958575d45d4de96416c1645ab30bf6e4
Author: Andreas Tille 
Date:   Fri Mar 28 11:20:31 2014 +0100

Enable setting different PUBLISHHOST

diff --git a/doc/Makefile b/doc/Makefile
index 653ec8e..d135285 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -30,7 +30,7 @@ LOCALE  := unset LC_ALL; unset LANG; unset LANGUAGE;
 
 ## --
 # this can and will be overriden by a higher level makefile
-PUBLISHHOST := dillon.debian.org
+PUBLISHHOST ?= dillon.debian.org
 # PUBLISHDIR := 
alioth.debian.org:/srv/alioth.debian.org/chroot/home/groups/blends/htdocs/blends
 PUBLISHDIR := $(PUBLISHHOST):/srv/blends.debian.org/www/blends
 

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit

[Blends-commit] [SCM] blends-dev branch, master, updated. d2137d6ff69b53705f338d5de7510f0534e4065d

2014-04-11 Thread Andreas Tille 
The following commit has been merged in the master branch:
commit d2137d6ff69b53705f338d5de7510f0534e4065d
Author: Franklin Weng 
Date:   Tue Apr 1 10:42:04 2014 +0800

Chapter Chapter 7: add simple description to "adding a new normal package". 
Appendix A: add some more detail information about how to add new normal 
packages.

diff --git a/debian/changelog b/debian/changelog
index e1a57c2..41291ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 blends (0.6.92) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Updated doc
 
- -- Andreas Tille   Fri, 28 Mar 2014 11:14:30 +0100
+  [ Franklin Weng ]
+  * Added EzGo as existing Blend
+  * Better documentation for non-metapackages
+
+ -- Andreas Tille   Fri, 11 Apr 2014 15:56:32 +0200
 
 blends (0.6.91) unstable; urgency=low
 
diff --git a/doc/en/07_starting.xml b/doc/en/07_starting.xml
index 82fb686..584886b 100644
--- a/doc/en/07_starting.xml
+++ b/doc/en/07_starting.xml
@@ -334,6 +334,20 @@ written by Ben Armstrong sy...@debian.org.
 
   
 
+
+ Adding new "normal" packages
+
+  Besides metapackages, you may want to develop some new packages for your 
blend
+  in order to customize some system behavior, like changing XDG menu style.  
Those
+  normal packages are not defined in your tasks, hence we need to define it 
properly
+  so that blends-dev will know how to package these new, normal packages.  
Adding
+  new normal packages is almost identical to debian packaging, just that you 
need
+  to define your package parameters in debian/control.stub instead of 
debian/control.
+  Section  describes what you need 
to know for
+  adding new normal packages in Debian Pure Blends in more detail.
+
+
+
 
 
 
diff --git a/doc/en/A_devel.xml b/doc/en/A_devel.xml
index 7e9dbbf..627a81b 100644
--- a/doc/en/A_devel.xml
+++ b/doc/en/A_devel.xml
@@ -652,6 +652,64 @@ behaviour of the tools described below.
 
 
 
+
+  How to develop new normal packages in Pure Blends
+
+  Sometimes you may want to develop new packages for your Pure Blend.  It is 
almost
+  identical to creating a new debian package.  But in Blends framework you can 
do it more
+  easily.
+
+
+  Assume that you have already had a well-defined blend.  That is, those 
necessary files
+  like changelog, compat, copyright and control.stub are in your debian/ 
folder, maybe
+  with postinst.stub or prerm.stub for task metapackages.  Notice that, all 
these control
+  and maintainer scripts are just for metapackges defined in your task, not 
for your new,
+  normal packages since they aren't listed in task.
+
+
+  When you want to develop and add new packages, just like debian packaging, 
you need to
+  add package informations and parameters in the control file.  However in 
blends, you should
+  add them in debian/control.stub instead of defining their own control file.  
For the
+  maintainer script files, you need to add them in debian/ folder.   However, 
notice that
+  the maintainer script files should not add ".stub" or blends-dev won't 
process them.
+
+
+  For example, in blend "foo", we want to add a new normal package "bar".  In 
debian/control.stub,
+  we may have:
+
+
+Source: foo
+Section: misc
+Priority: extra
+Maintainer: Foo Team 
+Uploaders: Foo bar 
+Build-Depends: debhelper (>= 7), blends-dev (>= 0.6.91)
+Standards-Version: 3.9.3
+Dm-Upload-Allowed: yes
+Homepage: http://foo.bar/
+
+Package: foo-bar
+Architecture: all
+Description: sample blends and packages
+
+
+
+  In the control.stub it defines foo blends, and a new package foo-bar.  Then, 
in the
+  debian folder, we can add our own preinst, postinst, prerm, and/or postrm 
maintainer
+  scripts.  However the filename should be foo-bar.preinst, foo-bar.postinst, 
... etc.,
+  instead of foo-bar.postinst.stub, since foo-bar doesn't exist in tasks.
+
+
+
+  After those control files are done, you can use
+
+make dist
+
+  to create blends control files, and then use 
debuild
+  to start packaging.
+
+
+
 
 
   Working with the source repository (svn in 
process of moving to git)

-- 
Git repository for blends code

___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit