From juca at members.fsf.org  Fri Feb  3 10:15:32 2012
From: juca at members.fsf.org (Felipe Sanches)
Date: Fri, 3 Feb 2012 07:15:32 -0200
Subject: [Trisquel-devel] nonfree stuff in PPAs? Suggestions for
	add-apt-repository improvements
Message-ID: <CAK6XL6Dd_=kcSGHi10R0LveCK83FRQYyOxyF6j30UvwxiTvLTQ@mail.gmail.com>

Good morning,

When people add PPA repositories they risk making non-free packages
inadvertently available in their APT package database.

While the main repositories in our distro are carefully cleaned up, what
can we do to help users who need packages that are not officially part of
the distro to avoid nonfree software?

Maybe a simple first measure could be simply a warning message to be
displayed when users add repositories using add-apt-repository. It could
say something like:

"You are adding an external repository that is not mantained by the
Trisquel dev-team. There may be non-free packages available from this
external source. Are you sure you want to proceed?"

Additionally, we could gather statistics on which are the most popular
PPAs, so that maybe Trisquel contributors could check whether these are
clean of non-free packages and thus publicly endorse it.

Another useful hack would be to patch apt so that it informs the user when
a package to be installed has been selected from a PPA and then warn the
user about the need to check whether it's actually free software.

happy hacking,
Felipe "Juca" Sanches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.trisquel.info/pipermail/trisquel-devel/attachments/20120203/a74908c2/attachment.html>

From gaurav.conetfun at gmail.com  Fri Feb  3 11:36:35 2012
From: gaurav.conetfun at gmail.com (Gaurav Pareek)
Date: Fri, 03 Feb 2012 16:06:35 +0530
Subject: [Trisquel-devel] nonfree stuff in PPAs? Suggestions for
 add-apt-repository improvements
In-Reply-To: <CAK6XL6Dd_=kcSGHi10R0LveCK83FRQYyOxyF6j30UvwxiTvLTQ@mail.gmail.com>
References: <CAK6XL6Dd_=kcSGHi10R0LveCK83FRQYyOxyF6j30UvwxiTvLTQ@mail.gmail.com>
Message-ID: <4F2BB8B3.3010304@gmail.com>

On 02/03/2012 02:45 PM, Felipe Sanches wrote:
> Good morning,
>
> When people add PPA repositories they risk making non-free packages
> inadvertently available in their APT package database.
>
> While the main repositories in our distro are carefully cleaned up,
> what can we do to help users who need packages that are not officially
> part of the distro to avoid nonfree software?
>
> Maybe a simple first measure could be simply a warning message to be
> displayed when users add repositories using add-apt-repository. It
> could say something like:
>
> "You are adding an external repository that is not mantained by the
> Trisquel dev-team. There may be non-free packages available from this
> external source. Are you sure you want to proceed?"
>
> Additionally, we could gather statistics on which are the most popular
> PPAs, so that maybe Trisquel contributors could check whether these
> are clean of non-free packages and thus publicly endorse it.
>
> Another useful hack would be to patch apt so that it informs the user
> when a package to be installed has been selected from a PPA and then
> warn the user about the need to check whether it's actually free software.
>
> happy hacking,
> Felipe "Juca" Sanches
>
>
>
>
>
> _______________________________________________
> Trisquel-devel mailing list
> Trisquel-devel at listas.trisquel.info
> http://listas.trisquel.info/mailman/listinfo/trisquel-devel
I like the approach of parabola gnu/linux. They have a package called
your-freedom that conflicts with all known non-free packages in the
archlinux repo and the Arch user repo. Though it may be a tedious task
to identify and list external non-free packages, but it'll be worth the
effort.

-- 
grvrulz <Gaurav Pareek>
_________________________
Freedom is Awesome_______|

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.trisquel.info/pipermail/trisquel-devel/attachments/20120203/8846c57b/attachment.html>

