Initial release for Brigantia
37
helpers/DATA/apache2/001_branding
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
#!/bin/sh -e
|
||||||
|
## 02_branding.dpatch by Adam Conrad <adconrad@0c3.net>
|
||||||
|
##
|
||||||
|
## All lines beginning with `## DP:' are a description of the patch.
|
||||||
|
## DP: Changes apache's PLATFORM based on lsb_release output
|
||||||
|
|
||||||
|
BUILD_DIST="($(lsb_release -i -s) GNU/Linux)"
|
||||||
|
|
||||||
|
if [ $# -ne 1 ]; then
|
||||||
|
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
-patch)
|
||||||
|
if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
|
||||||
|
echo >&2 "`basename $0`: patch already applied"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
# This is where we get our distribution-specific server signature from:
|
||||||
|
sed -i -e "s:(\" PLATFORM \"):${BUILD_DIST}:" server/core.c
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
-unpatch)
|
||||||
|
if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
|
||||||
|
sed -i -e "s:${BUILD_DIST}:(\" PLATFORM \"):" server/core.c
|
||||||
|
else
|
||||||
|
echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
Index: gnome-menus-2.28.0/layout/applications.menu
|
||||||
|
===================================================================
|
||||||
|
--- gnome-menus-2.28.0.orig/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200
|
||||||
|
+++ gnome-menus-2.28.0/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200
|
||||||
|
@@ -157,4 +157,29 @@
|
||||||
|
<Directory>Debian.directory</Directory>
|
||||||
|
</Menu>
|
||||||
|
|
||||||
|
+<Include>
|
||||||
|
+ <Filename>gnome-app-install.desktop</Filename>
|
||||||
|
+</Include>
|
||||||
|
+
|
||||||
|
+<!-- Separator between menus and gnome-app-install -->
|
||||||
|
+<Layout>
|
||||||
|
+ <Merge type="menus"/>
|
||||||
|
+ <Menuname>Internet</Menuname>
|
||||||
|
+ <Menuname>Office</Menuname>
|
||||||
|
+ <Menuname>Education</Menuname>
|
||||||
|
+ <Menuname>Development</Menuname>
|
||||||
|
+ <Menuname>Graphics</Menuname>
|
||||||
|
+ <Menuname>Multimedia</Menuname>
|
||||||
|
+ <Menuname>Games</Menuname>
|
||||||
|
+ <Menuname>Accessories</Menuname>
|
||||||
|
+ <Menuname>System</Menuname>
|
||||||
|
+ <Menuname>Universal Access</Menuname>
|
||||||
|
+ <Menuname>Debian</Menuname>
|
||||||
|
+ <Menuname>Other</Menuname>
|
||||||
|
+ <Menuname>wine-wine</Menuname>
|
||||||
|
+ <Merge type="files"/>
|
||||||
|
+ <Separator/>
|
||||||
|
+ <Filename>gnome-app-install.desktop</Filename>
|
||||||
|
+</Layout>
|
||||||
|
+
|
||||||
|
</Menu> <!-- End Applications -->
|
||||||
|
Index: gnome-menus-2.28.0/layout/settings.menu
|
||||||
|
===================================================================
|
||||||
|
--- gnome-menus-2.28.0.orig/layout/settings.menu 2009-09-24 11:34:47.000000000 +0200
|
||||||
|
+++ gnome-menus-2.28.0/layout/settings.menu 2009-09-24 11:35:22.000000000 +0200
|
||||||
|
@@ -43,6 +43,7 @@
|
||||||
|
<And>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
<Category>System</Category>
|
||||||
|
+ <Not><Filename>gnome-app-install.desktop</Filename></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End System Settings -->
|
||||||
168
helpers/DATA/app-install-data-ubuntu/applications.menu
Normal file
|
|
@ -0,0 +1,168 @@
|
||||||
|
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
|
||||||
|
<Menu>
|
||||||
|
|
||||||
|
<Name>Applications</Name>
|
||||||
|
<Directory>X-GNOME-Menu-Applications.directory</Directory>
|
||||||
|
|
||||||
|
<AppDir>.</AppDir>
|
||||||
|
|
||||||
|
<!-- we disable those here, otherwise we see e.g. wine menus -->
|
||||||
|
<!-- Read standard .directory and .desktop file locations -->
|
||||||
|
<!-- <DefaultAppDirs/> -->
|
||||||
|
<!-- Read in overrides and child menus from applications-merged/ -->
|
||||||
|
<!-- <DefaultMergeDirs/> -->
|
||||||
|
|
||||||
|
<DefaultDirectoryDirs/>
|
||||||
|
|
||||||
|
<!-- Accessories submenu -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Accessories</Name>
|
||||||
|
<Directory>Utility.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Utility</Category>
|
||||||
|
<!-- Accessibility spec must have either the Utility or Settings
|
||||||
|
category, and we display an accessibility submenu already for
|
||||||
|
the ones that do not have Settings, so don't display accessibility
|
||||||
|
applications here -->
|
||||||
|
<Not><Category>Accessibility</Category></Not>
|
||||||
|
<Not><Category>System</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Accessories -->
|
||||||
|
|
||||||
|
<!-- Accessibility submenu -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Universal Access</Name>
|
||||||
|
<Directory>Utility-Accessibility.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Accessibility</Category>
|
||||||
|
<Not><Category>Settings</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Accessibility -->
|
||||||
|
|
||||||
|
<!-- Development Tools -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Development</Name>
|
||||||
|
<Directory>Development.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Development</Category>
|
||||||
|
</And>
|
||||||
|
<Filename>emacs.desktop</Filename>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Development Tools -->
|
||||||
|
|
||||||
|
<!-- Education -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Education</Name>
|
||||||
|
<Directory>Education.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Education</Category>
|
||||||
|
<Not><Category>Science</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Education -->
|
||||||
|
|
||||||
|
<!-- Science -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Science</Name>
|
||||||
|
<Directory>GnomeScience.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Education</Category>
|
||||||
|
<Category>Science</Category>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Science -->
|
||||||
|
|
||||||
|
<!-- Games -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Games</Name>
|
||||||
|
<Directory>Game.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Game</Category>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Games -->
|
||||||
|
|
||||||
|
<!-- Graphics -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Graphics</Name>
|
||||||
|
<Directory>Graphics.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Graphics</Category>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Graphics -->
|
||||||
|
|
||||||
|
<!-- Internet -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Internet</Name>
|
||||||
|
<Directory>Network.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Network</Category>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Internet -->
|
||||||
|
|
||||||
|
<!-- Multimedia -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Multimedia</Name>
|
||||||
|
<Directory>AudioVideo.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>AudioVideo</Category>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Multimedia -->
|
||||||
|
|
||||||
|
<!-- Office -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Office</Name>
|
||||||
|
<Directory>Office.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Office</Category>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Office -->
|
||||||
|
|
||||||
|
<!-- System Tools-->
|
||||||
|
<Menu>
|
||||||
|
<Name>System</Name>
|
||||||
|
<Directory>System-Tools.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>System</Category>
|
||||||
|
<!-- <Not><Category>Settings</Category></Not> -->
|
||||||
|
<!-- <Not><Category>Game</Category></Not> -->
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End System Tools -->
|
||||||
|
|
||||||
|
<!-- Other -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Other</Name>
|
||||||
|
<Directory>X-GNOME-Other.directory</Directory>
|
||||||
|
<OnlyUnallocated/>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Application</Category>
|
||||||
|
<Not><Category>Core</Category></Not>
|
||||||
|
<!-- <Not><Category>Settings</Category></Not> -->
|
||||||
|
<Not><Category>Screensaver</Category></Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Other -->
|
||||||
|
|
||||||
|
|
||||||
|
</Menu> <!-- End Applications -->
|
||||||
27
helpers/DATA/apt-mirror/Trisquel-mirror.list
Normal file
|
|
@ -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@-security main
|
||||||
|
deb http://archive.trisquel.info/trisquel @CODENAME@-updates main
|
||||||
|
deb http://archive.trisquel.info/trisquel @CODENAME@-backports main
|
||||||
|
|
||||||
|
deb-src http://archive.trisquel.info/trisquel @CODENAME@ main
|
||||||
|
deb-src http://archive.trisquel.info/trisquel @CODENAME@-security main
|
||||||
|
deb-src http://archive.trisquel.info/trisquel @CODENAME@-updates main
|
||||||
|
deb-src http://archive.trisquel.info/trisquel @CODENAME@-backports main
|
||||||
|
|
||||||
|
clean http://archive.trisquel.info/trisquel
|
||||||
BIN
helpers/DATA/apt/trisquel-archive.gpg
Normal file
620
helpers/DATA/asunder/asunder.4061-aac.patch
Normal file
|
|
@ -0,0 +1,620 @@
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/callbacks.c src/callbacks.c
|
||||||
|
--- ../asunder-2.0-orig/src/callbacks.c 2010-01-23 16:21:15.000000000 +0000
|
||||||
|
+++ src/callbacks.c 2011-11-08 18:10:15.000000000 +0000
|
||||||
|
@@ -510,31 +510,6 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-on_rip_aac_toggled (GtkToggleButton *togglebutton,
|
||||||
|
- gpointer user_data)
|
||||||
|
-{
|
||||||
|
- if (gtk_toggle_button_get_active(togglebutton) && !program_exists("neroAacEnc"))
|
||||||
|
- {
|
||||||
|
- GtkWidget * dialog;
|
||||||
|
- dialog = gtk_message_dialog_new(GTK_WINDOW(win_main),
|
||||||
|
- GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
|
||||||
|
- _("%s was not found in your path. Asunder requires it to create %s files. "
|
||||||
|
- "All %s functionality is disabled."),
|
||||||
|
- "'neroAacEnc'", "MP4", "AAC");
|
||||||
|
- gtk_dialog_run(GTK_DIALOG(dialog));
|
||||||
|
- gtk_widget_destroy(dialog);
|
||||||
|
-
|
||||||
|
- global_prefs->rip_aac = 0;
|
||||||
|
- gtk_toggle_button_set_active(togglebutton, global_prefs->rip_aac);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (!gtk_toggle_button_get_active(togglebutton))
|
||||||
|
- disable_aac_widgets();
|
||||||
|
- else
|
||||||
|
- enable_aac_widgets();
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
on_rip_musepack_toggled (GtkToggleButton *togglebutton,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/callbacks.h src/callbacks.h
|
||||||
|
--- ../asunder-2.0-orig/src/callbacks.h 2010-01-23 16:21:15.000000000 +0000
|
||||||
|
+++ src/callbacks.h 2011-11-08 18:20:03.000000000 +0000
|
||||||
|
@@ -164,9 +164,6 @@
|
||||||
|
on_rip_monkey_toggled (GtkToggleButton *togglebutton,
|
||||||
|
gpointer user_data);
|
||||||
|
void
|
||||||
|
-on_rip_aac_toggled (GtkToggleButton *togglebutton,
|
||||||
|
- gpointer user_data);
|
||||||
|
-void
|
||||||
|
on_rip_musepack_toggled (GtkToggleButton *togglebutton,
|
||||||
|
gpointer user_data);
|
||||||
|
void
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c
|
||||||
|
--- ../asunder-2.0-orig/src/interface.c 2010-07-17 11:44:06.000000000 +0000
|
||||||
|
+++ src/interface.c 2011-11-08 18:09:31.000000000 +0000
|
||||||
|
@@ -863,61 +863,6 @@
|
||||||
|
GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
|
||||||
|
/* END MONKEY */
|
||||||
|
|
||||||
|
- expander = gtk_expander_new(_("Proprietary encoders"));
|
||||||
|
- gtk_widget_show (expander);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
|
||||||
|
- GLADE_HOOKUP_OBJECT (prefs, expander, "proprietary_formats_expander");
|
||||||
|
-
|
||||||
|
- hiddenbox = gtk_vbox_new (FALSE, 0);
|
||||||
|
- gtk_widget_show (hiddenbox);
|
||||||
|
- gtk_container_add (GTK_CONTAINER (expander), hiddenbox);
|
||||||
|
-
|
||||||
|
- /* AAC */
|
||||||
|
- GtkWidget* rip_aac;
|
||||||
|
- GtkWidget* aacQuality;
|
||||||
|
- GtkWidget* aacVbox;
|
||||||
|
-
|
||||||
|
- frame8 = gtk_frame_new (NULL);
|
||||||
|
- gtk_widget_show (frame8);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0);
|
||||||
|
-
|
||||||
|
- alignment11 = gtk_alignment_new (0.5, 0.5, 1, 1);
|
||||||
|
- gtk_widget_show (alignment11);
|
||||||
|
- gtk_container_add (GTK_CONTAINER (frame8), alignment11);
|
||||||
|
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment11), 2, 2, 12, 2);
|
||||||
|
-
|
||||||
|
- aacVbox = gtk_vbox_new (FALSE, 0);
|
||||||
|
- gtk_widget_show (aacVbox);
|
||||||
|
- gtk_container_add (GTK_CONTAINER (alignment11), aacVbox);
|
||||||
|
-
|
||||||
|
- hbox13 = gtk_hbox_new (FALSE, 0);
|
||||||
|
- gtk_widget_show (hbox13);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (aacVbox), hbox13, FALSE, FALSE, 0);
|
||||||
|
-
|
||||||
|
- label = gtk_label_new (_("Quality"));
|
||||||
|
- gtk_widget_show (label);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (hbox13), label, FALSE, FALSE, 0);
|
||||||
|
- GLADE_HOOKUP_OBJECT (prefs, label, "aac_quality_lbl");
|
||||||
|
-
|
||||||
|
- aacQuality = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 1, 100, 1, 1, 1)));
|
||||||
|
- gtk_widget_show (aacQuality);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (hbox13), aacQuality, TRUE, TRUE, 5);
|
||||||
|
- gtk_scale_set_value_pos (GTK_SCALE (aacQuality), GTK_POS_RIGHT);
|
||||||
|
- gtk_scale_set_digits (GTK_SCALE (aacQuality), 0);
|
||||||
|
- GLADE_HOOKUP_OBJECT (prefs, aacQuality, "aac_quality_slider");
|
||||||
|
-
|
||||||
|
- tooltips = gtk_tooltips_new ();
|
||||||
|
- gtk_tooltips_set_tip (tooltips, aacQuality, _("Higher quality means bigger file. Default is 60."), NULL);
|
||||||
|
-
|
||||||
|
- rip_aac = gtk_check_button_new_with_mnemonic (_("AAC (lossy compression, Nero encoder)"));
|
||||||
|
- gtk_widget_show (rip_aac);
|
||||||
|
- gtk_frame_set_label_widget (GTK_FRAME (frame8), rip_aac);
|
||||||
|
- g_signal_connect ((gpointer) rip_aac, "toggled",
|
||||||
|
- G_CALLBACK (on_rip_aac_toggled),
|
||||||
|
- NULL);
|
||||||
|
- GLADE_HOOKUP_OBJECT (prefs, rip_aac, "rip_aac");
|
||||||
|
- /* END AAC */
|
||||||
|
-
|
||||||
|
label = gtk_label_new (_("Encode"));
|
||||||
|
gtk_widget_show (label);
|
||||||
|
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label);
|
||||||
|
@@ -1297,18 +1242,6 @@
|
||||||
|
gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
-void disable_aac_widgets(void)
|
||||||
|
-{
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_lbl"), FALSE);
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_slider"), FALSE);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void enable_aac_widgets(void)
|
||||||
|
-{
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_lbl"), TRUE);
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_slider"), TRUE);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
void disable_musepack_widgets(void)
|
||||||
|
{
|
||||||
|
gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
|
||||||
|
@@ -1545,8 +1478,7 @@
|
||||||
|
static const char*
|
||||||
|
GBLcomments =
|
||||||
|
N_("An application to save tracks from an Audio CD \n"
|
||||||
|
-"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio, and/or "
|
||||||
|
-"AAC files.");
|
||||||
|
+"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files ");
|
||||||
|
|
||||||
|
static const char*
|
||||||
|
GBLcopyright =
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/interface.h src/interface.h
|
||||||
|
--- ../asunder-2.0-orig/src/interface.h 2009-08-25 01:32:28.000000000 +0000
|
||||||
|
+++ src/interface.h 2011-11-08 18:08:28.000000000 +0000
|
||||||
|
@@ -15,8 +15,6 @@
|
||||||
|
void enable_wavpack_widgets(void);
|
||||||
|
void disable_monkey_widgets(void);
|
||||||
|
void enable_monkey_widgets(void);
|
||||||
|
-void disable_aac_widgets(void);
|
||||||
|
-void enable_aac_widgets(void);
|
||||||
|
void disable_musepack_widgets(void);
|
||||||
|
void enable_musepack_widgets(void);
|
||||||
|
#if GTK_MINOR_VERSION >= 6
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
|
||||||
|
--- ../asunder-2.0-orig/src/prefs.c 2009-08-25 01:32:28.000000000 +0000
|
||||||
|
+++ src/prefs.c 2011-11-08 18:14:40.000000000 +0000
|
||||||
|
@@ -122,8 +122,6 @@
|
||||||
|
p->wavpack_bitrate = 3;
|
||||||
|
p->rip_monkey = 0;
|
||||||
|
p->monkey_compression = 2;
|
||||||
|
- p->rip_aac = 0;
|
||||||
|
- p->aac_quality = 60;
|
||||||
|
p->rip_musepack = 0;
|
||||||
|
p->musepack_bitrate = 2;
|
||||||
|
|
||||||
|
@@ -184,8 +182,6 @@
|
||||||
|
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")), p->rip_monkey);
|
||||||
|
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression);
|
||||||
|
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_aac")), p->rip_aac);
|
||||||
|
- gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider")), p->aac_quality);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack);
|
||||||
|
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "eject_on_done")), p->eject_on_done);
|
||||||
|
@@ -216,8 +212,6 @@
|
||||||
|
enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
|
||||||
|
if( !(p->rip_monkey) )
|
||||||
|
disable_monkey_widgets();
|
||||||
|
- if( !(p->rip_aac) )
|
||||||
|
- disable_aac_widgets();
|
||||||
|
if( !(p->rip_musepack) )
|
||||||
|
disable_musepack_widgets();
|
||||||
|
}
|
||||||
|
@@ -275,8 +269,6 @@
|
||||||
|
p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")));
|
||||||
|
p->rip_monkey = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")));
|
||||||
|
p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")));
|
||||||
|
- p->rip_aac = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_aac")));
|
||||||
|
- p->aac_quality = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider")));
|
||||||
|
p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")));
|
||||||
|
p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")));
|
||||||
|
|
||||||
|
@@ -358,8 +350,6 @@
|
||||||
|
fprintf(config, "%d\n", p->cddb_port_number);
|
||||||
|
fprintf(config, "%d\n", p->rip_monkey);
|
||||||
|
fprintf(config, "%d\n", p->monkey_compression);
|
||||||
|
- fprintf(config, "%d\n", p->rip_aac);
|
||||||
|
- fprintf(config, "%d\n", p->aac_quality);
|
||||||
|
fprintf(config, "%d\n", p->rip_musepack);
|
||||||
|
fprintf(config, "%d\n", p->musepack_bitrate);
|
||||||
|
fprintf(config, "%d\n", p->more_formats_expanded);
|
||||||
|
@@ -537,12 +527,6 @@
|
||||||
|
p->monkey_compression = read_line_num(fd);
|
||||||
|
|
||||||
|
// this one can be 0
|
||||||
|
- p->rip_aac = read_line_num(fd);
|
||||||
|
-
|
||||||
|
- // this one can be 0
|
||||||
|
- p->aac_quality = read_line_num(fd);
|
||||||
|
-
|
||||||
|
- // this one can be 0
|
||||||
|
p->rip_musepack = read_line_num(fd);
|
||||||
|
|
||||||
|
// this one can be 0
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/prefs.h src/prefs.h
|
||||||
|
--- ../asunder-2.0-orig/src/prefs.h 2009-09-01 03:22:41.000000000 +0000
|
||||||
|
+++ src/prefs.h 2011-11-08 18:20:15.000000000 +0000
|
||||||
|
@@ -34,8 +34,6 @@
|
||||||
|
int cddb_port_number;
|
||||||
|
int rip_monkey;
|
||||||
|
int monkey_compression;
|
||||||
|
- int rip_aac;
|
||||||
|
- int aac_quality;
|
||||||
|
int rip_musepack;
|
||||||
|
int musepack_bitrate;
|
||||||
|
int more_formats_expanded;
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
|
||||||
|
--- ../asunder-2.0-orig/src/threads.c 2010-05-01 22:27:47.000000000 +0000
|
||||||
|
+++ src/threads.c 2011-11-08 18:21:22.000000000 +0000
|
||||||
|
@@ -39,7 +39,6 @@
|
||||||
|
static FILE * playlist_wavpack = NULL;
|
||||||
|
static FILE * playlist_monkey = NULL;
|
||||||
|
static FILE * playlist_musepack = NULL;
|
||||||
|
-static FILE * playlist_aac = NULL;
|
||||||
|
|
||||||
|
/* ripping or encoding, so that can know not to clear the tracklist on eject */
|
||||||
|
bool working;
|
||||||
|
@@ -60,7 +59,6 @@
|
||||||
|
static double wavpack_percent;
|
||||||
|
static double monkey_percent;
|
||||||
|
static double musepack_percent;
|
||||||
|
-static double aac_percent;
|
||||||
|
static int rip_tracks_completed;
|
||||||
|
static int encode_tracks_completed;
|
||||||
|
|
||||||
|
@@ -86,13 +84,11 @@
|
||||||
|
kill(monkey_pid, SIGKILL);
|
||||||
|
if (musepack_pid != 0)
|
||||||
|
kill(musepack_pid, SIGKILL);
|
||||||
|
- if (aac_pid != 0)
|
||||||
|
- kill(aac_pid, SIGKILL);
|
||||||
|
|
||||||
|
/* wait until all the worker threads are done */
|
||||||
|
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
|
||||||
|
flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
|
||||||
|
- musepack_pid != 0 || aac_pid != 0)
|
||||||
|
+ musepack_pid != 0)
|
||||||
|
{
|
||||||
|
debugLog("w1");
|
||||||
|
usleep(100000);
|
||||||
|
@@ -114,8 +110,8 @@
|
||||||
|
gdk_flush();
|
||||||
|
working = false;
|
||||||
|
|
||||||
|
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
|
||||||
|
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
|
||||||
|
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk ,
|
||||||
|
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
|
||||||
|
}
|
||||||
|
|
||||||
|
// spawn needed threads and begin ripping
|
||||||
|
@@ -134,7 +130,6 @@
|
||||||
|
wavpack_percent = 0.0;
|
||||||
|
monkey_percent = 0.0;
|
||||||
|
musepack_percent = 0.0;
|
||||||
|
- aac_percent = 0.0;
|
||||||
|
rip_tracks_completed = 0;
|
||||||
|
encode_tracks_completed = 0;
|
||||||
|
|
||||||
|
@@ -161,7 +156,7 @@
|
||||||
|
// make sure there's at least one format to rip to
|
||||||
|
if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg &&
|
||||||
|
!global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey &&
|
||||||
|
- !global_prefs->rip_musepack && !global_prefs->rip_aac)
|
||||||
|
+ !global_prefs->rip_musepack )
|
||||||
|
{
|
||||||
|
GtkWidget * dialog;
|
||||||
|
dialog = gtk_message_dialog_new(GTK_WINDOW(win_main),
|
||||||
|
@@ -291,14 +286,6 @@
|
||||||
|
|
||||||
|
free(filename);
|
||||||
|
}
|
||||||
|
- if (global_prefs->rip_aac)
|
||||||
|
- {
|
||||||
|
- char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "m4a.m3u");
|
||||||
|
-
|
||||||
|
- make_playlist(filename, &playlist_monkey);
|
||||||
|
-
|
||||||
|
- free(filename);
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
free(albumdir);
|
||||||
|
@@ -313,7 +300,6 @@
|
||||||
|
numWavpackFailed = 0;
|
||||||
|
numMonkeyFailed = 0;
|
||||||
|
numMusepackFailed = 0;
|
||||||
|
- numAacFailed = 0;
|
||||||
|
|
||||||
|
numCdparanoiaOk = 0;
|
||||||
|
numLameOk = 0;
|
||||||
|
@@ -322,7 +308,6 @@
|
||||||
|
numWavpackOk = 0;
|
||||||
|
numMonkeyOk = 0;
|
||||||
|
numMusepackOk = 0;
|
||||||
|
- numAacOk = 0;
|
||||||
|
|
||||||
|
ripper = g_thread_create(rip, NULL, TRUE, NULL);
|
||||||
|
encoder = g_thread_create(encode, NULL, TRUE, NULL);
|
||||||
|
@@ -461,7 +446,6 @@
|
||||||
|
char* wavpackfilename2 = NULL;
|
||||||
|
char* monkeyfilename = NULL;
|
||||||
|
char* musepackfilename = NULL;
|
||||||
|
- char* aacfilename = NULL;
|
||||||
|
struct stat statStruct;
|
||||||
|
bool doEncode;
|
||||||
|
|
||||||
|
@@ -541,7 +525,6 @@
|
||||||
|
wavpackfilename2 = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wvc");
|
||||||
|
monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape");
|
||||||
|
musepackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "mpc");
|
||||||
|
- aacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "m4a");
|
||||||
|
|
||||||
|
if (global_prefs->rip_mp3)
|
||||||
|
{
|
||||||
|
@@ -745,41 +728,6 @@
|
||||||
|
fflush(playlist_musepack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- if (global_prefs->rip_aac)
|
||||||
|
- {
|
||||||
|
- debugLog("Encoding track %d to \"%s\"\n", tracknum, aacfilename);
|
||||||
|
-
|
||||||
|
- if (aborted) g_thread_exit(NULL);
|
||||||
|
-
|
||||||
|
- rc = stat(aacfilename, &statStruct);
|
||||||
|
- if(rc == 0)
|
||||||
|
- {
|
||||||
|
- gdk_threads_enter();
|
||||||
|
- if(confirmOverwrite(aacfilename))
|
||||||
|
- doEncode = true;
|
||||||
|
- else
|
||||||
|
- doEncode = false;
|
||||||
|
- gdk_threads_leave();
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- doEncode = true;
|
||||||
|
-
|
||||||
|
- if(doEncode)
|
||||||
|
- {
|
||||||
|
- aac(wavfilename, aacfilename,
|
||||||
|
- global_prefs->aac_quality,
|
||||||
|
- &aac_percent);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (aborted) g_thread_exit(NULL);
|
||||||
|
-
|
||||||
|
- if (playlist_aac)
|
||||||
|
- {
|
||||||
|
- fprintf(playlist_aac, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle);
|
||||||
|
- fprintf(playlist_aac, "%s\n", basename(aacfilename));
|
||||||
|
- fflush(playlist_aac);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
if (!global_prefs->rip_wav)
|
||||||
|
{
|
||||||
|
debugLog("Removing track %d WAV file\n", tracknum);
|
||||||
|
@@ -806,7 +754,6 @@
|
||||||
|
free(wavpackfilename);
|
||||||
|
free(monkeyfilename);
|
||||||
|
free(musepackfilename);
|
||||||
|
- free(aacfilename);
|
||||||
|
|
||||||
|
mp3_percent = 0.0;
|
||||||
|
ogg_percent = 0.0;
|
||||||
|
@@ -814,7 +761,6 @@
|
||||||
|
wavpack_percent = 0.0;
|
||||||
|
monkey_percent = 0.0;
|
||||||
|
musepack_percent = 0.0;
|
||||||
|
- aac_percent = 0.0;
|
||||||
|
encode_tracks_completed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -843,8 +789,6 @@
|
||||||
|
playlist_monkey = NULL;
|
||||||
|
if (playlist_musepack) fclose(playlist_musepack);
|
||||||
|
playlist_musepack = NULL;
|
||||||
|
- if (playlist_aac) fclose(playlist_aac);
|
||||||
|
- playlist_aac = NULL;
|
||||||
|
|
||||||
|
g_mutex_free(barrier);
|
||||||
|
barrier = NULL;
|
||||||
|
@@ -854,7 +798,7 @@
|
||||||
|
/* wait until all the worker threads are done */
|
||||||
|
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
|
||||||
|
flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
|
||||||
|
- musepack_pid != 0 || aac_pid != 0)
|
||||||
|
+ musepack_pid != 0 )
|
||||||
|
{
|
||||||
|
debugLog("w2");
|
||||||
|
usleep(100000);
|
||||||
|
@@ -867,8 +811,8 @@
|
||||||
|
gtk_widget_hide(win_ripping);
|
||||||
|
gdk_flush();
|
||||||
|
|
||||||
|
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
|
||||||
|
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
|
||||||
|
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk ,
|
||||||
|
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
|
||||||
|
gdk_threads_leave();
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
@@ -890,8 +834,6 @@
|
||||||
|
parts++;
|
||||||
|
if(global_prefs->rip_musepack)
|
||||||
|
parts++;
|
||||||
|
- if(global_prefs->rip_aac)
|
||||||
|
- parts++;
|
||||||
|
|
||||||
|
gdk_threads_enter();
|
||||||
|
GtkProgressBar * progress_total = GTK_PROGRESS_BAR(lookup_widget(win_ripping, "progress_total"));
|
||||||
|
@@ -926,10 +868,10 @@
|
||||||
|
|
||||||
|
debugLog("completed tracks %d, rip %.2lf%%; encoded tracks %d, "
|
||||||
|
"mp3 %.2lf%% ogg %.2lf%% flac %.2lf%% wavpack %.2lf%% "
|
||||||
|
- "monkey %.2lf%% musepack %.2lf%% aac %.2lf%%\n\n",
|
||||||
|
+ "monkey %.2lf%% musepack %.2lf%% \n\n",
|
||||||
|
rip_tracks_completed, rip_percent*100, encode_tracks_completed,
|
||||||
|
mp3_percent*100, ogg_percent*100, flac_percent*100, wavpack_percent*100,
|
||||||
|
- monkey_percent*100,musepack_percent*100,aac_percent*100);
|
||||||
|
+ monkey_percent*100,musepack_percent*100);
|
||||||
|
|
||||||
|
prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
|
||||||
|
snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
|
||||||
|
@@ -941,7 +883,7 @@
|
||||||
|
{
|
||||||
|
pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) +
|
||||||
|
((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
|
||||||
|
- +musepack_percent+aac_percent) /
|
||||||
|
+ +musepack_percent) /
|
||||||
|
(parts-1) / tracks_to_rip);
|
||||||
|
snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100),
|
||||||
|
(encode_tracks_completed < tracks_to_rip)
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
|
||||||
|
--- ../asunder-2.0-orig/src/wrappers.c 2010-07-17 12:13:29.000000000 +0000
|
||||||
|
+++ src/wrappers.c 2011-11-08 18:19:07.000000000 +0000
|
||||||
|
@@ -34,7 +34,6 @@
|
||||||
|
pid_t wavpack_pid;
|
||||||
|
pid_t monkey_pid;
|
||||||
|
pid_t musepack_pid;
|
||||||
|
-pid_t aac_pid;
|
||||||
|
|
||||||
|
int numCdparanoiaFailed;
|
||||||
|
int numLameFailed;
|
||||||
|
@@ -43,7 +42,6 @@
|
||||||
|
int numWavpackFailed;
|
||||||
|
int numMonkeyFailed;
|
||||||
|
int numMusepackFailed;
|
||||||
|
-int numAacFailed;
|
||||||
|
|
||||||
|
int numCdparanoiaOk;
|
||||||
|
int numLameOk;
|
||||||
|
@@ -52,7 +50,6 @@
|
||||||
|
int numWavpackOk;
|
||||||
|
int numMonkeyOk;
|
||||||
|
int numMusepackOk;
|
||||||
|
-int numAacOk;
|
||||||
|
|
||||||
|
int numchildren = 0;
|
||||||
|
static bool waitBeforeSigchld;
|
||||||
|
@@ -89,7 +86,6 @@
|
||||||
|
extern pid_t wavpack_pid;
|
||||||
|
extern pid_t monkey_pid;
|
||||||
|
extern pid_t musepack_pid;
|
||||||
|
-extern pid_t aac_pid;
|
||||||
|
|
||||||
|
// signal handler to find out when our child has exited
|
||||||
|
void sigchld(int signum)
|
||||||
|
@@ -100,9 +96,9 @@
|
||||||
|
pid = wait(&status);
|
||||||
|
|
||||||
|
debugLog("sigchld for %d (know about wav %d, mp3 %d, ogg %d, flac %d, "
|
||||||
|
- "wv %d, ape %d, mpc %d, m4a %d\n",
|
||||||
|
+ "wv %d, ape %d, mpc %d\n",
|
||||||
|
pid, cdparanoia_pid, lame_pid, oggenc_pid, flac_pid,
|
||||||
|
- wavpack_pid, monkey_pid, musepack_pid, aac_pid);
|
||||||
|
+ wavpack_pid, monkey_pid, musepack_pid);
|
||||||
|
|
||||||
|
/* this is because i can't seem to be able to block sigchld: */
|
||||||
|
while(waitBeforeSigchld)
|
||||||
|
@@ -113,7 +109,7 @@
|
||||||
|
|
||||||
|
if (pid != cdparanoia_pid && pid != lame_pid && pid != oggenc_pid &&
|
||||||
|
pid != flac_pid && pid != wavpack_pid && pid != monkey_pid &&
|
||||||
|
- pid != musepack_pid && pid != aac_pid)
|
||||||
|
+ pid != musepack_pid )
|
||||||
|
{
|
||||||
|
printf("SIGCHLD for unknown pid, report bug please");
|
||||||
|
}
|
||||||
|
@@ -166,11 +162,6 @@
|
||||||
|
musepack_pid = 0;
|
||||||
|
numMusepackFailed++;
|
||||||
|
}
|
||||||
|
- else if (pid == aac_pid)
|
||||||
|
- {
|
||||||
|
- aac_pid = 0;
|
||||||
|
- numAacFailed++;
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -210,11 +201,6 @@
|
||||||
|
musepack_pid = 0;
|
||||||
|
numMusepackOk++;
|
||||||
|
}
|
||||||
|
- else if (pid == aac_pid)
|
||||||
|
- {
|
||||||
|
- aac_pid = 0;
|
||||||
|
- numAacOk++;
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
debugLog("sigchld completed\n");
|
||||||
|
@@ -981,50 +967,3 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-void aac(char* wavfilename,
|
||||||
|
- char* aacfilename,
|
||||||
|
- int quality,
|
||||||
|
- double* progress)
|
||||||
|
-{
|
||||||
|
- const char* args[8];
|
||||||
|
- int fd;
|
||||||
|
- int pos;
|
||||||
|
-
|
||||||
|
- pos = 0;
|
||||||
|
- args[pos++] = "neroAacEnc";
|
||||||
|
-
|
||||||
|
- args[pos++] = "-q";
|
||||||
|
- char qualityParam[5];
|
||||||
|
- snprintf(qualityParam, 5, "0.%d", quality);
|
||||||
|
- args[pos++] = qualityParam;
|
||||||
|
-
|
||||||
|
- args[pos++] = "-if";
|
||||||
|
- args[pos++] = wavfilename;
|
||||||
|
- args[pos++] = "-of";
|
||||||
|
- args[pos++] = aacfilename;
|
||||||
|
- args[pos++] = NULL;
|
||||||
|
-
|
||||||
|
- fd = exec_with_output(args, STDERR_FILENO, &aac_pid);
|
||||||
|
-
|
||||||
|
- int size;
|
||||||
|
- char buf[256];
|
||||||
|
- do
|
||||||
|
- {
|
||||||
|
- /* The Nero encoder doesn't give me an estimate for completion
|
||||||
|
- * or any way to estimate it myself, just the number of seconds
|
||||||
|
- * done. So just sit in here until the program exits */
|
||||||
|
- size = read(fd, &buf[0], 256);
|
||||||
|
-
|
||||||
|
- if (size == -1 && errno == EINTR)
|
||||||
|
- /* signal interrupted read(), try again */
|
||||||
|
- size = 1;
|
||||||
|
- } while (size > 0);
|
||||||
|
-
|
||||||
|
- close(fd);
|
||||||
|
- /* don't go on until the signal for the previous call is handled */
|
||||||
|
- while (aac_pid != 0)
|
||||||
|
- {
|
||||||
|
- debugLog("w11 (%d)\n", aac_pid);
|
||||||
|
- usleep(100000);
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
|
||||||
|
--- ../asunder-2.0-orig/src/wrappers.h 2010-04-16 01:15:02.000000000 +0000
|
||||||
|
+++ src/wrappers.h 2011-11-08 18:19:37.000000000 +0000
|
||||||
|
@@ -8,7 +8,6 @@
|
||||||
|
extern pid_t wavpack_pid;
|
||||||
|
extern pid_t monkey_pid;
|
||||||
|
extern pid_t musepack_pid;
|
||||||
|
-extern pid_t aac_pid;
|
||||||
|
|
||||||
|
extern int numCdparanoiaFailed;
|
||||||
|
extern int numLameFailed;
|
||||||
|
@@ -17,7 +16,6 @@
|
||||||
|
extern int numWavpackFailed;
|
||||||
|
extern int numMonkeyFailed;
|
||||||
|
extern int numMusepackFailed;
|
||||||
|
-extern int numAacFailed;
|
||||||
|
|
||||||
|
extern int numCdparanoiaOk;
|
||||||
|
extern int numLameOk;
|
||||||
|
@@ -26,7 +24,6 @@
|
||||||
|
extern int numWavpackOk;
|
||||||
|
extern int numMonkeyOk;
|
||||||
|
extern int numMusepackOk;
|
||||||
|
-extern int numAacOk;
|
||||||
|
|
||||||
|
// signal handler to find out when out child has exited
|
||||||
|
void sigchld(int signum);
|
||||||
|
@@ -130,7 +127,3 @@
|
||||||
|
int quality,
|
||||||
|
double* progress);
|
||||||
|
|
||||||
|
-void aac(char* wavfilename,
|
||||||
|
- char* aacfilename,
|
||||||
|
- int quality,
|
||||||
|
- double* progress);
|
||||||
632
helpers/DATA/asunder/asunder.4061-monkey.patch
Normal file
|
|
@ -0,0 +1,632 @@
|
||||||
|
diff -ruN src-monkey/callbacks.c src/callbacks.c
|
||||||
|
--- src-monkey/callbacks.c 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/callbacks.c 2011-11-08 19:29:08.000000000 +0000
|
||||||
|
@@ -485,31 +485,6 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
-on_rip_monkey_toggled (GtkToggleButton *togglebutton,
|
||||||
|
- gpointer user_data)
|
||||||
|
-{
|
||||||
|
- if (gtk_toggle_button_get_active(togglebutton) && !program_exists("mac"))
|
||||||
|
- {
|
||||||
|
- GtkWidget * dialog;
|
||||||
|
- dialog = gtk_message_dialog_new(GTK_WINDOW(win_main),
|
||||||
|
- GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
|
||||||
|
- _("%s was not found in your path. Asunder requires it to create %s files. "
|
||||||
|
- "All %s functionality is disabled."),
|
||||||
|
- "'mac'", "APE", "Monkey's Audio");
|
||||||
|
- gtk_dialog_run(GTK_DIALOG(dialog));
|
||||||
|
- gtk_widget_destroy(dialog);
|
||||||
|
-
|
||||||
|
- global_prefs->rip_monkey = 0;
|
||||||
|
- gtk_toggle_button_set_active(togglebutton, global_prefs->rip_monkey);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (!gtk_toggle_button_get_active(togglebutton))
|
||||||
|
- disable_monkey_widgets();
|
||||||
|
- else
|
||||||
|
- enable_monkey_widgets();
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void
|
||||||
|
on_rip_musepack_toggled (GtkToggleButton *togglebutton,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
diff -ruN src-monkey/callbacks.h src/callbacks.h
|
||||||
|
--- src-monkey/callbacks.h 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/callbacks.h 2011-11-08 19:29:26.000000000 +0000
|
||||||
|
@@ -161,9 +161,6 @@
|
||||||
|
on_rip_wavpack_toggled (GtkToggleButton *togglebutton,
|
||||||
|
gpointer user_data);
|
||||||
|
void
|
||||||
|
-on_rip_monkey_toggled (GtkToggleButton *togglebutton,
|
||||||
|
- gpointer user_data);
|
||||||
|
-void
|
||||||
|
on_rip_musepack_toggled (GtkToggleButton *togglebutton,
|
||||||
|
gpointer user_data);
|
||||||
|
void
|
||||||
|
diff -ruN src-monkey/interface.c src/interface.c
|
||||||
|
--- src-monkey/interface.c 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/interface.c 2011-11-08 19:30:02.000000000 +0000
|
||||||
|
@@ -816,53 +816,6 @@
|
||||||
|
GLADE_HOOKUP_OBJECT (prefs, rip_musepack, "rip_musepack");
|
||||||
|
/* END MUSEPACK */
|
||||||
|
|
||||||
|
- /* MONKEY */
|
||||||
|
- GtkWidget* frame8;
|
||||||
|
- GtkWidget* rip_monkey;
|
||||||
|
- GtkWidget* monkeyCompression;
|
||||||
|
- GtkWidget* monkeyVbox;
|
||||||
|
-
|
||||||
|
- frame8 = gtk_frame_new (NULL);
|
||||||
|
- gtk_widget_show (frame8);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0);
|
||||||
|
-
|
||||||
|
- alignment11 = gtk_alignment_new (0.5, 0.5, 1, 1);
|
||||||
|
- gtk_widget_show (alignment11);
|
||||||
|
- gtk_container_add (GTK_CONTAINER (frame8), alignment11);
|
||||||
|
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment11), 2, 2, 12, 2);
|
||||||
|
-
|
||||||
|
- monkeyVbox = gtk_vbox_new (FALSE, 0);
|
||||||
|
- gtk_widget_show (monkeyVbox);
|
||||||
|
- gtk_container_add (GTK_CONTAINER (alignment11), monkeyVbox);
|
||||||
|
-
|
||||||
|
- hbox13 = gtk_hbox_new (FALSE, 0);
|
||||||
|
- gtk_widget_show (hbox13);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (monkeyVbox), hbox13, FALSE, FALSE, 0);
|
||||||
|
-
|
||||||
|
- label = gtk_label_new (_("Compression level"));
|
||||||
|
- gtk_widget_show (label);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (hbox13), label, FALSE, FALSE, 0);
|
||||||
|
- GLADE_HOOKUP_OBJECT (prefs, label, "monkey_compression_lbl");
|
||||||
|
-
|
||||||
|
- monkeyCompression = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 5, 1, 1, 1)));
|
||||||
|
- gtk_widget_show (monkeyCompression);
|
||||||
|
- gtk_box_pack_start (GTK_BOX (hbox13), monkeyCompression, TRUE, TRUE, 5);
|
||||||
|
- gtk_scale_set_value_pos (GTK_SCALE (monkeyCompression), GTK_POS_RIGHT);
|
||||||
|
- gtk_scale_set_digits (GTK_SCALE (monkeyCompression), 0);
|
||||||
|
- GLADE_HOOKUP_OBJECT (prefs, monkeyCompression, "monkey_compression_slider");
|
||||||
|
-
|
||||||
|
- tooltips = gtk_tooltips_new ();
|
||||||
|
- gtk_tooltips_set_tip (tooltips, monkeyCompression, _("This does not affect the quality. Higher number means smaller file."), NULL);
|
||||||
|
-
|
||||||
|
- rip_monkey = gtk_check_button_new_with_mnemonic (_("Monkey's Audio (lossless compression)"));
|
||||||
|
- gtk_widget_show (rip_monkey);
|
||||||
|
- gtk_frame_set_label_widget (GTK_FRAME (frame8), rip_monkey);
|
||||||
|
- g_signal_connect ((gpointer) rip_monkey, "toggled",
|
||||||
|
- G_CALLBACK (on_rip_monkey_toggled),
|
||||||
|
- NULL);
|
||||||
|
- GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
|
||||||
|
- /* END MONKEY */
|
||||||
|
-
|
||||||
|
label = gtk_label_new (_("Encode"));
|
||||||
|
gtk_widget_show (label);
|
||||||
|
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label);
|
||||||
|
@@ -1230,18 +1183,6 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-void disable_monkey_widgets(void)
|
||||||
|
-{
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_lbl"), FALSE);
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), FALSE);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
-void enable_monkey_widgets(void)
|
||||||
|
-{
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_lbl"), TRUE);
|
||||||
|
- gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), TRUE);
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
void disable_musepack_widgets(void)
|
||||||
|
{
|
||||||
|
gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
|
||||||
|
@@ -1478,7 +1419,7 @@
|
||||||
|
static const char*
|
||||||
|
GBLcomments =
|
||||||
|
N_("An application to save tracks from an Audio CD \n"
|
||||||
|
-"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files ");
|
||||||
|
+"as WAV, MP3, OGG, FLAC, Wavpack, and Musepack audio files ");
|
||||||
|
|
||||||
|
static const char*
|
||||||
|
GBLcopyright =
|
||||||
|
diff -ruN src-monkey/interface.h src/interface.h
|
||||||
|
--- src-monkey/interface.h 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/interface.h 2011-11-08 19:30:17.000000000 +0000
|
||||||
|
@@ -13,8 +13,6 @@
|
||||||
|
void enable_ogg_widgets(void);
|
||||||
|
void disable_wavpack_widgets(void);
|
||||||
|
void enable_wavpack_widgets(void);
|
||||||
|
-void disable_monkey_widgets(void);
|
||||||
|
-void enable_monkey_widgets(void);
|
||||||
|
void disable_musepack_widgets(void);
|
||||||
|
void enable_musepack_widgets(void);
|
||||||
|
#if GTK_MINOR_VERSION >= 6
|
||||||
|
diff -ruN src-monkey/prefs.c src/prefs.c
|
||||||
|
--- src-monkey/prefs.c 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/prefs.c 2011-11-08 19:31:23.000000000 +0000
|
||||||
|
@@ -120,8 +120,6 @@
|
||||||
|
p->wavpack_compression = 1;
|
||||||
|
p->wavpack_hybrid = 1;
|
||||||
|
p->wavpack_bitrate = 3;
|
||||||
|
- p->rip_monkey = 0;
|
||||||
|
- p->monkey_compression = 2;
|
||||||
|
p->rip_musepack = 0;
|
||||||
|
p->musepack_bitrate = 2;
|
||||||
|
|
||||||
|
@@ -180,8 +178,6 @@
|
||||||
|
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression")), p->wavpack_compression);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid")), p->wavpack_hybrid);
|
||||||
|
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate);
|
||||||
|
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")), p->rip_monkey);
|
||||||
|
- gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack);
|
||||||
|
gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "eject_on_done")), p->eject_on_done);
|
||||||
|
@@ -210,8 +206,6 @@
|
||||||
|
disable_wavpack_widgets();
|
||||||
|
else
|
||||||
|
enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
|
||||||
|
- if( !(p->rip_monkey) )
|
||||||
|
- disable_monkey_widgets();
|
||||||
|
if( !(p->rip_musepack) )
|
||||||
|
disable_musepack_widgets();
|
||||||
|
}
|
||||||
|
@@ -267,8 +261,6 @@
|
||||||
|
p->wavpack_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression")));
|
||||||
|
p->wavpack_hybrid = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid")));
|
||||||
|
p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")));
|
||||||
|
- p->rip_monkey = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")));
|
||||||
|
- p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")));
|
||||||
|
p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")));
|
||||||
|
p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")));
|
||||||
|
|
||||||
|
@@ -348,8 +340,6 @@
|
||||||
|
fprintf(config, "%d\n", p->do_log);
|
||||||
|
fprintf(config, "%s\n", p->cddb_server_name);
|
||||||
|
fprintf(config, "%d\n", p->cddb_port_number);
|
||||||
|
- fprintf(config, "%d\n", p->rip_monkey);
|
||||||
|
- fprintf(config, "%d\n", p->monkey_compression);
|
||||||
|
fprintf(config, "%d\n", p->rip_musepack);
|
||||||
|
fprintf(config, "%d\n", p->musepack_bitrate);
|
||||||
|
fprintf(config, "%d\n", p->more_formats_expanded);
|
||||||
|
@@ -521,12 +511,6 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
// this one can be 0
|
||||||
|
- p->rip_monkey = read_line_num(fd);
|
||||||
|
-
|
||||||
|
- // this one can be 0
|
||||||
|
- p->monkey_compression = read_line_num(fd);
|
||||||
|
-
|
||||||
|
- // this one can be 0
|
||||||
|
p->rip_musepack = read_line_num(fd);
|
||||||
|
|
||||||
|
// this one can be 0
|
||||||
|
diff -ruN src-monkey/prefs.h src/prefs.h
|
||||||
|
--- src-monkey/prefs.h 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/prefs.h 2011-11-08 19:31:47.000000000 +0000
|
||||||
|
@@ -32,8 +32,6 @@
|
||||||
|
int do_log;
|
||||||
|
char* cddb_server_name;
|
||||||
|
int cddb_port_number;
|
||||||
|
- int rip_monkey;
|
||||||
|
- int monkey_compression;
|
||||||
|
int rip_musepack;
|
||||||
|
int musepack_bitrate;
|
||||||
|
int more_formats_expanded;
|
||||||
|
diff -ruN src-monkey/threads.c src/threads.c
|
||||||
|
--- src-monkey/threads.c 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/threads.c 2011-11-08 19:28:27.000000000 +0000
|
||||||
|
@@ -37,7 +37,6 @@
|
||||||
|
static FILE * playlist_ogg = NULL;
|
||||||
|
static FILE * playlist_flac = NULL;
|
||||||
|
static FILE * playlist_wavpack = NULL;
|
||||||
|
-static FILE * playlist_monkey = NULL;
|
||||||
|
static FILE * playlist_musepack = NULL;
|
||||||
|
|
||||||
|
/* ripping or encoding, so that can know not to clear the tracklist on eject */
|
||||||
|
@@ -57,7 +56,6 @@
|
||||||
|
static double ogg_percent;
|
||||||
|
static double flac_percent;
|
||||||
|
static double wavpack_percent;
|
||||||
|
-static double monkey_percent;
|
||||||
|
static double musepack_percent;
|
||||||
|
static int rip_tracks_completed;
|
||||||
|
static int encode_tracks_completed;
|
||||||
|
@@ -80,14 +78,12 @@
|
||||||
|
kill(flac_pid, SIGKILL);
|
||||||
|
if (wavpack_pid != 0)
|
||||||
|
kill(wavpack_pid, SIGKILL);
|
||||||
|
- if (monkey_pid != 0)
|
||||||
|
- kill(monkey_pid, SIGKILL);
|
||||||
|
if (musepack_pid != 0)
|
||||||
|
kill(musepack_pid, SIGKILL);
|
||||||
|
|
||||||
|
/* wait until all the worker threads are done */
|
||||||
|
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
|
||||||
|
- flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
|
||||||
|
+ flac_pid != 0 || wavpack_pid != 0 ||
|
||||||
|
musepack_pid != 0)
|
||||||
|
{
|
||||||
|
debugLog("w1");
|
||||||
|
@@ -110,8 +106,8 @@
|
||||||
|
gdk_flush();
|
||||||
|
working = false;
|
||||||
|
|
||||||
|
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk ,
|
||||||
|
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
|
||||||
|
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMusepackOk ,
|
||||||
|
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMusepackFailed );
|
||||||
|
}
|
||||||
|
|
||||||
|
// spawn needed threads and begin ripping
|
||||||
|
@@ -128,7 +124,6 @@
|
||||||
|
ogg_percent = 0.0;
|
||||||
|
flac_percent = 0.0;
|
||||||
|
wavpack_percent = 0.0;
|
||||||
|
- monkey_percent = 0.0;
|
||||||
|
musepack_percent = 0.0;
|
||||||
|
rip_tracks_completed = 0;
|
||||||
|
encode_tracks_completed = 0;
|
||||||
|
@@ -155,7 +150,7 @@
|
||||||
|
|
||||||
|
// make sure there's at least one format to rip to
|
||||||
|
if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg &&
|
||||||
|
- !global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey &&
|
||||||
|
+ !global_prefs->rip_flac && !global_prefs->rip_wavpack &&
|
||||||
|
!global_prefs->rip_musepack )
|
||||||
|
{
|
||||||
|
GtkWidget * dialog;
|
||||||
|
@@ -270,19 +265,11 @@
|
||||||
|
|
||||||
|
free(filename);
|
||||||
|
}
|
||||||
|
- if (global_prefs->rip_monkey)
|
||||||
|
- {
|
||||||
|
- char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "ape.m3u");
|
||||||
|
-
|
||||||
|
- make_playlist(filename, &playlist_monkey);
|
||||||
|
-
|
||||||
|
- free(filename);
|
||||||
|
- }
|
||||||
|
if (global_prefs->rip_musepack)
|
||||||
|
{
|
||||||
|
char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "mpc.m3u");
|
||||||
|
|
||||||
|
- make_playlist(filename, &playlist_monkey);
|
||||||
|
+ make_playlist(filename, &playlist_musepack);
|
||||||
|
|
||||||
|
free(filename);
|
||||||
|
}
|
||||||
|
@@ -298,7 +285,6 @@
|
||||||
|
numOggFailed = 0;
|
||||||
|
numFlacFailed = 0;
|
||||||
|
numWavpackFailed = 0;
|
||||||
|
- numMonkeyFailed = 0;
|
||||||
|
numMusepackFailed = 0;
|
||||||
|
|
||||||
|
numCdparanoiaOk = 0;
|
||||||
|
@@ -306,7 +292,6 @@
|
||||||
|
numOggOk = 0;
|
||||||
|
numFlacOk = 0;
|
||||||
|
numWavpackOk = 0;
|
||||||
|
- numMonkeyOk = 0;
|
||||||
|
numMusepackOk = 0;
|
||||||
|
|
||||||
|
ripper = g_thread_create(rip, NULL, TRUE, NULL);
|
||||||
|
@@ -444,7 +429,6 @@
|
||||||
|
char* flacfilename = NULL;
|
||||||
|
char* wavpackfilename = NULL;
|
||||||
|
char* wavpackfilename2 = NULL;
|
||||||
|
- char* monkeyfilename = NULL;
|
||||||
|
char* musepackfilename = NULL;
|
||||||
|
struct stat statStruct;
|
||||||
|
bool doEncode;
|
||||||
|
@@ -523,7 +507,6 @@
|
||||||
|
flacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "flac");
|
||||||
|
wavpackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wv");
|
||||||
|
wavpackfilename2 = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wvc");
|
||||||
|
- monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape");
|
||||||
|
musepackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "mpc");
|
||||||
|
|
||||||
|
if (global_prefs->rip_mp3)
|
||||||
|
@@ -658,41 +641,6 @@
|
||||||
|
fflush(playlist_wavpack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- if (global_prefs->rip_monkey)
|
||||||
|
- {
|
||||||
|
- debugLog("Encoding track %d to \"%s\"\n", tracknum, monkeyfilename);
|
||||||
|
-
|
||||||
|
- if (aborted) g_thread_exit(NULL);
|
||||||
|
-
|
||||||
|
- rc = stat(monkeyfilename, &statStruct);
|
||||||
|
- if(rc == 0)
|
||||||
|
- {
|
||||||
|
- gdk_threads_enter();
|
||||||
|
- if(confirmOverwrite(monkeyfilename))
|
||||||
|
- doEncode = true;
|
||||||
|
- else
|
||||||
|
- doEncode = false;
|
||||||
|
- gdk_threads_leave();
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- doEncode = true;
|
||||||
|
-
|
||||||
|
- if(doEncode)
|
||||||
|
- {
|
||||||
|
- mac(wavfilename, monkeyfilename,
|
||||||
|
- int_to_monkey_int(global_prefs->monkey_compression),
|
||||||
|
- &monkey_percent);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (aborted) g_thread_exit(NULL);
|
||||||
|
-
|
||||||
|
- if (playlist_monkey)
|
||||||
|
- {
|
||||||
|
- fprintf(playlist_monkey, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle);
|
||||||
|
- fprintf(playlist_monkey, "%s\n", basename(monkeyfilename));
|
||||||
|
- fflush(playlist_monkey);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
if (global_prefs->rip_musepack)
|
||||||
|
{
|
||||||
|
debugLog("Encoding track %d to \"%s\"\n", tracknum, musepackfilename);
|
||||||
|
@@ -752,14 +700,12 @@
|
||||||
|
free(oggfilename);
|
||||||
|
free(flacfilename);
|
||||||
|
free(wavpackfilename);
|
||||||
|
- free(monkeyfilename);
|
||||||
|
free(musepackfilename);
|
||||||
|
|
||||||
|
mp3_percent = 0.0;
|
||||||
|
ogg_percent = 0.0;
|
||||||
|
flac_percent = 0.0;
|
||||||
|
wavpack_percent = 0.0;
|
||||||
|
- monkey_percent = 0.0;
|
||||||
|
musepack_percent = 0.0;
|
||||||
|
encode_tracks_completed++;
|
||||||
|
}
|
||||||
|
@@ -785,8 +731,6 @@
|
||||||
|
playlist_flac = NULL;
|
||||||
|
if (playlist_wavpack) fclose(playlist_wavpack);
|
||||||
|
playlist_wavpack = NULL;
|
||||||
|
- if (playlist_monkey) fclose(playlist_monkey);
|
||||||
|
- playlist_monkey = NULL;
|
||||||
|
if (playlist_musepack) fclose(playlist_musepack);
|
||||||
|
playlist_musepack = NULL;
|
||||||
|
|
||||||
|
@@ -797,7 +741,7 @@
|
||||||
|
|
||||||
|
/* wait until all the worker threads are done */
|
||||||
|
while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 ||
|
||||||
|
- flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
|
||||||
|
+ flac_pid != 0 || wavpack_pid != 0 ||
|
||||||
|
musepack_pid != 0 )
|
||||||
|
{
|
||||||
|
debugLog("w2");
|
||||||
|
@@ -811,8 +755,8 @@
|
||||||
|
gtk_widget_hide(win_ripping);
|
||||||
|
gdk_flush();
|
||||||
|
|
||||||
|
- show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk ,
|
||||||
|
- numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
|
||||||
|
+ show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMusepackOk ,
|
||||||
|
+ numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMusepackFailed );
|
||||||
|
gdk_threads_leave();
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
@@ -830,8 +774,6 @@
|
||||||
|
parts++;
|
||||||
|
if(global_prefs->rip_wavpack)
|
||||||
|
parts++;
|
||||||
|
- if(global_prefs->rip_monkey)
|
||||||
|
- parts++;
|
||||||
|
if(global_prefs->rip_musepack)
|
||||||
|
parts++;
|
||||||
|
|
||||||
|
@@ -868,10 +810,10 @@
|
||||||
|
|
||||||
|
debugLog("completed tracks %d, rip %.2lf%%; encoded tracks %d, "
|
||||||
|
"mp3 %.2lf%% ogg %.2lf%% flac %.2lf%% wavpack %.2lf%% "
|
||||||
|
- "monkey %.2lf%% musepack %.2lf%% \n\n",
|
||||||
|
+ "musepack %.2lf%% \n\n",
|
||||||
|
rip_tracks_completed, rip_percent*100, encode_tracks_completed,
|
||||||
|
mp3_percent*100, ogg_percent*100, flac_percent*100, wavpack_percent*100,
|
||||||
|
- monkey_percent*100,musepack_percent*100);
|
||||||
|
+ musepack_percent*100);
|
||||||
|
|
||||||
|
prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
|
||||||
|
snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
|
||||||
|
@@ -882,7 +824,7 @@
|
||||||
|
if (parts > 1)
|
||||||
|
{
|
||||||
|
pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) +
|
||||||
|
- ((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
|
||||||
|
+ ((mp3_percent+ogg_percent+flac_percent+wavpack_percent
|
||||||
|
+musepack_percent) /
|
||||||
|
(parts-1) / tracks_to_rip);
|
||||||
|
snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100),
|
||||||
|
diff -ruN src-monkey/wrappers.c src/wrappers.c
|
||||||
|
--- src-monkey/wrappers.c 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/wrappers.c 2011-11-08 19:21:50.000000000 +0000
|
||||||
|
@@ -32,7 +32,6 @@
|
||||||
|
pid_t oggenc_pid;
|
||||||
|
pid_t flac_pid;
|
||||||
|
pid_t wavpack_pid;
|
||||||
|
-pid_t monkey_pid;
|
||||||
|
pid_t musepack_pid;
|
||||||
|
|
||||||
|
int numCdparanoiaFailed;
|
||||||
|
@@ -40,7 +39,6 @@
|
||||||
|
int numOggFailed;
|
||||||
|
int numFlacFailed;
|
||||||
|
int numWavpackFailed;
|
||||||
|
-int numMonkeyFailed;
|
||||||
|
int numMusepackFailed;
|
||||||
|
|
||||||
|
int numCdparanoiaOk;
|
||||||
|
@@ -48,7 +46,6 @@
|
||||||
|
int numOggOk;
|
||||||
|
int numFlacOk;
|
||||||
|
int numWavpackOk;
|
||||||
|
-int numMonkeyOk;
|
||||||
|
int numMusepackOk;
|
||||||
|
|
||||||
|
int numchildren = 0;
|
||||||
|
@@ -84,7 +81,6 @@
|
||||||
|
extern pid_t oggenc_pid;
|
||||||
|
extern pid_t flac_pid;
|
||||||
|
extern pid_t wavpack_pid;
|
||||||
|
-extern pid_t monkey_pid;
|
||||||
|
extern pid_t musepack_pid;
|
||||||
|
|
||||||
|
// signal handler to find out when our child has exited
|
||||||
|
@@ -98,7 +94,7 @@
|
||||||
|
debugLog("sigchld for %d (know about wav %d, mp3 %d, ogg %d, flac %d, "
|
||||||
|
"wv %d, ape %d, mpc %d\n",
|
||||||
|
pid, cdparanoia_pid, lame_pid, oggenc_pid, flac_pid,
|
||||||
|
- wavpack_pid, monkey_pid, musepack_pid);
|
||||||
|
+ wavpack_pid, musepack_pid);
|
||||||
|
|
||||||
|
/* this is because i can't seem to be able to block sigchld: */
|
||||||
|
while(waitBeforeSigchld)
|
||||||
|
@@ -108,7 +104,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pid != cdparanoia_pid && pid != lame_pid && pid != oggenc_pid &&
|
||||||
|
- pid != flac_pid && pid != wavpack_pid && pid != monkey_pid &&
|
||||||
|
+ pid != flac_pid && pid != wavpack_pid &&
|
||||||
|
pid != musepack_pid )
|
||||||
|
{
|
||||||
|
printf("SIGCHLD for unknown pid, report bug please");
|
||||||
|
@@ -152,11 +148,6 @@
|
||||||
|
wavpack_pid = 0;
|
||||||
|
numWavpackFailed++;
|
||||||
|
}
|
||||||
|
- else if (pid == monkey_pid)
|
||||||
|
- {
|
||||||
|
- monkey_pid = 0;
|
||||||
|
- numMonkeyFailed++;
|
||||||
|
- }
|
||||||
|
else if (pid == musepack_pid)
|
||||||
|
{
|
||||||
|
musepack_pid = 0;
|
||||||
|
@@ -191,11 +182,6 @@
|
||||||
|
wavpack_pid = 0;
|
||||||
|
numWavpackOk++;
|
||||||
|
}
|
||||||
|
- else if (pid == monkey_pid)
|
||||||
|
- {
|
||||||
|
- monkey_pid = 0;
|
||||||
|
- numMonkeyOk++;
|
||||||
|
- }
|
||||||
|
else if (pid == musepack_pid)
|
||||||
|
{
|
||||||
|
musepack_pid = 0;
|
||||||
|
@@ -848,64 +834,6 @@
|
||||||
|
usleep(100000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
-void mac(char* wavfilename,
|
||||||
|
- char* monkeyfilename,
|
||||||
|
- int compression,
|
||||||
|
- double* progress)
|
||||||
|
-{
|
||||||
|
- const char* args[5];
|
||||||
|
- int fd;
|
||||||
|
- int pos;
|
||||||
|
-
|
||||||
|
- pos = 0;
|
||||||
|
- args[pos++] = "mac";
|
||||||
|
- args[pos++] = wavfilename;
|
||||||
|
- args[pos++] = monkeyfilename;
|
||||||
|
-
|
||||||
|
- char compressParam[10];
|
||||||
|
- snprintf(compressParam, 10, "-c%d", compression);
|
||||||
|
- args[pos++] = compressParam;
|
||||||
|
-
|
||||||
|
- args[pos++] = NULL;
|
||||||
|
-
|
||||||
|
- fd = exec_with_output(args, STDERR_FILENO, &monkey_pid);
|
||||||
|
-
|
||||||
|
- int size;
|
||||||
|
- char buf[256];
|
||||||
|
- do
|
||||||
|
- {
|
||||||
|
- pos = -1;
|
||||||
|
- do
|
||||||
|
- {
|
||||||
|
- pos++;
|
||||||
|
- size = read(fd, &buf[pos], 1);
|
||||||
|
-
|
||||||
|
- if (size == -1 && errno == EINTR)
|
||||||
|
- /* signal interrupted read(), try again */
|
||||||
|
- {
|
||||||
|
- pos--;
|
||||||
|
- size = 1;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- } while ((buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0) && (pos < 256));
|
||||||
|
- buf[pos] = '\0';
|
||||||
|
-
|
||||||
|
- double percent;
|
||||||
|
- if (sscanf(buf, "Progress: %lf", &percent) == 1)
|
||||||
|
- {
|
||||||
|
- *progress = percent / 100;
|
||||||
|
- }
|
||||||
|
- } while (size > 0);
|
||||||
|
-
|
||||||
|
- close(fd);
|
||||||
|
- /* don't go on until the signal for the previous call is handled */
|
||||||
|
- while (monkey_pid != 0)
|
||||||
|
- {
|
||||||
|
- debugLog("w9 (%d)\n", monkey_pid);
|
||||||
|
- usleep(100000);
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
|
||||||
|
void musepack(char* wavfilename,
|
||||||
|
char* musepackfilename,
|
||||||
|
diff -ruN src-monkey/wrappers.h src/wrappers.h
|
||||||
|
--- src-monkey/wrappers.h 2011-11-08 19:18:12.000000000 +0000
|
||||||
|
+++ src/wrappers.h 2011-11-08 19:32:52.000000000 +0000
|
||||||
|
@@ -6,7 +6,6 @@
|
||||||
|
extern pid_t oggenc_pid;
|
||||||
|
extern pid_t flac_pid;
|
||||||
|
extern pid_t wavpack_pid;
|
||||||
|
-extern pid_t monkey_pid;
|
||||||
|
extern pid_t musepack_pid;
|
||||||
|
|
||||||
|
extern int numCdparanoiaFailed;
|
||||||
|
@@ -14,7 +13,6 @@
|
||||||
|
extern int numOggFailed;
|
||||||
|
extern int numFlacFailed;
|
||||||
|
extern int numWavpackFailed;
|
||||||
|
-extern int numMonkeyFailed;
|
||||||
|
extern int numMusepackFailed;
|
||||||
|
|
||||||
|
extern int numCdparanoiaOk;
|
||||||
|
@@ -22,7 +20,6 @@
|
||||||
|
extern int numOggOk;
|
||||||
|
extern int numFlacOk;
|
||||||
|
extern int numWavpackOk;
|
||||||
|
-extern int numMonkeyOk;
|
||||||
|
extern int numMusepackOk;
|
||||||
|
|
||||||
|
// signal handler to find out when out child has exited
|
||||||
|
@@ -117,11 +114,6 @@
|
||||||
|
int bitrate,
|
||||||
|
double * progress);
|
||||||
|
|
||||||
|
-void mac(char* wavfilename,
|
||||||
|
- char* monkeyfilename,
|
||||||
|
- int compression,
|
||||||
|
- double* progress);
|
||||||
|
-
|
||||||
|
void musepack(char* wavfilename,
|
||||||
|
char* musepackfilename,
|
||||||
|
int quality,
|
||||||
19
helpers/DATA/connman/connman.4239.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
diff -ruN src-old/connman-dbus.conf src/connman-dbus.conf
|
||||||
|
--- src-old/connman-dbus.conf 2011-11-08 15:29:09.000000000 +0000
|
||||||
|
+++ src/connman-dbus.conf 2011-11-08 15:28:11.000000000 +0000
|
||||||
|
@@ -9,8 +9,15 @@
|
||||||
|
</policy>
|
||||||
|
<policy at_console="true">
|
||||||
|
<allow send_destination="net.connman"/>
|
||||||
|
+ <allow send_interface="net.connman.Agent"/>
|
||||||
|
+ <allow send_interface="net.connman.Counter"/>
|
||||||
|
+ <allow send_interface="net.connman.Manager"/>
|
||||||
|
</policy>
|
||||||
|
<policy context="default">
|
||||||
|
+ <deny own="net.connman"/>
|
||||||
|
<deny send_destination="net.connman"/>
|
||||||
|
+ <deny send_interface="net.connman.Agent"/>
|
||||||
|
+ <deny send_interface="net.connman.Counter"/>
|
||||||
|
+ <deny send_interface="net.connman.Manager"/>
|
||||||
|
</policy>
|
||||||
|
</busconfig>
|
||||||
BIN
helpers/DATA/debian-installer/splash.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
helpers/DATA/debian-installer/splash.rle
Normal file
1
helpers/DATA/debootstrap/awen
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
trisquel
|
||||||
1
helpers/DATA/debootstrap/brigantia
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
trisquel
|
||||||
1
helpers/DATA/debootstrap/dagda
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
trisquel
|
||||||
1
helpers/DATA/debootstrap/dwyn
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
trisquel
|
||||||
1
helpers/DATA/debootstrap/robur
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
trisquel
|
||||||
1
helpers/DATA/debootstrap/slaine
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
trisquel
|
||||||
1
helpers/DATA/debootstrap/taranis
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
trisquel
|
||||||
199
helpers/DATA/debootstrap/trisquel
Normal file
|
|
@ -0,0 +1,199 @@
|
||||||
|
default_mirror http://archive.trisquel.info/trisquel
|
||||||
|
mirror_style release
|
||||||
|
download_style apt
|
||||||
|
finddebs_style from-indices
|
||||||
|
variants - buildd fakechroot minbase
|
||||||
|
|
||||||
|
if doing_variant fakechroot; then
|
||||||
|
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
|
||||||
|
fi
|
||||||
|
|
||||||
|
case $ARCH in
|
||||||
|
alpha|ia64) LIBC="libc6.1" ;;
|
||||||
|
*) LIBC="libc6" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
work_out_debs () {
|
||||||
|
required="$(get_debs Priority: required)"
|
||||||
|
|
||||||
|
if doing_variant -; then
|
||||||
|
#required="$required $(get_debs Priority: important)"
|
||||||
|
# ^^ should be getting debconf here somehow maybe
|
||||||
|
base="$(get_debs Priority: important)"
|
||||||
|
elif doing_variant buildd; then
|
||||||
|
base="$(get_debs Build-Essential: yes)"
|
||||||
|
elif doing_variant fakechroot || doing_variant minbase; then
|
||||||
|
base="apt"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
first_stage_install () {
|
||||||
|
extract $required
|
||||||
|
|
||||||
|
mkdir -p "$TARGET/var/lib/dpkg"
|
||||||
|
: >"$TARGET/var/lib/dpkg/status"
|
||||||
|
: >"$TARGET/var/lib/dpkg/available"
|
||||||
|
|
||||||
|
setup_etc
|
||||||
|
if [ ! -e "$TARGET/etc/fstab" ]; then
|
||||||
|
echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
|
||||||
|
chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if doing_variant fakechroot; then
|
||||||
|
setup_devices_fakechroot
|
||||||
|
else
|
||||||
|
setup_devices
|
||||||
|
fi
|
||||||
|
|
||||||
|
x_feign_install () {
|
||||||
|
local pkg="$1"
|
||||||
|
local deb="$(debfor $pkg)"
|
||||||
|
local ver="$(extract_deb_field "$TARGET/$deb" Version)"
|
||||||
|
|
||||||
|
mkdir -p "$TARGET/var/lib/dpkg/info"
|
||||||
|
|
||||||
|
echo \
|
||||||
|
"Package: $pkg
|
||||||
|
Version: $ver
|
||||||
|
Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
|
||||||
|
|
||||||
|
touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
|
||||||
|
}
|
||||||
|
|
||||||
|
x_feign_install dpkg
|
||||||
|
}
|
||||||
|
|
||||||
|
second_stage_install () {
|
||||||
|
x_core_install () {
|
||||||
|
smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
|
||||||
|
}
|
||||||
|
|
||||||
|
p () {
|
||||||
|
baseprog="$(($baseprog + ${1:-1}))"
|
||||||
|
}
|
||||||
|
|
||||||
|
if doing_variant fakechroot; then
|
||||||
|
setup_proc_fakechroot
|
||||||
|
else
|
||||||
|
setup_proc
|
||||||
|
in_target /sbin/ldconfig
|
||||||
|
fi
|
||||||
|
|
||||||
|
DEBIAN_FRONTEND=noninteractive
|
||||||
|
DEBCONF_NONINTERACTIVE_SEEN=true
|
||||||
|
export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
|
||||||
|
|
||||||
|
baseprog=0
|
||||||
|
bases=7
|
||||||
|
|
||||||
|
p; progress $baseprog $bases INSTCORE "Installing core packages" #1
|
||||||
|
info INSTCORE "Installing core packages..."
|
||||||
|
|
||||||
|
p; progress $baseprog $bases INSTCORE "Installing core packages" #2
|
||||||
|
ln -sf mawk "$TARGET/usr/bin/awk"
|
||||||
|
x_core_install base-files base-passwd
|
||||||
|
p; progress $baseprog $bases INSTCORE "Installing core packages" #3
|
||||||
|
x_core_install dpkg
|
||||||
|
|
||||||
|
if [ ! -e "$TARGET/etc/localtime" ]; then
|
||||||
|
ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if doing_variant fakechroot; then
|
||||||
|
install_fakechroot_tools
|
||||||
|
fi
|
||||||
|
|
||||||
|
p; progress $baseprog $bases INSTCORE "Installing core packages" #4
|
||||||
|
x_core_install $LIBC
|
||||||
|
|
||||||
|
p; progress $baseprog $bases INSTCORE "Installing core packages" #5
|
||||||
|
x_core_install perl-base
|
||||||
|
|
||||||
|
p; progress $baseprog $bases INSTCORE "Installing core packages" #6
|
||||||
|
rm "$TARGET/usr/bin/awk"
|
||||||
|
x_core_install mawk
|
||||||
|
|
||||||
|
p; progress $baseprog $bases INSTCORE "Installing core packages" #7
|
||||||
|
if doing_variant -; then
|
||||||
|
x_core_install debconf
|
||||||
|
fi
|
||||||
|
|
||||||
|
baseprog=0
|
||||||
|
bases=$(set -- $required; echo $#)
|
||||||
|
|
||||||
|
info UNPACKREQ "Unpacking required packages..."
|
||||||
|
|
||||||
|
smallyes '' |
|
||||||
|
(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \
|
||||||
|
dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
|
||||||
|
dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
|
||||||
|
|
||||||
|
info CONFREQ "Configuring required packages..."
|
||||||
|
|
||||||
|
if doing_variant fakechroot; then
|
||||||
|
# fix initscripts postinst (no mounting possible, and wrong if condition)
|
||||||
|
sed -i '/dpkg.*--compare-versions/ s/\<lt\>/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst"
|
||||||
|
fi
|
||||||
|
|
||||||
|
mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
|
||||||
|
echo \
|
||||||
|
"#!/bin/sh
|
||||||
|
echo
|
||||||
|
echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
|
||||||
|
chmod 755 "$TARGET/sbin/start-stop-daemon"
|
||||||
|
|
||||||
|
if [ -x "$TARGET/sbin/initctl" ]; then
|
||||||
|
mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL"
|
||||||
|
echo \
|
||||||
|
"#!/bin/sh
|
||||||
|
echo
|
||||||
|
echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl"
|
||||||
|
chmod 755 "$TARGET/sbin/initctl"
|
||||||
|
fi
|
||||||
|
|
||||||
|
setup_dselect_method apt
|
||||||
|
|
||||||
|
smallyes '' |
|
||||||
|
(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
|
||||||
|
dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 |
|
||||||
|
dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1
|
||||||
|
|
||||||
|
baseprog=0
|
||||||
|
bases="$(set -- $base; echo $#)"
|
||||||
|
|
||||||
|
info UNPACKBASE "Unpacking the base system..."
|
||||||
|
|
||||||
|
setup_available $required $base
|
||||||
|
done_predeps=
|
||||||
|
while predep=$(get_next_predep); do
|
||||||
|
# We have to resolve dependencies of pre-dependencies manually because
|
||||||
|
# dpkg --predep-package doesn't handle this.
|
||||||
|
predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
|
||||||
|
# XXX: progress is tricky due to how dpkg_progress works
|
||||||
|
# -- cjwatson 2009-07-29
|
||||||
|
p; smallyes '' | in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
|
||||||
|
base=$(without "$base" "$predep")
|
||||||
|
done_predeps="$done_predeps $predep"
|
||||||
|
done
|
||||||
|
|
||||||
|
smallyes '' |
|
||||||
|
(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \
|
||||||
|
dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
|
||||||
|
dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
|
||||||
|
|
||||||
|
info CONFBASE "Configuring the base system..."
|
||||||
|
|
||||||
|
smallyes '' |
|
||||||
|
(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be attempted 5 times." "" \
|
||||||
|
dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
|
||||||
|
dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
|
||||||
|
|
||||||
|
if [ -x "$TARGET/sbin/initctl.REAL" ]; then
|
||||||
|
mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl"
|
||||||
|
fi
|
||||||
|
mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
|
||||||
|
|
||||||
|
progress $bases $bases CONFBASE "Configuring base system"
|
||||||
|
info BASESUCCESS "Base system installed successfully."
|
||||||
|
}
|
||||||
69
helpers/DATA/dpkg/Trisquel.pm
Normal file
|
|
@ -0,0 +1,69 @@
|
||||||
|
# Copyright © 2009 Raphaël Hertzog <hertzog@debian.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, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package Dpkg::Vendor::Trisquel;
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
our $VERSION = "0.01";
|
||||||
|
|
||||||
|
use base qw(Dpkg::Vendor::Default);
|
||||||
|
use Dpkg::Control::Types;
|
||||||
|
use Dpkg::Vendor::Ubuntu;
|
||||||
|
|
||||||
|
=encoding utf8
|
||||||
|
|
||||||
|
=head1 NAME
|
||||||
|
|
||||||
|
Dpkg::Vendor::Trisquel - Trisquel vendor object
|
||||||
|
|
||||||
|
=head1 DESCRIPTION
|
||||||
|
|
||||||
|
This vendor object customize the behaviour of dpkg scripts
|
||||||
|
for Debian specific actions.
|
||||||
|
|
||||||
|
=cut
|
||||||
|
|
||||||
|
sub run_hook {
|
||||||
|
my ($self, $hook, @params) = @_;
|
||||||
|
|
||||||
|
if ($hook eq "keyrings") {
|
||||||
|
return ('/usr/share/keyrings/trisquel-archive-keyring.gpg')
|
||||||
|
} elsif ($hook eq "register-custom-fields") {
|
||||||
|
return (
|
||||||
|
[ "register", "Dm-Upload-Allowed",
|
||||||
|
CTRL_INFO_SRC | CTRL_INDEX_SRC | CTRL_PKG_SRC ],
|
||||||
|
[ "insert_after", CTRL_INDEX_SRC, "Uploaders", "Dm-Upload-Allowed" ],
|
||||||
|
[ "insert_after", CTRL_PKG_SRC, "Uploaders", "Dm-Upload-Allowed" ],
|
||||||
|
);
|
||||||
|
} elsif ($hook eq "extend-patch-header") {
|
||||||
|
my ($textref, $ch_info) = @params;
|
||||||
|
if ($ch_info->{'Closes'}) {
|
||||||
|
foreach my $bug (split(/\s+/, $ch_info->{'Closes'})) {
|
||||||
|
$$textref .= "Bug-Debian: http://bugs.debian.org/$bug\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
my $b = Dpkg::Vendor::Ubuntu::find_launchpad_closes($ch_info->{'Changes'});
|
||||||
|
foreach my $bug (@$b) {
|
||||||
|
$$textref .= "Bug-Ubuntu: https://bugs.launchpad.net/bugs/$bug\n";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return $self->SUPER::run_hook($hook, @params);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
98
helpers/DATA/firefox/branding/Makefile.in
Normal file
|
|
@ -0,0 +1,98 @@
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Trisquel Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is mozilla.org code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Trisquel Foundation.
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2009
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Justin Dolske <dolske@mozilla.com> (original author)
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
DEPTH = ../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
DIRS = \
|
||||||
|
content \
|
||||||
|
locales \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
PREF_JS_EXPORTS = $(srcdir)/pref/abrowser-branding.js
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
WINDOWS_BRANDING_FILES = \
|
||||||
|
abrowser.ico \
|
||||||
|
document.ico \
|
||||||
|
branding.nsi \
|
||||||
|
wizHeader.bmp \
|
||||||
|
wizHeaderRTL.bmp \
|
||||||
|
wizWatermark.bmp \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
ifdef MOZ_SPLASHSCREEN
|
||||||
|
WINDOWS_BRANDING_FILES += splash.bmp
|
||||||
|
endif
|
||||||
|
|
||||||
|
OSX_BRANDING_FILES = \
|
||||||
|
background.png \
|
||||||
|
abrowser.icns \
|
||||||
|
disk.icns \
|
||||||
|
document.icns \
|
||||||
|
dsstore \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
LINUX_BRANDING_FILES = \
|
||||||
|
default16.png \
|
||||||
|
default22.png \
|
||||||
|
default24.png \
|
||||||
|
default32.png \
|
||||||
|
default48.png \
|
||||||
|
default128.png \
|
||||||
|
default256.png \
|
||||||
|
document.png \
|
||||||
|
mozicon128.png \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
|
||||||
|
export::
|
||||||
|
$(NSINSTALL) -D $(DIST)/branding
|
||||||
|
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||||
|
cp $(addprefix $(srcdir)/, $(WINDOWS_BRANDING_FILES)) $(DIST)/branding/
|
||||||
|
endif
|
||||||
|
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||||
|
cp $(addprefix $(srcdir)/, $(OSX_BRANDING_FILES)) $(DIST)/branding/
|
||||||
|
endif
|
||||||
|
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||||
|
cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
|
||||||
|
$(NSINSTALL) -D $(DIST)/install
|
||||||
|
endif
|
||||||
BIN
helpers/DATA/firefox/branding/abrowser.icns
Normal file
BIN
helpers/DATA/firefox/branding/abrowser.ico
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
helpers/DATA/firefox/branding/background.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
46
helpers/DATA/firefox/branding/branding.nsi
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Trisquel Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is the Trisquel Installer code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is Trisquel Foundation
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2006
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
# Robert Strong <robert.bugzilla@gmail.com>
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
# NSIS branding defines for unofficial builds.
|
||||||
|
# The official release build branding.nsi is located in other-license/branding/abrowser/
|
||||||
|
# The nightly build branding.nsi is located in browser/installer/windows/nsis/
|
||||||
|
|
||||||
|
# BrandFullNameInternal is used for some registry and file system values
|
||||||
|
# instead of BrandFullName and typically should not be modified.
|
||||||
|
!define BrandFullNameInternal "Abrowser"
|
||||||
|
!define CompanyName "Trisquel"
|
||||||
|
!define URLInfoAbout "http://trisquel.info/browser"
|
||||||
|
!define URLUpdateInfo "http://trisquel.info/wiki"
|
||||||
1
helpers/DATA/firefox/branding/configure.sh
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
MOZ_APP_DISPLAYNAME=Abrowser
|
||||||
11
helpers/DATA/firefox/branding/content/Makefile.in
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
# Branding Makefile
|
||||||
|
# - jars chrome artwork
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
BIN
helpers/DATA/firefox/branding/content/about-background.png
Normal file
|
After Width: | Height: | Size: 146 KiB |
BIN
helpers/DATA/firefox/branding/content/about-logo.png
Normal file
|
After Width: | Height: | Size: 29 KiB |
BIN
helpers/DATA/firefox/branding/content/about-wordmark.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
BIN
helpers/DATA/firefox/branding/content/about.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
20
helpers/DATA/firefox/branding/content/aboutDialog.css
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
#aboutDialogContainer {
|
||||||
|
background-image: url("chrome://branding/content/about-background.png");
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-color: #000;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text-link {
|
||||||
|
color: #fff !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#rightBox {
|
||||||
|
/* this margin prevents text from overlapping the planet image */
|
||||||
|
margin-left: 280px;
|
||||||
|
margin-right: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#bottomBox {
|
||||||
|
background-color: rgba(0,0,0,.7);
|
||||||
|
}
|
||||||
BIN
helpers/DATA/firefox/branding/content/icon48.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
helpers/DATA/firefox/branding/content/icon64.png
Normal file
|
After Width: | Height: | Size: 5.6 KiB |
11
helpers/DATA/firefox/branding/content/jar.mn
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
browser.jar:
|
||||||
|
% content branding %content/branding/ contentaccessible=yes
|
||||||
|
content/branding/about.png (about.png)
|
||||||
|
content/branding/about-background.png (about-background.png)
|
||||||
|
content/branding/about-logo.png (about-logo.png)
|
||||||
|
content/branding/about-wordmark.png (about-wordmark.png)
|
||||||
|
content/branding/icon48.png (icon48.png)
|
||||||
|
content/branding/icon64.png (icon64.png)
|
||||||
|
content/branding/icon128.png (../mozicon128.png)
|
||||||
|
content/branding/icon16.png (../default16.png)
|
||||||
|
content/branding/aboutDialog.css (aboutDialog.css)
|
||||||
BIN
helpers/DATA/firefox/branding/default128.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
helpers/DATA/firefox/branding/default16.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
helpers/DATA/firefox/branding/default22.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
helpers/DATA/firefox/branding/default24.png
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
helpers/DATA/firefox/branding/default256.png
Normal file
|
After Width: | Height: | Size: 43 KiB |
BIN
helpers/DATA/firefox/branding/default32.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
helpers/DATA/firefox/branding/default48.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
helpers/DATA/firefox/branding/disk.icns
Normal file
BIN
helpers/DATA/firefox/branding/document.icns
Normal file
BIN
helpers/DATA/firefox/branding/document.ico
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
helpers/DATA/firefox/branding/document.png
Normal file
|
After Width: | Height: | Size: 3.1 KiB |
BIN
helpers/DATA/firefox/branding/dsstore
Normal file
47
helpers/DATA/firefox/branding/locales/Makefile.in
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
|
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||||
|
#
|
||||||
|
# The contents of this file are subject to the Trisquel Public License Version
|
||||||
|
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||||
|
# the License. You may obtain a copy of the License at
|
||||||
|
# http://www.mozilla.org/MPL/
|
||||||
|
#
|
||||||
|
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||||
|
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||||
|
# for the specific language governing rights and limitations under the
|
||||||
|
# License.
|
||||||
|
#
|
||||||
|
# The Original Code is the Trisquel Browser code.
|
||||||
|
#
|
||||||
|
# The Initial Developer of the Original Code is
|
||||||
|
# Benjamin Smedberg <benjamin@smedbergs.us>
|
||||||
|
# Portions created by the Initial Developer are Copyright (C) 2004
|
||||||
|
# the Initial Developer. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Contributor(s):
|
||||||
|
#
|
||||||
|
# Alternatively, the contents of this file may be used under the terms of
|
||||||
|
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||||
|
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||||
|
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||||
|
# of those above. If you wish to allow use of your version of this file only
|
||||||
|
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||||
|
# use your version of this file under the terms of the MPL, indicate your
|
||||||
|
# decision by deleting the provisions above and replace them with the notice
|
||||||
|
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||||
|
# the provisions above, a recipient may use your version of this file under
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
|
DEPTH = ../../../..
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
relativesrcdir = browser/branding/unofficial/locales
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Do NOT localize or otherwise change these values
|
||||||
|
browser.startup.homepage=http://trisquel.info
|
||||||
4
helpers/DATA/firefox/branding/locales/en-US/brand.dtd
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
<!ENTITY brandShortName "Abrowser">
|
||||||
|
<!ENTITY brandFullName "Abrowser">
|
||||||
|
<!ENTITY vendorShortName "Trisquel">
|
||||||
|
<!ENTITY trademarkInfo.part1 " ">
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
brandShortName=Abrowser
|
||||||
|
brandFullName=Abrowser
|
||||||
|
vendorShortName=Trisquel
|
||||||
|
|
||||||
|
syncBrandShortName=Sync
|
||||||
8
helpers/DATA/firefox/branding/locales/jar.mn
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
#filter substitution
|
||||||
|
|
||||||
|
@AB_CD@.jar:
|
||||||
|
% locale branding @AB_CD@ %locale/branding/
|
||||||
|
# Unofficial branding only exists in en-US
|
||||||
|
locale/branding/brand.dtd (en-US/brand.dtd)
|
||||||
|
* locale/branding/brand.properties (en-US/brand.properties)
|
||||||
|
* locale/branding/browserconfig.properties (browserconfig.properties)
|
||||||
BIN
helpers/DATA/firefox/branding/mozicon128.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
15
helpers/DATA/firefox/branding/pref/abrowser-branding.js
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
pref("startup.homepage_override_url","http://trisquel.info");
|
||||||
|
pref("startup.homepage_welcome_url","http://trisquel.info/welcome");
|
||||||
|
// The time interval between checks for a new version (in seconds)
|
||||||
|
// nightly=8 hours, official=24 hours
|
||||||
|
pref("app.update.interval", 86400);
|
||||||
|
// The time interval between the downloading of mar file chunks in the
|
||||||
|
// background (in seconds)
|
||||||
|
pref("app.update.download.backgroundInterval", 60);
|
||||||
|
// URL user can browse to manually if for some reason all update installation
|
||||||
|
// attempts fail.
|
||||||
|
pref("app.update.url.manual", "http://trisquel.info/browser");
|
||||||
|
// A default value for the "More information about this update" link
|
||||||
|
// supplied in the "An update is available" page of the update wizard.
|
||||||
|
pref("app.update.url.details", "http://trisquel.info/browser");
|
||||||
|
|
||||||
BIN
helpers/DATA/firefox/branding/splash.bmp
Normal file
|
After Width: | Height: | Size: 232 KiB |
BIN
helpers/DATA/firefox/branding/wizHeader.bmp
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
helpers/DATA/firefox/branding/wizHeaderRTL.bmp
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
helpers/DATA/firefox/branding/wizWatermark.bmp
Normal file
|
After Width: | Height: | Size: 151 KiB |
851
helpers/DATA/firefox/control
Normal file
|
|
@ -0,0 +1,851 @@
|
||||||
|
Source: firefox
|
||||||
|
Section: web
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info>
|
||||||
|
Vcs-Bzr: https://code.launchpad.net/~mozillateam/abrowser/abrowser.natty
|
||||||
|
Build-Depends: cdbs,
|
||||||
|
debhelper (>= 5),
|
||||||
|
m4,
|
||||||
|
autotools-dev,
|
||||||
|
autoconf2.13,
|
||||||
|
quilt,
|
||||||
|
patchutils (>= 0.2.25),
|
||||||
|
bzip2,
|
||||||
|
zip,
|
||||||
|
libx11-dev,
|
||||||
|
libxt-dev,
|
||||||
|
libgtk2.0-dev (>= 2.10),
|
||||||
|
liborbit2-dev,
|
||||||
|
libidl-dev (>= 0.8.0),
|
||||||
|
libxft-dev,
|
||||||
|
libfreetype6-dev,
|
||||||
|
libxrender-dev,
|
||||||
|
libxinerama-dev,
|
||||||
|
libgnome2-dev,
|
||||||
|
libgconf2-dev,
|
||||||
|
libgnomeui-dev,
|
||||||
|
libstartup-notification0-dev,
|
||||||
|
libasound2-dev,
|
||||||
|
libcurl4-openssl-dev,
|
||||||
|
libdbus-glib-1-dev (>= 0.60),
|
||||||
|
mozilla-devscripts (>= 0.10~),
|
||||||
|
hardening-wrapper,
|
||||||
|
lsb-release,
|
||||||
|
libiw-dev,
|
||||||
|
mesa-common-dev,
|
||||||
|
libnotify-dev (>= 0.4),
|
||||||
|
libgnomevfs2-dev,
|
||||||
|
yasm,
|
||||||
|
xvfb,
|
||||||
|
imagemagick,
|
||||||
|
libdbusmenu-gtk-dev
|
||||||
|
Standards-Version: 3.9.1
|
||||||
|
|
||||||
|
Package: abrowser
|
||||||
|
Architecture: any
|
||||||
|
Depends: fontconfig,
|
||||||
|
psmisc,
|
||||||
|
xul-ext-ubufox,
|
||||||
|
abrowser-gnome-support,
|
||||||
|
lsb-release,
|
||||||
|
debianutils (>= 1.16),
|
||||||
|
${misc:Depends},
|
||||||
|
${shlibs:Depends}
|
||||||
|
Recommends: ubufox,
|
||||||
|
abrowser-globalmenu
|
||||||
|
Provides: www-browser,
|
||||||
|
iceweasel, firefox, icecat,
|
||||||
|
gnome-www-browser
|
||||||
|
Suggests: abrowser-gnome-support | abrowser-kde-support,
|
||||||
|
latex-xft-fonts,
|
||||||
|
libthai0
|
||||||
|
Replaces: abrowser-old,
|
||||||
|
abrowser-old-branding,
|
||||||
|
abrowser-branding,
|
||||||
|
kubuntu-abrowser-installer
|
||||||
|
Breaks: abrowser-old (<= 4.0~b11+build3+nobinonly-0ubuntu1),
|
||||||
|
abrowser-old-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1),
|
||||||
|
abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1)
|
||||||
|
XB-Xul-AppId: {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
|
||||||
|
Description: Safe and easy web browser from Mozilla
|
||||||
|
Abrowser delivers safe, easy web browsing. A familiar user interface,
|
||||||
|
enhanced security features including protection from online identity theft,
|
||||||
|
and integrated search let you get the most out of the web.
|
||||||
|
|
||||||
|
Package: abrowser-gnome-support
|
||||||
|
Architecture: any
|
||||||
|
Section: gnome
|
||||||
|
Depends: ${shlibs:Depends},
|
||||||
|
${misc:Depends},
|
||||||
|
abrowser
|
||||||
|
Description: Safe and easy web browser from Trisquel - GNOME support
|
||||||
|
Abrowser delivers safe, easy web browsing. A familiar user interface,
|
||||||
|
enhanced security features including protection from online identity theft,
|
||||||
|
and integrated search let you get the most out of the web.
|
||||||
|
.
|
||||||
|
This package depends on the GNOME libraries which allow Abrowser to take
|
||||||
|
advantage of technologies such as GConf, GIO libnotify
|
||||||
|
|
||||||
|
Package: abrowser-dbg
|
||||||
|
Architecture: any
|
||||||
|
Section: debug
|
||||||
|
Priority: extra
|
||||||
|
Depends: ${shlibs:Depends},
|
||||||
|
${misc:Depends},
|
||||||
|
abrowser (= ${binary:Version})
|
||||||
|
Description: Safe and easy web browser from Trisquel - debug symbols
|
||||||
|
Abrowser delivers safe, easy web browsing. A familiar user interface,
|
||||||
|
enhanced security features including protection from online identity theft,
|
||||||
|
and integrated search let you get the most out of the web.
|
||||||
|
.
|
||||||
|
This package contains the debugging symbols for the Abrowser web
|
||||||
|
browser
|
||||||
|
|
||||||
|
Package: abrowser-dev
|
||||||
|
Architecture: any
|
||||||
|
Section: devel
|
||||||
|
Priority: extra
|
||||||
|
Depends: ${shlibs:Depends},
|
||||||
|
${misc:Depends},
|
||||||
|
abrowser (= ${binary:Version}),
|
||||||
|
${nspr:Depends},
|
||||||
|
${nss:Depends},
|
||||||
|
${cairo:Depends}
|
||||||
|
Conflicts: xulrunner-2.0-dev,
|
||||||
|
xulrunner-1.9.2-dev
|
||||||
|
Description: Safe and easy web browser from Trisquel - development files
|
||||||
|
Abrowser delivers safe, easy web browsing. A familiar user interface,
|
||||||
|
enhanced security features including protection from online identity theft,
|
||||||
|
and integrated search let you get the most out of the web.
|
||||||
|
.
|
||||||
|
This package contains the headers and SDK for building plugins with Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-mozsymbols
|
||||||
|
Architecture: amd64 i386 armel
|
||||||
|
Section: debug
|
||||||
|
Priority: extra
|
||||||
|
Depends: ${shlibs:Depends},
|
||||||
|
${misc:Depends}
|
||||||
|
Description: Safe and easy web browser from Trisquel - Breakpad symbols
|
||||||
|
Abrowser delivers safe, easy web browsing. A familiar user interface,
|
||||||
|
enhanced security features including protection from online identity theft,
|
||||||
|
and integrated search let you get the most out of the web.
|
||||||
|
.
|
||||||
|
This package contains the Abrowser symbols in a format expected by Mozilla's
|
||||||
|
Breakpad. Eventually this package should go away and the symbol upload be
|
||||||
|
implemented in soyuz (or other builders that build this package)
|
||||||
|
|
||||||
|
Package: abrowser-globalmenu
|
||||||
|
Architecture: any
|
||||||
|
Depends: ${shlibs:Depends},
|
||||||
|
${misc:Depends},
|
||||||
|
abrowser (= ${binary:Version})
|
||||||
|
Description: Unity appmenu integration for Abrowser
|
||||||
|
This package provides an extension which adds support for the Unity
|
||||||
|
appmenu to Abrowser
|
||||||
|
|
||||||
|
# Transitional packages below here
|
||||||
|
|
||||||
|
Package: abrowser-old
|
||||||
|
Architecture: any
|
||||||
|
Depends: ${misc:Depends}, abrowser
|
||||||
|
Description: Safe and easy web browser from Trisquel - transitional package
|
||||||
|
This is a transitional package to ensure that upgrades work correctly.
|
||||||
|
It can be safely removed
|
||||||
|
|
||||||
|
Package: abrowser-branding
|
||||||
|
Architecture: any
|
||||||
|
Depends: ${misc:Depends}, abrowser
|
||||||
|
Description: Safe and easy web browser from Trisquel - transitional package
|
||||||
|
This is a transitional package to ensure that upgrades work correctly.
|
||||||
|
It can be safely removed
|
||||||
|
|
||||||
|
Package: abrowser-old-branding
|
||||||
|
Architecture: any
|
||||||
|
Depends: ${misc:Depends}, abrowser
|
||||||
|
Description: Safe and easy web browser from Trisquel - transitional package
|
||||||
|
This is a transitional package to ensure that upgrades work correctly.
|
||||||
|
It can be safely removed
|
||||||
|
|
||||||
|
Package: abrowser-gnome-support-dbg
|
||||||
|
Architecture: any
|
||||||
|
Section: debug
|
||||||
|
Priority: extra
|
||||||
|
Depends: ${misc:Depends}, abrowser-gnome-support, abrowser-dbg (= ${binary:Version})
|
||||||
|
Description: Safe and easy web browser from Trisquel - transitional package
|
||||||
|
This is a transitional package to ensure that upgrades work correctly.
|
||||||
|
It can be safely removed
|
||||||
|
|
||||||
|
# Language packs below here
|
||||||
|
|
||||||
|
Package: abrowser-locale-af
|
||||||
|
Provides: firefox-locale-af
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-af-base
|
||||||
|
Description: Afrikaans language pack for Abrowser
|
||||||
|
This package contains Afrikaans translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ar
|
||||||
|
Provides: firefox-locale-ar
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ar-base
|
||||||
|
Description: Arabic language pack for Abrowser
|
||||||
|
This package contains Arabic translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ast
|
||||||
|
Provides: firefox-locale-ast
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ast-base
|
||||||
|
Description: Asturian language pack for Abrowser
|
||||||
|
This package contains Asturian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-be
|
||||||
|
Provides: firefox-locale-be
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-be-base
|
||||||
|
Description: Belarusian language pack for Abrowser
|
||||||
|
This package contains Belarusian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-bg
|
||||||
|
Provides: firefox-locale-bg
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-bg-base
|
||||||
|
Description: Bulgarian language pack for Abrowser
|
||||||
|
This package contains Bulgarian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-bn
|
||||||
|
Provides: firefox-locale-bn
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-bn-base
|
||||||
|
Description: Bengali language pack for Abrowser
|
||||||
|
This package contains Bengali translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-br
|
||||||
|
Provides: firefox-locale-br
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-br-base
|
||||||
|
Description: Breton language pack for Abrowser
|
||||||
|
This package contains Breton translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-bs
|
||||||
|
Provides: firefox-locale-bs
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-bs-base
|
||||||
|
Description: Bosnian language pack for Abrowser
|
||||||
|
This package contains Bosnian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ca
|
||||||
|
Provides: firefox-locale-ca
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ca-base
|
||||||
|
Description: Catalan; Valencian language pack for Abrowser
|
||||||
|
This package contains Catalan; Valencian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-cs
|
||||||
|
Provides: firefox-locale-cs
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-cs-base
|
||||||
|
Description: Czech language pack for Abrowser
|
||||||
|
This package contains Czech translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-cy
|
||||||
|
Provides: firefox-locale-cy
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-cy-base
|
||||||
|
Description: Welsh language pack for Abrowser
|
||||||
|
This package contains Welsh translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-da
|
||||||
|
Provides: firefox-locale-da
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-da-base
|
||||||
|
Description: Danish language pack for Abrowser
|
||||||
|
This package contains Danish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-de
|
||||||
|
Provides: firefox-locale-de
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-de-base
|
||||||
|
Description: German language pack for Abrowser
|
||||||
|
This package contains German translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-el
|
||||||
|
Provides: firefox-locale-el
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-el-base
|
||||||
|
Description: Greek language pack for Abrowser
|
||||||
|
This package contains Greek translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-en
|
||||||
|
Provides: firefox-locale-en
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-en-base
|
||||||
|
Description: English language pack for Abrowser
|
||||||
|
This package contains English translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-eo
|
||||||
|
Provides: firefox-locale-eo
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-eo-base
|
||||||
|
Description: Esperanto language pack for Abrowser
|
||||||
|
This package contains Esperanto translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-es
|
||||||
|
Provides: firefox-locale-es
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-es-base
|
||||||
|
Description: Spanish; Castilian language pack for Abrowser
|
||||||
|
This package contains Spanish; Castilian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-et
|
||||||
|
Provides: firefox-locale-et
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-et-base
|
||||||
|
Description: Estonian language pack for Abrowser
|
||||||
|
This package contains Estonian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-eu
|
||||||
|
Provides: firefox-locale-eu
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-eu-base
|
||||||
|
Description: Basque language pack for Abrowser
|
||||||
|
This package contains Basque translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-fa
|
||||||
|
Provides: firefox-locale-fa
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-fa-base
|
||||||
|
Description: Persian language pack for Abrowser
|
||||||
|
This package contains Persian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-fi
|
||||||
|
Provides: firefox-locale-fi
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-fi-base
|
||||||
|
Description: Finnish language pack for Abrowser
|
||||||
|
This package contains Finnish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-fr
|
||||||
|
Provides: firefox-locale-fr
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-fr-base
|
||||||
|
Description: French language pack for Abrowser
|
||||||
|
This package contains French translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-fy
|
||||||
|
Provides: firefox-locale-fy
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-fy-base
|
||||||
|
Description: Western Frisian language pack for Abrowser
|
||||||
|
This package contains Western Frisian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ga
|
||||||
|
Provides: firefox-locale-ga
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ga-base
|
||||||
|
Description: Irish language pack for Abrowser
|
||||||
|
This package contains Irish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-gd
|
||||||
|
Provides: firefox-locale-gd
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-gd-base
|
||||||
|
Description: Gaelic; Scottish Gaelic language pack for Abrowser
|
||||||
|
This package contains Gaelic; Scottish Gaelic translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-gl
|
||||||
|
Provides: firefox-locale-gl
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-gl-base
|
||||||
|
Description: Galician language pack for Abrowser
|
||||||
|
This package contains Galician translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-gu
|
||||||
|
Provides: firefox-locale-gu
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-gu-base
|
||||||
|
Description: Gujarati language pack for Abrowser
|
||||||
|
This package contains Gujarati translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-he
|
||||||
|
Provides: firefox-locale-he
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-he-base
|
||||||
|
Description: Hebrew language pack for Abrowser
|
||||||
|
This package contains Hebrew translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-hi
|
||||||
|
Provides: firefox-locale-hi
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-hi-base
|
||||||
|
Description: Hindi language pack for Abrowser
|
||||||
|
This package contains Hindi translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-hr
|
||||||
|
Provides: firefox-locale-hr
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-hr-base
|
||||||
|
Description: Croatian language pack for Abrowser
|
||||||
|
This package contains Croatian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-hu
|
||||||
|
Provides: firefox-locale-hu
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-hu-base
|
||||||
|
Description: Hungarian language pack for Abrowser
|
||||||
|
This package contains Hungarian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-hy
|
||||||
|
Provides: firefox-locale-hy
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-hy-base
|
||||||
|
Description: Armenian language pack for Abrowser
|
||||||
|
This package contains Armenian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-id
|
||||||
|
Provides: firefox-locale-id
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-id-base
|
||||||
|
Description: Indonesian language pack for Abrowser
|
||||||
|
This package contains Indonesian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-is
|
||||||
|
Provides: firefox-locale-is
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-is-base
|
||||||
|
Description: Icelandic language pack for Abrowser
|
||||||
|
This package contains Icelandic translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-it
|
||||||
|
Provides: firefox-locale-it
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-it-base
|
||||||
|
Description: Italian language pack for Abrowser
|
||||||
|
This package contains Italian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ja
|
||||||
|
Provides: firefox-locale-ja
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ja-base
|
||||||
|
Description: Japanese language pack for Abrowser
|
||||||
|
This package contains Japanese translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-kk
|
||||||
|
Provides: firefox-locale-kk
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-kk-base
|
||||||
|
Description: Kazakh language pack for Abrowser
|
||||||
|
This package contains Kazakh translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-kn
|
||||||
|
Provides: firefox-locale-kn
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-kn-base
|
||||||
|
Description: Kannada language pack for Abrowser
|
||||||
|
This package contains Kannada translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ko
|
||||||
|
Provides: firefox-locale-ko
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ko-base
|
||||||
|
Description: Korean language pack for Abrowser
|
||||||
|
This package contains Korean translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ku
|
||||||
|
Provides: firefox-locale-ku
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ku-base
|
||||||
|
Description: Kurdish language pack for Abrowser
|
||||||
|
This package contains Kurdish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-lg
|
||||||
|
Provides: firefox-locale-lg
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-lg-base
|
||||||
|
Description: Ganda language pack for Abrowser
|
||||||
|
This package contains Ganda translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-lt
|
||||||
|
Provides: firefox-locale-lt
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-lt-base
|
||||||
|
Description: Lithuanian language pack for Abrowser
|
||||||
|
This package contains Lithuanian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-lv
|
||||||
|
Provides: firefox-locale-lv
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-lv-base
|
||||||
|
Description: Latvian language pack for Abrowser
|
||||||
|
This package contains Latvian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-mai
|
||||||
|
Provides: firefox-locale-mai
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-mai-base
|
||||||
|
Description: Maithili language pack for Abrowser
|
||||||
|
This package contains Maithili translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-mk
|
||||||
|
Provides: firefox-locale-mk
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-mk-base
|
||||||
|
Description: Macedonian language pack for Abrowser
|
||||||
|
This package contains Macedonian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ml
|
||||||
|
Provides: firefox-locale-ml
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ml-base
|
||||||
|
Description: Malayalam language pack for Abrowser
|
||||||
|
This package contains Malayalam translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-mr
|
||||||
|
Provides: firefox-locale-mr
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-mr-base
|
||||||
|
Description: Marathi language pack for Abrowser
|
||||||
|
This package contains Marathi translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-nb
|
||||||
|
Provides: firefox-locale-nb
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-nb-base
|
||||||
|
Description: Norwegian language pack for Abrowser
|
||||||
|
This package contains Norwegian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-nl
|
||||||
|
Provides: firefox-locale-nl
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-nl-base
|
||||||
|
Description: Dutch; Flemish language pack for Abrowser
|
||||||
|
This package contains Dutch; Flemish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-nn
|
||||||
|
Provides: firefox-locale-nn
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-nn-base
|
||||||
|
Description: Norwegian Nynorsk; Nynorsk, Norwegian language pack for Abrowser
|
||||||
|
This package contains Norwegian Nynorsk; Nynorsk, Norwegian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-nso
|
||||||
|
Provides: firefox-locale-nso
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-nso-base
|
||||||
|
Description: Sotho, Northern language pack for Abrowser
|
||||||
|
This package contains Sotho, Northern translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-or
|
||||||
|
Provides: firefox-locale-or
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-or-base
|
||||||
|
Description: Oriya language pack for Abrowser
|
||||||
|
This package contains Oriya translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-pa
|
||||||
|
Provides: firefox-locale-pa
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-pa-base
|
||||||
|
Description: Panjabi; Punjabi language pack for Abrowser
|
||||||
|
This package contains Panjabi; Punjabi translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-pl
|
||||||
|
Provides: firefox-locale-pl
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-pl-base
|
||||||
|
Description: Polish language pack for Abrowser
|
||||||
|
This package contains Polish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-pt
|
||||||
|
Provides: firefox-locale-pt
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-pt-base
|
||||||
|
Description: Portuguese language pack for Abrowser
|
||||||
|
This package contains Portuguese translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ro
|
||||||
|
Provides: firefox-locale-ro
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ro-base
|
||||||
|
Description: Romanian language pack for Abrowser
|
||||||
|
This package contains Romanian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ru
|
||||||
|
Provides: firefox-locale-ru
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ru-base
|
||||||
|
Description: Russian language pack for Abrowser
|
||||||
|
This package contains Russian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-si
|
||||||
|
Provides: firefox-locale-si
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-si-base
|
||||||
|
Description: Sinhala; Sinhalese language pack for Abrowser
|
||||||
|
This package contains Sinhala; Sinhalese translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-sk
|
||||||
|
Provides: firefox-locale-sk
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-sk-base
|
||||||
|
Description: Slovak language pack for Abrowser
|
||||||
|
This package contains Slovak translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-sl
|
||||||
|
Provides: firefox-locale-sl
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-sl-base
|
||||||
|
Description: Slovenian language pack for Abrowser
|
||||||
|
This package contains Slovenian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-sq
|
||||||
|
Provides: firefox-locale-sq
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-sq-base
|
||||||
|
Description: Albanian language pack for Abrowser
|
||||||
|
This package contains Albanian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-sr
|
||||||
|
Provides: firefox-locale-sr
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-sr-base
|
||||||
|
Description: Serbian language pack for Abrowser
|
||||||
|
This package contains Serbian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-sv
|
||||||
|
Provides: firefox-locale-sv
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-sv-base
|
||||||
|
Description: Swedish language pack for Abrowser
|
||||||
|
This package contains Swedish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-ta
|
||||||
|
Provides: firefox-locale-ta
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-ta-base
|
||||||
|
Description: Tamil language pack for Abrowser
|
||||||
|
This package contains Tamil translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-te
|
||||||
|
Provides: firefox-locale-te
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-te-base
|
||||||
|
Description: Telugu language pack for Abrowser
|
||||||
|
This package contains Telugu translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-th
|
||||||
|
Provides: firefox-locale-th
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-th-base
|
||||||
|
Description: Thai language pack for Abrowser
|
||||||
|
This package contains Thai translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-tr
|
||||||
|
Provides: firefox-locale-tr
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-tr-base
|
||||||
|
Description: Turkish language pack for Abrowser
|
||||||
|
This package contains Turkish translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-uk
|
||||||
|
Provides: firefox-locale-uk
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-uk-base
|
||||||
|
Description: Ukrainian language pack for Abrowser
|
||||||
|
This package contains Ukrainian translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-vi
|
||||||
|
Provides: firefox-locale-vi
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-vi-base
|
||||||
|
Description: Vietnamese language pack for Abrowser
|
||||||
|
This package contains Vietnamese translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-zh-hans
|
||||||
|
Provides: firefox-locale-zh-hans
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-zh-hans-base
|
||||||
|
Description: Simplified Chinese language pack for Abrowser
|
||||||
|
This package contains Simplified Chinese translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-zh-hant
|
||||||
|
Provides: firefox-locale-zh-hant
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-zh-hant-base
|
||||||
|
Description: Traditional Chinese language pack for Abrowser
|
||||||
|
This package contains Traditional Chinese translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-zu
|
||||||
|
Provides: firefox-locale-zu
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Replaces: language-pack-zu-base
|
||||||
|
Description: Zulu language pack for Abrowser
|
||||||
|
This package contains Zulu translations and search plugins
|
||||||
|
for Abrowser
|
||||||
|
|
||||||
|
Package: abrowser-locale-as
|
||||||
|
Provides: firefox-locale-as
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Description: Transitional package for unavailable language
|
||||||
|
This is an empty transitional package to ensure a clean upgrade
|
||||||
|
process. You can safely remove this package after installation.
|
||||||
|
|
||||||
|
Package: abrowser-locale-ka
|
||||||
|
Provides: firefox-locale-ka
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Description: Transitional package for unavailable language
|
||||||
|
This is an empty transitional package to ensure a clean upgrade
|
||||||
|
process. You can safely remove this package after installation.
|
||||||
|
|
||||||
|
Package: abrowser-locale-oc
|
||||||
|
Provides: firefox-locale-oc
|
||||||
|
Architecture: all
|
||||||
|
Depends: ${misc:Depends}
|
||||||
|
Description: Transitional package for unavailable language
|
||||||
|
This is an empty transitional package to ensure a clean upgrade
|
||||||
|
process. You can safely remove this package after installation.
|
||||||
23
helpers/DATA/gnome-app-install/gnome-app-install.patch
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
diff -ru data-orig/gnome-app-install.glade data/gnome-app-install.glade
|
||||||
|
--- data-orig/gnome-app-install.glade 2009-03-31 12:55:04.000000000 +0000
|
||||||
|
+++ data/gnome-app-install.glade 2009-06-12 21:35:02.846384370 +0000
|
||||||
|
@@ -1008,7 +1008,7 @@
|
||||||
|
|
||||||
|
<child>
|
||||||
|
<widget class="GtkHBox" id="hbox24">
|
||||||
|
- <property name="visible">True</property>
|
||||||
|
+ <property name="visible">False</property>
|
||||||
|
<property name="homogeneous">False</property>
|
||||||
|
<property name="spacing">12</property>
|
||||||
|
|
||||||
|
@@ -1294,9 +1294,7 @@
|
||||||
|
<child>
|
||||||
|
<widget class="GtkLabel" id="label_progress">
|
||||||
|
<property name="visible">True</property>
|
||||||
|
- <property name="label" translatable="yes"><big><b>Checking installed and available applications</b></big>
|
||||||
|
-
|
||||||
|
-Ubuntu and third party vendors offer you a large variety of applications that you can install on your system.</property>
|
||||||
|
+ <property name="label" translatable="yes"><big><b>Loading...</b></big></property>
|
||||||
|
<property name="use_underline">False</property>
|
||||||
|
<property name="use_markup">True</property>
|
||||||
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
190
helpers/DATA/gnome-app-install/gnome-app-install_Ubuntu.py
Normal file
|
|
@ -0,0 +1,190 @@
|
||||||
|
|
||||||
|
import Default
|
||||||
|
|
||||||
|
from AppInstall.Menu import SHOW_ALL, SHOW_ONLY_SUPPORTED, SHOW_ONLY_FREE, SHOW_ONLY_MAIN, SHOW_ONLY_PROPRIETARY, SHOW_ONLY_THIRD_PARTY, SHOW_ONLY_INSTALLED
|
||||||
|
from AppInstall.Util import *
|
||||||
|
|
||||||
|
import datetime
|
||||||
|
import locale
|
||||||
|
|
||||||
|
from gettext import gettext as _
|
||||||
|
|
||||||
|
class Distribution(Default.Distribution):
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
Default.Distribution.__init__(self)
|
||||||
|
# Dictonary of all available filters with corresponding choser name
|
||||||
|
# and tooltip
|
||||||
|
# The installed filter will be automatically added in non-installer mode
|
||||||
|
# The primary and secondary filters are separated
|
||||||
|
self.filters_primary = {
|
||||||
|
SHOW_ALL : (_("All available applications"), ""),
|
||||||
|
SHOW_ONLY_FREE : (_("All Open Source applications"), ""),
|
||||||
|
}
|
||||||
|
self.filters_secondary = {
|
||||||
|
SHOW_ONLY_SUPPORTED : (_("Canonical-maintained applications"), ""),
|
||||||
|
SHOW_ONLY_THIRD_PARTY :(_("Third party applications"), ""),
|
||||||
|
}
|
||||||
|
# List of components whose applications should not be installed
|
||||||
|
# before asking for a confirmation
|
||||||
|
self.components_ask = ["universe", "multiverse"]
|
||||||
|
# Dictonary that provides dialog messages that are shown,
|
||||||
|
# before a component gets activated or when it requires to be confirmed
|
||||||
|
self.components_activation = {
|
||||||
|
# Fallback
|
||||||
|
None : [_("Enable the installation of software from the %s "
|
||||||
|
"component of Ubuntu?"),
|
||||||
|
# %s is the name of the component
|
||||||
|
_("%s is not officially supported with security "
|
||||||
|
"updates.")],
|
||||||
|
"main" : [_("Enable the installaion of officially "
|
||||||
|
"supported Ubuntu software?"),
|
||||||
|
# %s is the name of the application
|
||||||
|
_("%s is part of the Ubuntu main distribution. "
|
||||||
|
"Canonical Ltd. provides support and security "
|
||||||
|
"updates, which will be enabled too.")],
|
||||||
|
"universe" : [_("Enable the installation of community maintained "
|
||||||
|
"software?"),
|
||||||
|
# %s is the name of the application
|
||||||
|
_("%s is maintained by the Ubuntu community. "
|
||||||
|
"The Ubuntu community provides support and "
|
||||||
|
"security updates, which will be enabled too.")],
|
||||||
|
"multiverse" : [_("Enable the installation of unsupported and "
|
||||||
|
"restricted software?"),
|
||||||
|
# %s is the name of the application
|
||||||
|
_("The use, modification and distribution of %s "
|
||||||
|
"is restricted by copyright or by legal terms in "
|
||||||
|
"some countries.")]
|
||||||
|
}
|
||||||
|
|
||||||
|
self.dependencies_map = [
|
||||||
|
# KDE
|
||||||
|
(("kdelibs5","python-kde4","libqtgui4"),
|
||||||
|
# %s is the name of an application
|
||||||
|
None,
|
||||||
|
"application-kde"),
|
||||||
|
# GNOME
|
||||||
|
(("libgnome2-0","python-gnome2","libgtk2.0-0","python-gtk2"),
|
||||||
|
# %s is the name of an application
|
||||||
|
None,
|
||||||
|
"application-gnome"),
|
||||||
|
# XUBUNTU
|
||||||
|
# FIXME: get an icon from xubuntu
|
||||||
|
(("libxfce4util4",),
|
||||||
|
# %s is the name of an application
|
||||||
|
None,
|
||||||
|
None)]
|
||||||
|
|
||||||
|
self.comp_depend_map = { "universe":["main"],
|
||||||
|
"multiverse":["main", "universe"]}
|
||||||
|
|
||||||
|
def get_app_emblems(self, app, cache):
|
||||||
|
# A short statement about the freedom, legal status and level of
|
||||||
|
# support of the application
|
||||||
|
emblems = []
|
||||||
|
icon_name = None
|
||||||
|
tooltip = None
|
||||||
|
if app.channel.endswith("-partner") and app.supported:
|
||||||
|
tooltip = _("%s is provided by a third party vendor "
|
||||||
|
"from the Canonical partner repository.") % app.name
|
||||||
|
icon_name = "application-partner"
|
||||||
|
emblems.append((icon_name, tooltip))
|
||||||
|
elif app.component == "main" or app.supported:
|
||||||
|
tooltip = _("Canonical Ltd. provides technical support and "
|
||||||
|
"security updates for %s") % app.name
|
||||||
|
icon_name = "application-supported"
|
||||||
|
emblems.append((icon_name, tooltip))
|
||||||
|
elif app.thirdparty or app.channel:
|
||||||
|
tooltip = ("%s is provided by a third party vendor "
|
||||||
|
"and is therefore not an official part "
|
||||||
|
"of Ubuntu. The third party vendor is "
|
||||||
|
"responsible for support and security "
|
||||||
|
"updates.") % app.name
|
||||||
|
icon_name = "application-proprietary"
|
||||||
|
emblems.append((icon_name, tooltip))
|
||||||
|
if app.component == "universe":
|
||||||
|
tooltip =_("This application is provided by the "
|
||||||
|
"Ubuntu community.")
|
||||||
|
icon_name = "application-community"
|
||||||
|
emblems.append((icon_name, tooltip))
|
||||||
|
if app.component == "multiverse" or app.thirdparty:
|
||||||
|
tooltip = _("The use, modification and distribution "
|
||||||
|
"of %s is restricted by copyright or by "
|
||||||
|
"legal terms in some countries.") % app.name
|
||||||
|
icon_name = "application-proprietary"
|
||||||
|
emblems.append((icon_name, tooltip))
|
||||||
|
|
||||||
|
# Add an emblem corresponding to the dependencies of the app
|
||||||
|
if cache.has_key(app.pkgname):
|
||||||
|
for (deps, tooltip, icon_name) in self.dependencies_map:
|
||||||
|
for dep in deps:
|
||||||
|
if cache.pkgDependsOn(app.pkgname, dep):
|
||||||
|
if type(tooltip) == str:
|
||||||
|
tooltip = tooltip % app.name
|
||||||
|
emblems.append((icon_name, tooltip))
|
||||||
|
break
|
||||||
|
icon_name = None
|
||||||
|
tooltip = None
|
||||||
|
return emblems
|
||||||
|
|
||||||
|
def get_codec_information_link(self):
|
||||||
|
url = "https://codecs.canonical.com"
|
||||||
|
label = _("Buy Licensed Plug-ins...")
|
||||||
|
return (label, url)
|
||||||
|
|
||||||
|
def get_maintenance_status(self, app, cache):
|
||||||
|
|
||||||
|
# try to figure out the support dates of the release and make
|
||||||
|
# sure to look only for stuff in "Ubuntu" and "distro_codename"
|
||||||
|
# (to exclude stuff in ubuntu-updates for the support time
|
||||||
|
# calculation because the "Release" file time for that gets
|
||||||
|
# updated regularly)
|
||||||
|
releasef = get_release_filename_for_pkg(cache, app.pkgname,
|
||||||
|
"Ubuntu", self.get_codename())
|
||||||
|
time_t = get_release_date_from_release_file(releasef)
|
||||||
|
# check the release date and show support information
|
||||||
|
# based on this
|
||||||
|
if time_t:
|
||||||
|
release_date = datetime.datetime.fromtimestamp(time_t)
|
||||||
|
#print "release_date: ", release_date
|
||||||
|
now = datetime.datetime.now()
|
||||||
|
release_age = (now - release_date).days
|
||||||
|
#print "release age: ", release_age
|
||||||
|
|
||||||
|
# mvo: we do not define the end date very precisely
|
||||||
|
# currently this is why it will just display a end
|
||||||
|
# range
|
||||||
|
(support_end_year, support_end_month) = get_maintenance_end_date(release_date, 18)
|
||||||
|
support_end_month_str = locale.nl_langinfo(getattr(locale,"MON_%d" % support_end_month))
|
||||||
|
# check if the support has ended
|
||||||
|
support_ended = (now.year >= support_end_year and
|
||||||
|
now.month > support_end_month)
|
||||||
|
if app.component == "main":
|
||||||
|
if support_ended:
|
||||||
|
return _("Canonical does no longer provide "
|
||||||
|
"updates for %s in Ubuntu %s. "
|
||||||
|
"Updates may be available in a newer version of "
|
||||||
|
"Ubuntu.") % (app.name, self.get_distro_release())
|
||||||
|
else:
|
||||||
|
return _("Canonical provides critical updates for "
|
||||||
|
"%(appname)s until %(support_end_month_str)s "
|
||||||
|
"%(support_end_year)s.") % {'appname' : app.name,
|
||||||
|
'support_end_month_str' : support_end_month_str,
|
||||||
|
'support_end_year' : support_end_year}
|
||||||
|
elif app.component == "restricted":
|
||||||
|
if support_ended:
|
||||||
|
return _("Canonical does no longer provide "
|
||||||
|
"updates for %s in Ubuntu %s. "
|
||||||
|
"Updates may be available in a newer version of "
|
||||||
|
"Ubuntu.") % (app.name, self.get_distro_release())
|
||||||
|
else:
|
||||||
|
return _("Canonical provides critical updates supplied "
|
||||||
|
"by the developers of %(appname)s until "
|
||||||
|
"%(support_end_month_str)s "
|
||||||
|
"%(support_end_year)s.") % {'appname' : app.name,
|
||||||
|
'support_end_month_str' : support_end_month_str,
|
||||||
|
'support_end_year' : support_end_year}
|
||||||
|
|
||||||
|
|
||||||
|
return _("") % app.name
|
||||||
|
|
||||||
BIN
helpers/DATA/gnome-control-center/TrisquelLogo.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
129
helpers/DATA/gnome-control-center/gnomecc.menu.in
Normal file
|
|
@ -0,0 +1,129 @@
|
||||||
|
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
|
||||||
|
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
|
||||||
|
|
||||||
|
<Menu>
|
||||||
|
<Name>Control Center</Name>
|
||||||
|
<Directory>gnomecc.directory</Directory>
|
||||||
|
|
||||||
|
<!-- Read standard .directory and .desktop file locations -->
|
||||||
|
<AppDir>/usr/share/applications/</AppDir>
|
||||||
|
<DefaultDirectoryDirs/>
|
||||||
|
|
||||||
|
<!-- Read in overrides and child menus from gnomecc-merged/ -->
|
||||||
|
<DefaultMergeDirs/>
|
||||||
|
|
||||||
|
<!-- Sort the control center categories -->
|
||||||
|
<Layout>
|
||||||
|
<Menuname>Personal</Menuname>
|
||||||
|
<Menuname>System</Menuname>
|
||||||
|
<Menuname>Other</Menuname>
|
||||||
|
<Merge type="all" />
|
||||||
|
</Layout>
|
||||||
|
|
||||||
|
<!-- Stuff in the toplevel (Other category) -->
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
<Not>
|
||||||
|
<Or>
|
||||||
|
<Category>X-GNOME-PersonalSettings</Category>
|
||||||
|
<Category>DesktopSettings</Category>
|
||||||
|
<Category>HardwareSettings</Category>
|
||||||
|
<Category>X-GNOME-SystemSettings</Category>
|
||||||
|
<Category>System</Category>
|
||||||
|
</Or>
|
||||||
|
</Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
|
||||||
|
<!-- Avoid the shell having a launcher for itself -->
|
||||||
|
<Exclude>
|
||||||
|
<Filename>gnome-control-center.desktop</Filename>
|
||||||
|
</Exclude>
|
||||||
|
|
||||||
|
<!-- Personal category -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Personal</Name>
|
||||||
|
<Directory>Personal.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
<Not>
|
||||||
|
<Or>
|
||||||
|
<Category>System</Category>
|
||||||
|
<Category>X-GNOME-SystemSettings</Category>
|
||||||
|
</Or>
|
||||||
|
</Not>
|
||||||
|
</And>
|
||||||
|
<Or>
|
||||||
|
<Filename>gnome-universal-access-panel.desktop</Filename>
|
||||||
|
</Or>
|
||||||
|
</Include>
|
||||||
|
<Exclude>
|
||||||
|
<Filename>gnome-printers-panel.desktop</Filename>
|
||||||
|
<Filename>gnome-network-panel.desktop</Filename>
|
||||||
|
<Filename>evolution-settings.desktop</Filename>
|
||||||
|
<Filename>language-selector.desktop</Filename>
|
||||||
|
<Filename>nm-connection-editor.desktop</Filename>
|
||||||
|
<Filename>palimpsest.desktop</Filename>
|
||||||
|
<Filename>gnome-online-accounts-panel.desktop</Filename>
|
||||||
|
</Exclude>
|
||||||
|
</Menu> <!-- End Personal -->
|
||||||
|
|
||||||
|
<!-- disabled
|
||||||
|
<Menu>
|
||||||
|
<Name>Hardware</Name>
|
||||||
|
<Directory>Hardware.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
<Category>HardwareSettings</Category>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> -->
|
||||||
|
|
||||||
|
<!-- System category -->
|
||||||
|
<Menu>
|
||||||
|
<Name>System</Name>
|
||||||
|
<Directory>System.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>System</Category>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
</And>
|
||||||
|
<Or>
|
||||||
|
<Category>X-GNOME-SystemSettings</Category>
|
||||||
|
<Filename>language-selector.desktop</Filename>
|
||||||
|
<Filename>nm-connection-editor.desktop</Filename>
|
||||||
|
<Filename>palimpsest.desktop</Filename>
|
||||||
|
<Filename>gnome-ppp.desktop</Filename>
|
||||||
|
</Or>
|
||||||
|
</Include>
|
||||||
|
<Exclude>
|
||||||
|
<Filename>gnome-universal-access-panel.desktop</Filename>
|
||||||
|
<Filename>gnome-user-accounts-panel.desktop</Filename>
|
||||||
|
<Filename>gnome-app-install.desktop</Filename>
|
||||||
|
</Exclude>
|
||||||
|
</Menu> <!-- End System -->
|
||||||
|
|
||||||
|
<!-- Other category -->
|
||||||
|
<Menu>
|
||||||
|
<Name>Other</Name>
|
||||||
|
<Directory>X-GNOME-Other.directory</Directory>
|
||||||
|
<Include>
|
||||||
|
<And>
|
||||||
|
<Category>Settings</Category>
|
||||||
|
<Category>X-GNOME-Settings-Panel</Category>
|
||||||
|
<Not>
|
||||||
|
<Or>
|
||||||
|
<Category>X-GNOME-PersonalSettings</Category>
|
||||||
|
<Category>X-GNOME-SystemSettings</Category>
|
||||||
|
<Category>HardwareSettings</Category>
|
||||||
|
<Filename>gnome-control-center.desktop</Filename>
|
||||||
|
</Or>
|
||||||
|
</Not>
|
||||||
|
</And>
|
||||||
|
</Include>
|
||||||
|
</Menu> <!-- End Other -->
|
||||||
|
|
||||||
|
</Menu> <!-- End CC -->
|
||||||