summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-06 13:02:01 +0000
committerintrigeri <intrigeri@boum.org>2015-07-06 13:02:01 +0000
commit5abb19d3216ed59d79e58e634f53ed7540589159 (patch)
treec4402d010a5b1a09080bb4dd7f23ff7389973963
parent26c3e1c9bcf4d96125470485f8b7c8f0ea58d09d (diff)
parent1a8068053a5a6e831852e6c20518a3e14ecb2b72 (diff)
Merge branch 'feature/gtk3' into debian_feature-gtk3
-rw-r--r--MANIFEST.in2
-rw-r--r--data/fedora.icobin9662 -> 0 bytes
-rw-r--r--data/fedorausb.pngbin8861 -> 0 bytes
-rw-r--r--data/liveusb-creator-logo-small.pngbin3074 -> 0 bytes
-rw-r--r--data/liveusb-creator-logo.pngbin13439 -> 0 bytes
-rwxr-xr-xdata/liveusb-header-old.pngbin15736 -> 0 bytes
-rwxr-xr-xdata/liveusb-header.pngbin15930 -> 0 bytes
-rw-r--r--data/liveusb-header.xcfbin26650 -> 0 bytes
-rw-r--r--fedora.ini2
-rw-r--r--liveusb-creator.spec214
-rwxr-xr-xsetup.py2
11 files changed, 3 insertions, 217 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 81d8384..2de4f56 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,11 +16,11 @@ include liveusb/urlgrabber/grabber.py
include liveusb/urlgrabber/keepalive.py
include liveusb/urlgrabber/mirror.py
include liveusb/urlgrabber/progress.py
-include data/liveusb-header.png
include data/liveusb-creator.ui
include data/liveusb-creator-launcher.ui
include data/refresh.png
include data/liveusb-creator.desktop
+include data/tails-liveusb-header.png
include data/usb-creator-gtk.svg
include liveusb-creator.console
include liveusb-creator.pam
diff --git a/data/fedora.ico b/data/fedora.ico
deleted file mode 100644
index e9599ae..0000000
--- a/data/fedora.ico
+++ /dev/null
Binary files differ
diff --git a/data/fedorausb.png b/data/fedorausb.png
deleted file mode 100644
index fe02c84..0000000
--- a/data/fedorausb.png
+++ /dev/null
Binary files differ
diff --git a/data/liveusb-creator-logo-small.png b/data/liveusb-creator-logo-small.png
deleted file mode 100644
index b67aa2e..0000000
--- a/data/liveusb-creator-logo-small.png
+++ /dev/null
Binary files differ
diff --git a/data/liveusb-creator-logo.png b/data/liveusb-creator-logo.png
deleted file mode 100644
index b90ac10..0000000
--- a/data/liveusb-creator-logo.png
+++ /dev/null
Binary files differ
diff --git a/data/liveusb-header-old.png b/data/liveusb-header-old.png
deleted file mode 100755
index 4d3e10b..0000000
--- a/data/liveusb-header-old.png
+++ /dev/null
Binary files differ
diff --git a/data/liveusb-header.png b/data/liveusb-header.png
deleted file mode 100755
index 89fb0ae..0000000
--- a/data/liveusb-header.png
+++ /dev/null
Binary files differ
diff --git a/data/liveusb-header.xcf b/data/liveusb-header.xcf
deleted file mode 100644
index 8ecd39c..0000000
--- a/data/liveusb-header.xcf
+++ /dev/null
Binary files differ
diff --git a/fedora.ini b/fedora.ini
index d9516a0..cd67feb 100644
--- a/fedora.ini
+++ b/fedora.ini
@@ -4,7 +4,7 @@ running_liveos_mountpoint = /run/initramfs/live
[branding]
distribution = Fedora
-header = :/liveusb-header.png
+header = :/tails-liveusb-header.png
partition_label = FEDORA
[download]
diff --git a/liveusb-creator.spec b/liveusb-creator.spec
deleted file mode 100644
index b03a2fb..0000000
--- a/liveusb-creator.spec
+++ /dev/null
@@ -1,214 +0,0 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-Name: liveusb-creator
-Version: 3.11.8
-Release: 1%{?dist}
-Summary: A liveusb creator
-
-Group: Applications/System
-License: GPLv2
-URL: https://fedorahosted.org/liveusb-creator
-Source0: https://fedorahosted.org/releases/l/i/liveusb-creator/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-ExcludeArch: ppc
-ExcludeArch: ppc64
-
-BuildRequires: python-devel, python-setuptools, PyQt4-devel, desktop-file-utils gettext
-Requires: syslinux, PyQt4, usermode, isomd5sum
-Requires: python-urlgrabber
-Requires: pyparted >= 2.0
-
-%description
-A liveusb creator from Live Fedora images
-
-%prep
-%setup -q
-
-%build
-%{__python} setup.py build
-make mo
-make mo
-
-%install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-%{__rm} -r liveusb/urlgrabber
-
-# Adjust for console-helper magic
-mkdir -p %{buildroot}%{_sbindir}
-mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
-ln -s ../bin/consolehelper %{buildroot}%{_bindir}/%{name}
-mkdir -p %{buildroot}%{_sysconfdir}/pam.d
-cp %{name}.pam %{buildroot}%{_sysconfdir}/pam.d/%{name}
-mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
-cp %{name}.console %{buildroot}%{_sysconfdir}/security/console.apps/%{name}
-
-desktop-file-install --vendor="fedora" \
---dir=%{buildroot}%{_datadir}/applications \
-%{buildroot}/%{_datadir}/applications/liveusb-creator.desktop
-rm -rf %{buildroot}/%{_datadir}/applications/liveusb-creator.desktop
-
-%find_lang %{name}
-
-%clean
-rm -rf %{buildroot}
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc README.txt LICENSE.txt
-%{python_sitelib}/*
-%{_bindir}/%{name}
-%{_sbindir}/%{name}
-%{_datadir}/applications/fedora-liveusb-creator.desktop
-%{_datadir}/pixmaps/fedorausb.png
-#%{_datadir}/locale/*/LC_MESSAGES/liveusb-creator.mo
-%config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
-
-%changelog
-* Tue Jan 15 2013 Luke Macken <lmacken@redhat.com> - 3.11.8-1
-- Update to 3.11.8
-
-* Tue Nov 08 2011 Luke Macken <lmacken@redhat.com> - 3.11.6-1
-- Update our release list for F16
-
-* Wed Nov 02 2011 Luke Macken <lmacken@redhat.com> - 3.11.5-1
-- Update to the 3.11.5 release
-
-* Tue Jun 21 2011 Luke Macken <lmacken@redhat.com> - 3.11.4-1
-- 3.11.4 bugfix release
-
-* Tue Jun 21 2011 Luke Macken <lmacken@redhat.com> - 3.11.3-1
-- 3.11.3 bugfix release
-
-* Sun Jun 12 2011 Luke Macken <lmacken@redhat.com> - 3.11.2-1
-- 3.11.2 minor bugfix release
-
-* Tue May 24 2011 Luke Macken <lmacken@redhat.com> - 3.11.1-1
-- 3.11.1 release
-
-* Mon Apr 25 2011 Luke Macken <lmacken@redhat.com> - 3.11.0-1
-- 3.11.0 release
-
-* Mon Jan 24 2011 Luke Macken <lmacken@redhat.com> - 3.10.0-1
-- 3.10.0 upstream release
-
-* Tue Dec 08 2009 Luke Macken <lmacken@redhat.com> - 3.9.1-1
-- 3.9.1 bugfix release
-
-* Tue Dec 01 2009 Luke Macken <lmacken@redhat.com> - 3.9-1
-- 3.9 release
-
-* Tue Dec 01 2009 Luke Macken <lmacken@redhat.com> - 3.8.9-1
-- 3.8.9, fixes bug #540255
-
-* Tue Dec 01 2009 Luke Macken <lmacken@redhat.com> - 3.8.8-1
-- 3.8.8, bugfix release
-
-* Tue Nov 17 2009 Luke Macken <lmacken@redhat.com> - 3.8.7-1
-- 3.8.7, containing the F12 release
-
-* Sat Nov 07 2009 Luke Macken <lmacken@redhat.com> - 3.8.6-1
-- 3.8.6
-
-* Thu Aug 27 2009 Luke Macken <lmacken@redhat.com> - 3.7.3-1
-- 3.7.3
-
-* Wed Aug 05 2009 Luke Macken <lmacken@redhat.com> - 3.7.2-1
-- 3.7.2
-
-* Sat Jun 27 2009 Luke Macken <lmacken@redhat.com> - 3.7.1-1
-- 3.7.1
-
-* Wed Jun 24 2009 Luke Macken <lmacken@redhat.com> - 3.7
-- Latest upstream bugfix release
-
-* Fri Jun 12 2009 Luke Macken <lmacken@redhat.com> - 3.6.8-1
-- Latest upstream bugfix release
-
-* Tue Jun 09 2009 Luke Macken <lmacken@redhat.com> - 3.6.7-1
-- Fix a bug with ext formatted sticks
-
-* Tue Jun 09 2009 Luke Macken <lmacken@redhat.com> - 3.6.6-1
-- Update to v3.6.6
-- Merge the dcon-unfreeze patch upstream
-- Add Fedora 11 to the release list
-
-* Wed May 20 2009 Christoph Wickert <cwickert@fedoraproject.org> - 3.6.5-3
-- Make olpc.fth unfreeze disply for newer BIOSes than Q2E30 (#501688)
-
-* Thu Apr 09 2009 Luke Macken <lmacken@redhat.com> 3.6.5-2
-- Fix the checksum verification to support sha256
-
-* Thu Apr 09 2009 Luke Macken <lmacken@redhat.com> 3.6.5-1
-- Update to v3.6.5, which supports F11 beta, and the latest SoaS releases
-
-* Wed Mar 18 2009 Luke Macken <lmacken@redhat.com> 3.6.4-1
-- Update to v3.6.4, which works with the PyParted 2.0 API
-
-* Thu Mar 12 2009 Luke Macken <lmacken@redhat.com> 3.6.3-1
-- Update to v3.6.3
-
-* Mon Mar 07 2009 Luke Macken <lmacken@redhat.com> 3.6-1
-- Require pyparted
-- Update to v3.6
-
-* Fri Mar 06 2009 wwp <subscript@free.fr> 3.5-2
-- Fix dd commands when output path contain whitespaces
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> 3.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Jan 16 2009 Luke Macken <lmacken@redhat.com> 3.5-1
-- Update to v3.5
-
-* Fri Jan 16 2009 Luke Macken <lmacken@redhat.com> 3.4-1
-- Update to 3.4.
-
-* Fri Jan 16 2009 Luke Macken <lmacken@redhat.com> 3.3-2
-- Require python-urlgrabber
-
-* Fri Jan 15 2009 Luke Macken <lmacken@redhat.com> 3.3-1
-- Update to 3.3
-
-* Fri Jan 02 2009 Luke Macken <lmacken@redhat.com> 3.2-1
-- Fixed some syslinux-related issues (#167)
-- Fixed some windows-related logging problems (#337)
-- Mitigate a DBus/HAL-related segfault by unmounting upon termination
-
-* Thu Jan 01 2009 Luke Macken <lmacken@redhat.com> 3.1-1
-- Latest upstream release, containing some windows-specific
- optimizations and fixes.
-
-* Mon Dec 29 2008 Luke Macken <lmacken@redhat.com> 3.0-4
-- Latest upstream release.
-- Fedora 10 support
-- Update to the latest sugar spin
-- Lots of bug fixes and code improvements
-- Improved OLPC support with the --xo flag
-- Translation improvements
- - Greek translation (Nikos Charonitakis)
- - Slovak translation (Ondrej Sulek)
- - Catalan translation (Xavier Conde)
- - French translation (PabloMartin-Gomez)
- - Serbian (Milos Komarcevic)
- - Chinese (sainrysec)
-
-* Fri Oct 03 2008 Luke Macken <lmacken@redhat.com> 3.0-2
-- Exclude ppc and ppc64, as syslinux will not work on those architectures.
-
-* Fri Aug 29 2008 Luke Macken <lmacken@redhat.com> 3.0-1
-- Latest upstream release, containing various bugfixes
-- Fedora 10 Beta support
-- Brazilian Portuguese translation (Igor Pires Soares)
-- Spanish translation (Domingo Becker)
-- Malay translation (Sharuzzaman Ahmat Raslan)
-- German Translation (Marcus Nitzschke, Fabian Affolter)
-- Polish translation (Piotr Drąg)
-- Portuguese translation (Valter Fukuoka)
-- Czech translation (Adam Pribyl)
-
-* Tue Aug 12 2008 Kushal Das <kushal@fedoraproject.org> 2.7-1
-- Initial release
diff --git a/setup.py b/setup.py
index 01c38b1..c009d06 100755
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ if sys.platform == 'win32':
windows = [
{
"script" : "liveusb-creator",
- "icon_resources" : [(0, "data/fedora.ico")],
+ # "icon_resources" : [(0, "data/fedora.ico")],
}
],
options={