From quiliro at congresolibre.org  Sun Feb  5 15:53:40 2012
From: quiliro at congresolibre.org (=?ISO-8859-1?Q?Quiliro_Ord=F3=F1ez?=)
Date: Sun, 05 Feb 2012 09:53:40 -0500
Subject: [Trisquel-devel] making a deb package and including it in
	Trisquel
In-Reply-To: <4F26F72E.9000202@congresolibre.org>
References: <4F26F72E.9000202@congresolibre.org>
Message-ID: <4F2E97F4.4020908@congresolibre.org>

I have found that Splat 1.3 included in Trisquel is buggy. There is a 
Debian package for Splat 1.4 which works well and has the same 
dependencies as Splat 1.3. Is it possible to include  it in the Trisquel 
5.0 repositories?

From quiliro at congresolibre.org  Sun Feb  5 15:55:34 2012
From: quiliro at congresolibre.org (=?ISO-8859-1?Q?Quiliro_Ord=F3=F1ez?=)
Date: Sun, 05 Feb 2012 09:55:34 -0500
Subject: [Trisquel-devel] making a deb package and including it
	in	Trisquel
In-Reply-To: <4F2E97F4.4020908@congresolibre.org>
References: <4F26F72E.9000202@congresolibre.org>
	<4F2E97F4.4020908@congresolibre.org>
Message-ID: <4F2E9866.4010905@congresolibre.org>

El 05/02/12 09:53, Quiliro Ord??ez escribi?:
> I have found that Splat 1.3 included in Trisquel is buggy. There is a 
> Debian package for Splat 1.4 which works well and has the same 
> dependencies as Splat 1.3. Is it possible to include  it in the 
> Trisquel 5.0 repositories?
>

This is the package:

http://packages.debian.org/sid/hamradio/splat

From ruben at trisquel.info  Mon Feb  6 02:56:23 2012
From: ruben at trisquel.info (Ruben Rodriguez)
Date: Mon,  6 Feb 2012 02:56:23 +0100 (CET)
Subject: [Trisquel-devel] Rev 36: Updated firefox for natty to oneiric,
 added lts backport kernels to lucid,
 changed all versions for new oneiric helpers to 1 in
 file:///home/bzr/package-helpers/trunk/
Message-ID: <20120206015623.BE1BE40206268@sognus.com>

At file:///home/bzr/package-helpers/trunk/

------------------------------------------------------------
revno: 36
revision-id: ruben at trisquel.info-20120206015540-g3ijmmh10j9joorv
parent: ruben at trisquel.info-20120123101023-owsetw1q30au79cg
committer: Ruben Rodriguez <ruben at trisquel.info>
branch nick: trunk
timestamp: Mon 2012-02-06 02:55:40 +0100
message:
  Updated firefox for natty to oneiric, added lts backport kernels to lucid, changed all versions for new oneiric helpers to 1
------------ pr?xima parte ------------

Diff too large for email (19631 lines, the limit is 1000).

From ruben at trisquel.info  Tue Feb  7 20:26:23 2012
From: ruben at trisquel.info (Ruben Rodriguez)
Date: Tue,  7 Feb 2012 20:26:23 +0100 (CET)
Subject: [Trisquel-devel] Rev 37: Backported splat 1.4 to T5.0 in
 file:///home/bzr/package-helpers/trunk/
Message-ID: <20120207192623.2E48F403EF896@sognus.com>

At file:///home/bzr/package-helpers/trunk/

------------------------------------------------------------
revno: 37
revision-id: ruben at trisquel.info-20120207192650-ovs9zcl7o4ola3s4
parent: ruben at trisquel.info-20120206015540-g3ijmmh10j9joorv
committer: Ruben Rodriguez <ruben at trisquel.info>
branch nick: trunk
timestamp: Tue 2012-02-07 20:26:50 +0100
message:
  Backported splat 1.4 to T5.0
------------ pr?xima parte ------------
=== added file 'helpers/natty/make-splat'
--- a/helpers/natty/make-splat	1970-01-01 00:00:00 +0000
+++ b/helpers/natty/make-splat	2012-02-07 19:26:50 +0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+#    Copyright (C) 2011  Rub??n Rodr??guez <ruben at trisquel.info>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu precise universe'
+
+. ./config
+
+changelog "Imported into Trisquel"
+
+compile

=== modified file 'makepending'
--- a/makepending	2012-02-06 01:55:40 +0000
+++ b/makepending	2012-02-07 19:26:50 +0000
@@ -126,8 +126,8 @@
 if dpkg --compare-versions $current lt $upstream 
 then
 
-    echo Current version in $DISTRO: $current 1>&2
-    echo Upstream version in $UPSTREAM: $upstream 1>&2
+ #   echo Current version in $DISTRO: $current 1>&2
+ #   echo Upstream version in $UPSTREAM: $upstream 1>&2
 [ $package = "grub2" -a $UPSTREAM = natty ] && continue
 [ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
 [ $package = "yelp" -a $UPSTREAM = natty ] && continue


From ruben at trisquel.info  Tue Feb  7 20:29:28 2012
From: ruben at trisquel.info (=?ISO-8859-1?Q?Rub=E9n_Rodr=EDguez?=)
Date: Tue, 7 Feb 2012 20:29:28 +0100
Subject: [Trisquel-devel] making a deb package and including it in
 Trisquel
In-Reply-To: <4F2E9866.4010905@congresolibre.org>
References: <4F26F72E.9000202@congresolibre.org>
	<4F2E97F4.4020908@congresolibre.org>
	<4F2E9866.4010905@congresolibre.org>
Message-ID: <20120207202928.96c350b2.ruben@trisquel.info>


> El 05/02/12 09:53, Quiliro Ord??ez escribi?:
> > I have found that Splat 1.3 included in Trisquel is buggy. There is
> > a Debian package for Splat 1.4 which works well and has the same 
> > dependencies as Splat 1.3. Is it possible to include  it in the 
> > Trisquel 5.0 repositories?
> >
> 
> This is the package:
> 
> http://packages.debian.org/sid/hamradio/splat

Done. Here is the package helper who did the trick:
http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-splat

From sirgrant at member.fsf.org  Sat Feb 11 01:46:05 2012
From: sirgrant at member.fsf.org (Grant H.)
Date: Fri, 10 Feb 2012 16:46:05 -0800
Subject: [Trisquel-devel] Patch for issue #4570
Message-ID: <4F35BA4D.8050601@member.fsf.org>

For Issue: https://trisquel.info/en/issues/4570

=== added file 'make-earcandy'
--- make-earcandy	1970-01-01 00:00:00 +0000
+++ make-earcandy	2012-02-10 23:45:49 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+#    Copyright (C) 2012  Grant Houlgate <ghoulgat at member.fsf.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+sed 's/ on Skype call//g' debian/control -i
+
+changelog "Removed references to non-free programs"
+
+compile


=== added file 'make-skytools'
--- make-skytools	1970-01-01 00:00:00 +0000
+++ make-skytools	2012-02-10 23:53:53 +0000
@@ -0,0 +1,28 @@=== added file 'make-skytools'
--- make-skytools	1970-01-01 00:00:00 +0000
+++ make-skytools	2012-02-10 23:53:53 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+#    Copyright (C) 2012  Grant Houlgate <ghoulgat at member.fsf.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+sed 's/ from Skype to PostgreSQL//g' debian/control -i
+
+changelog "Removed references to non-free programs"
+
+compile
+#!/bin/sh
+#
+#    Copyright (C) 2012  Grant Houlgate <ghoulgat at member.fsf.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+sed 's/ from Skype to PostgreSQL//g' debian/control -i
+
+changelog "Removed references to non-free programs"
+
+compile
-- 
*Grant H.
*Email: SirGrant at member.fsf.org
*Ask me for my GPG key
*I'm an FSF member -- Help us support software freedom!
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: make-earcandy
URL: <http://listas.trisquel.info/pipermail/trisquel-devel/attachments/20120210/e4abee24/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: make-skytools
URL: <http://listas.trisquel.info/pipermail/trisquel-devel/attachments/20120210/e4abee24/attachment-0001.ksh>

From sirgrant at member.fsf.org  Sat Feb 11 01:50:44 2012
From: sirgrant at member.fsf.org (Grant H.)
Date: Fri, 10 Feb 2012 16:50:44 -0800
Subject: [Trisquel-devel] Patch for issue #4570
Message-ID: <4F35BB64.9000501@member.fsf.org>

In the previous message the skytools diff got messed up (must have
pasted twice).  It should be:

=== added file 'make-skytools'
--- make-skytools	1970-01-01 00:00:00 +0000
+++ make-skytools	2012-02-10 23:53:53 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+#    Copyright (C) 2012  Grant Houlgate <ghoulgat at member.fsf.org>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+sed 's/ from Skype to PostgreSQL//g' debian/control -i
+
+changelog "Removed references to non-free programs"
+
+compile

From quiliro at congresolibre.org  Tue Feb 14 16:41:33 2012
From: quiliro at congresolibre.org (=?ISO-8859-1?Q?Quiliro_Ord=F3=F1ez?=)
Date: Tue, 14 Feb 2012 10:41:33 -0500
Subject: [Trisquel-devel] =?iso-8859-1?q?operaci=F3n_Splat-Trisquel?=
In-Reply-To: <CADYU4YZxrdixEoU-fpJ6EDn7pcsdi_r7Wy6cnH5Qoi6mZsx6GQ@mail.gmail.com>
References: <CADYU4YZxrdixEoU-fpJ6EDn7pcsdi_r7Wy6cnH5Qoi6mZsx6GQ@mail.gmail.com>
Message-ID: <4F3A80AD.10805@congresolibre.org>

El 14/02/12 08:39, Charles Escobar escribi?:
> Hola Quiliro
>
> Con UCK (Ubuntu Customizacion Kit), he personalizado facilmente las 
> distribuciones de ubutnu (r), con trisquel, est? perfecto el splat, de 
> hecho ya probe con los mapas de toda latinoam?rica y ch?vere.
>
> Pero:
>
> Al personalizar la distro con UCK tengo:
>
> Durante el proceso instalo y pruebo sin problema dentro del chroot 
> temporal de UCK:
>
>    1. instalo Apache
>    2. instalo PHP5
>    3. instalo PHP5-gd
>    4. instalo splat 1.4.x
>    5. instalo la interfaz gr?fica para splat splat-gui
>    6. edito /etc/php5/apache2/php.in <http://php.in>  -->
>       register_globals = on
>    7. copio los mapas sdf  de latinoam?rica para splat
>    8. instalo googleeart 6.x
>    9. instalo googleeart 5.1 para maquinas antiguas (pueden convivir
>       las dos versiones :)  )
>   10. creo el usuario splat con passwd splat
>   11. copio el mapa IGM del Ecuador descargado del IGM y cortado en
>       piezas de un grado por un grado para abrirlo desde googleearth y
>       superponer las coberturas de splat
>   12. pruebo con firefox que funcione la instalaci?n y todo ok....
>
> Hasta all? todo bien, y aqu? viene el pero,
>
> Cuando contin?o el proceso con UCK me da un error que dice:
>
> l?nea 80: cd: /home/cescobar/tmp/remaster-iso/dists: No existe el 
> fichero o el directorio
>
> De acuerdo a mi conclusi?n luego de consultar al or?culo de google es 
> por que al  comparar las isos de ubuntu y trisquel, la de trisquel no 
> tiene la carpeta "dists" dentro de la iso.
>
> Pregunta ?copio la carpeta "dists" de la iso de ubuntu a la de 
> trisquel? si es as?, de que versi?n de ubuntu  la copio.
>

?Qu? contiene la carpeta dists? Yo buscar?a una carpeta que tenga el 
mismo contenido en Trisquel y har?a un link con sudo ln -s

> Que la fuerza te acompa?e
>
>

?Est? en el fuente! Por suerte solo uso lenguaje de gui?n. As? que 
siempre tengo el fuente. ;-)

Copio este correo a la lista de desarrollo de Trisquel para mayor sinergia.
------------ pr?xima parte ------------
Se ha borrado un adjunto en formato HTML...
URL: <http://listas.trisquel.info/pipermail/trisquel-devel/attachments/20120214/6b4026db/attachment.html>

From ruben at trisquel.info  Thu Feb 16 03:03:23 2012
From: ruben at trisquel.info (Ruben Rodriguez)
Date: Thu, 16 Feb 2012 03:03:23 +0100 (CET)
Subject: [Trisquel-devel] Rev 38: Removed gnome packages for 5.5 in
 file:///home/bzr/package-helpers/trunk/
Message-ID: <20120216020323.AB8AC404F7F90@sognus.com>

At file:///home/bzr/package-helpers/trunk/

------------------------------------------------------------
revno: 38
revision-id: ruben at trisquel.info-20120216020318-pkj8z66z81t2twri
parent: ruben at trisquel.info-20120207192650-ovs9zcl7o4ola3s4
committer: Ruben Rodriguez <ruben at trisquel.info>
branch nick: trunk
timestamp: Thu 2012-02-16 03:03:18 +0100
message:
  Removed gnome packages for 5.5
------------ pr?xima parte ------------
=== removed file 'helpers/oneiric/make-gnome-control-center'
--- a/helpers/oneiric/make-gnome-control-center	2012-02-06 01:55:40 +0000
+++ b/helpers/oneiric/make-gnome-control-center	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2011  Ruben Rodriguez <ruben at trisquel.info>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-
-VERSION=1
-
-. ./config
-
-#% Bring back the desktop effects integration patch, so compiz can be enabled and disabled in the desktop config program
-cp $DATA/95_desktop-effects-integration.patch debian/patches/
-echo 95_desktop-effects-integration.patch >> debian/patches/series
-
-#% Bring back the icons for the desktop config program
-cp $DATA/*.svg debian
-cat << EOF >> debian/capplets-data.install
-debian/visual-effects_custom.svg /usr/share/gnome-control-center/pixmaps
-debian/visual-effects_extra.svg /usr/share/gnome-control-center/pixmaps
-debian/visual-effects_none.svg /usr/share/gnome-control-center/pixmaps
-debian/visual-effects_normal.svg /usr/share/gnome-control-center/pixmaps
-EOF
-
-#% Bring back the translations for the strings in the desktop-effects-integration patch
-cp $DATA/po/* po
-
-changelog "Compiled for Trisquel"
-
-compile
-

=== modified file 'helpers/oneiric/make-gnome-desktop'
--- a/helpers/oneiric/make-gnome-desktop	2012-01-08 18:15:35 +0000
+++ b/helpers/oneiric/make-gnome-desktop	2012-02-16 02:03:18 +0000
@@ -22,6 +22,7 @@
 
 . ./config
 
+sed -i '/LDFLAGS/ s/$/\nCFLAGS += -lm/' debian/rules
 sed -i "s/Ubuntu/Trisquel/g" debian/rules
 
 changelog "Compiled for Trisquel"

=== removed file 'helpers/oneiric/make-gnome-media'
--- a/helpers/oneiric/make-gnome-media	2012-01-08 18:15:35 +0000
+++ b/helpers/oneiric/make-gnome-media	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2011  Rub??n Rodr??guez <ruben at trisquel.info>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-
-VERSION=1
-COMPONENT=main
-
-. ./config
-
-rm debian/patches/08_no_session_autostart.patch
-find -name *desktop* -exec sed '/NoDisplay/d' -i {} \;
-
-changelog "Removed no_session_autostart patch for gnome volume applet"
-
-compile
-

=== removed file 'helpers/oneiric/make-gnome-menus'
--- a/helpers/oneiric/make-gnome-menus	2012-01-08 18:15:35 +0000
+++ b/helpers/oneiric/make-gnome-menus	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2008-2010  Rub??n Rodr??guez <ruben at trisquel.info>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-
-VERSION=1
-COMPONENT=main
-
-. ./config
-
-cp $DATA/09_app_install_entry.patch debian/patches
-
-changelog "Compiled for Trisquel"
-
-compile
-

=== removed file 'helpers/oneiric/make-gnome-session'
--- a/helpers/oneiric/make-gnome-session	2012-02-06 01:55:40 +0000
+++ b/helpers/oneiric/make-gnome-session	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2011  Rub??n Rodr??guez <ruben at trisquel.info>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-
-VERSION=1
-COMPONENT=main
-
-. ./config
-
-for i in 11_add_failsafe_option.patch 02_add_ubuntu_session.patch 12_add_gnome-2d_session.patch
-do
-    rm debian/patches/$i
-    sed "/$i/d" -i debian/patches/series
-done
-
-for i in `cat debian/patches/series `
-do  
-    echo $i
-    patch -p1 -N < debian/patches/$i
-done
-
-cp data/classic-gnome.session.desktop.in.in data/gnome.session.desktop.in.in
-#sed 's/Required=.*/Required=windowmanager;filemanager;/' -i data/classic-gnome.session.desktop.in.in data/gnome.session.desktop.in.in
-#mv data/gnome.desktop.in data/gnome-desktop.desktop.in
-#replace 'gnome.desktop' 'gnome-desktop.desktop' .
-
-changelog "Rebranded for Trisquel"
-
-compile
-

=== removed file 'helpers/oneiric/make-yelp'
--- a/helpers/oneiric/make-yelp	2012-01-08 18:15:35 +0000
+++ b/helpers/oneiric/make-yelp	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2008-2010  Rub??n Rodr??guez <ruben at trisquel.info>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-
-VERSION=1
-
-. ./config
-
-for i in 01_lpi.patch 04_new_ubuntu_layout.patch 05_menu_tooltip.patch 07_rosetta_translations_update.patch
-do
-  rm debian/patches/$i
-  sed /$i/d debian/patches/series -i
-done
-
-replace Ubuntu Trisquel .
-
-changelog "Compiled for Trisquel"
-
-compile
-


From santi at trisquel.info  Fri Feb 17 00:52:09 2012
From: santi at trisquel.info (=?utf-8?q?Santiago_Rodr=C3=ADguez?=)
Date: Fri, 17 Feb 2012 00:52:09 +0100 (CET)
Subject: [Trisquel-devel] Rev 42: + Added support for trisquel to
 apt-mirror. Closes #2539 in
 file:///home/bzr/package-helpers/branches/aklis/
Message-ID: <20120216235209.C7F2540112AC7@sognus.com>

At file:///home/bzr/package-helpers/branches/aklis/

------------------------------------------------------------
revno: 42
revision-id: santi at trisquel.info-20120216235128-inm3stwner0mz7de
parent: santi at trisquel.info-20120216233439-qgsse8j5bp70zdc7
committer: Santiago Rodr?guez <santi at trisquel.info>
branch nick: aklis
timestamp: Fri 2012-02-17 00:51:28 +0100
message:
  + Added support for trisquel to apt-mirror. Closes #2539
-------------- next part --------------
=== added directory 'helpers/natty/DATA/apt-mirror'
=== added file 'helpers/natty/DATA/apt-mirror/Trisquel-mirror.list'
--- a/helpers/natty/DATA/apt-mirror/Trisquel-mirror.list	1970-01-01 00:00:00 +0000
+++ b/helpers/natty/DATA/apt-mirror/Trisquel-mirror.list	2012-02-16 23:51:28 +0000
@@ -0,0 +1,27 @@
+############# config ##################
+#
+# set base_path    /var/spool/apt-mirror
+#
+# set mirror_path  $base_path/mirror
+# set skel_path    $base_path/skel
+# set var_path     $base_path/var
+# set cleanscript $var_path/clean.sh
+# set defaultarch  <running host architecture>
+# set postmirror_script $var_path/postmirror.sh
+# set run_postmirror 0
+set nthreads     20
+set _tilde 0
+#
+############# end config ##############
+
+deb http://archive.trisquel.info/trisquel @CODENAME@ main
+deb http://archive.trisquel.info/trisquel @CODENAME at -security main 
+deb http://archive.trisquel.info/trisquel @CODENAME at -updates main 
+deb http://archive.trisquel.info/trisquel @CODENAME at -backports main 
+
+deb-src http://archive.trisquel.info/trisquel @CODENAME@ main 
+deb-src http://archive.trisquel.info/trisquel @CODENAME at -security main 
+deb-src http://archive.trisquel.info/trisquel @CODENAME at -updates main 
+deb-src http://archive.trisquel.info/trisquel @CODENAME at -backports main 
+
+clean http://archive.trisquel.info/trisquel

=== added file 'helpers/natty/make-apt-mirror'
--- a/helpers/natty/make-apt-mirror	1970-01-01 00:00:00 +0000
+++ b/helpers/natty/make-apt-mirror	2012-02-16 23:51:28 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#    Copyright (C) 2012  Santiago Rodr??guez  <santi at trisquel.info>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+cp $DATA/Trisquel-mirror.list debian/
+
+changelog "Added config for Trisquel GNU/Linux"
+
+compile
+

=== added directory 'helpers/oneiric/DATA/apt-mirror'
=== added file 'helpers/oneiric/DATA/apt-mirror/Trisquel-mirror.list'
--- a/helpers/oneiric/DATA/apt-mirror/Trisquel-mirror.list	1970-01-01 00:00:00 +0000
+++ b/helpers/oneiric/DATA/apt-mirror/Trisquel-mirror.list	2012-02-16 23:51:28 +0000
@@ -0,0 +1,27 @@
+############# config ##################
+#
+# set base_path    /var/spool/apt-mirror
+#
+# set mirror_path  $base_path/mirror
+# set skel_path    $base_path/skel
+# set var_path     $base_path/var
+# set cleanscript $var_path/clean.sh
+# set defaultarch  <running host architecture>
+# set postmirror_script $var_path/postmirror.sh
+# set run_postmirror 0
+set nthreads     20
+set _tilde 0
+#
+############# end config ##############
+
+deb http://archive.trisquel.info/trisquel @CODENAME@ main
+deb http://archive.trisquel.info/trisquel @CODENAME at -security main 
+deb http://archive.trisquel.info/trisquel @CODENAME at -updates main 
+deb http://archive.trisquel.info/trisquel @CODENAME at -backports main 
+
+deb-src http://archive.trisquel.info/trisquel @CODENAME@ main 
+deb-src http://archive.trisquel.info/trisquel @CODENAME at -security main 
+deb-src http://archive.trisquel.info/trisquel @CODENAME at -updates main 
+deb-src http://archive.trisquel.info/trisquel @CODENAME at -backports main 
+
+clean http://archive.trisquel.info/trisquel

=== added file 'helpers/oneiric/make-apt-mirror'
--- a/helpers/oneiric/make-apt-mirror	1970-01-01 00:00:00 +0000
+++ b/helpers/oneiric/make-apt-mirror	2012-02-16 23:51:28 +0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#    Copyright (C) 2012  Santiago Rodr??guez  <santi at trisquel.info>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+cp $DATA/Trisquel-mirror.list debian/
+
+changelog "Added config for Trisquel GNU/Linux"
+
+compile
+