[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#582884: ITP: usb-creator -- startup disk creator



I forgot the patch. Attached this time.

I've also filed this bug:
https://bugs.launchpad.net/ubuntu/+source/usb-creator/+bug/1000527
which points out breakage in the package due
to trying to deal with syslinx version changes but assumes Ubuntu
nomenclature in a version check.
diff -urN usb-creator-0.2.38/debian/control /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/debian/control
--- usb-creator-0.2.38/debian/control	2012-04-16 08:28:18.000000000 +0000
+++ /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/debian/control	2012-05-16 11:33:57.000000000 +0000
@@ -2,29 +2,28 @@
 Section: admin
 Priority: optional
 Maintainer: usb-creator Hackers Team <usb-creator-hackers@lists.launchpad.net>
-Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Ignace Mouzannar <mouzannar@gmail.com>
+Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Wookey <wookey@debian.org>
 Build-Depends: debhelper (>= 7.2.11~),
-               dh-translations,
-               python (>= 2.6),
+               python,
                python-distutils-extra,
                pkg-kde-tools,
                kdesdk-scripts
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 X-Python-Version: current
 Vcs-Bzr: http://bazaar.launchpad.net/~usb-creator-hackers/usb-creator/trunk
 
 Package: usb-creator-common
 Architecture: amd64 i386
 Depends: ${misc:Depends}, ${python:Depends}, python-dbus,
- syslinux, syslinux-legacy,
+ syslinux,
  udisks (>= 1.0~), udisks (<< 1.1), genisoimage, mtools, parted, python-debian
 Description: create a startup disk using a CD or disc image (common files)
  Startup Disk Creator converts a USB key or SD card into a volume from which you
- can start up and run Ubuntu. You can also store files and settings in any space
- left over.
+ can start up and run or install Debian/Ubuntu. You can also store files and 
+ settings in any space left over.
  .
- The program also works for Debian, or any other Debian-based OS for which you
- have a CD or .iso image.
+ The program works for Debian and Ubuntu, or any other Debian-based OS for which 
+ you have a CD or .iso image.
  .
  This package contains backend engine and common data files used by frontends.
 
@@ -36,14 +35,13 @@
  gir1.2-gtk-3.0,
  gir1.2-pango-1.0,
  gir1.2-glib-2.0,
- gir1.2-unity-5.0,
  python-dbus
 Description: create a startup disk using a CD or disc image (for GNOME)
  Startup Disk Creator converts a USB key or SD card into a volume from which you
- can start up and run Ubuntu. You can also store files and settings in any space
- left over.
+ can start up and run or install Debian/Ubuntu. You can also store files and 
+ settings in any space left over.
  .
- The program also works for Debian, or any other Debian-based OS for which you
+ The program works for Debian or Ubuntu, or any other Debian-based OS for which you
  have a CD or .iso image.
  .
  This package contains the GTK+ client frontend.
@@ -54,10 +52,10 @@
  usb-creator-common (= ${binary:Version}), python-kde4, python-qt4-dbus
 Description: create a startup disk using a CD or disc image (for KDE)
  Startup Disk Creator converts a USB key or SD card into a volume from which you
- can start up and run Ubuntu. You can also store files and settings in any space
- left over.
+ can start up and run or install Debian/Ubuntu. You can also store files and 
+ settings in any space left over.
  .
- The program also works for Debian, or any other Debian-based OS for which you
+ The program works for Debian or Ubuntu, or any other Debian-based OS for which you
  have a CD or .iso image.
  .
  This package contains the KDE client frontend.
diff -urN usb-creator-0.2.38/debian/rules /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/debian/rules
--- usb-creator-0.2.38/debian/rules	2012-03-19 17:40:32.000000000 +0000
+++ /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/debian/rules	2012-05-16 11:21:29.000000000 +0000
@@ -4,8 +4,14 @@
 xpm_gtk := $(CURDIR)/debian/usb-creator-gtk/usr/share/pixmaps/
 xpm_kde := $(CURDIR)/debian/usb-creator-kde/usr/share/pixmaps/
 
+ifeq ($(vendor),Ubuntu)
+ DHaddons := python2,translations
+else
+ DHaddons := python2
+endif
+
 %:
-	dh -Spython_distutils --with python2,translations $@
+	dh -Spython_distutils --with $(DHaddons) $@
 
 override_dh_install:
 	find . -path "$(vendor)/*.svg" -exec cp {} $(dest) \;
diff -urN usb-creator-0.2.38/gui/usbcreator-gtk.ui /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/gui/usbcreator-gtk.ui
--- usb-creator-0.2.38/gui/usbcreator-gtk.ui	2012-03-19 17:40:32.000000000 +0000
+++ /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/gui/usbcreator-gtk.ui	2012-05-16 10:58:38.000000000 +0000
@@ -203,7 +203,7 @@
                       <object class="GtkLabel" id="finished_dialog_label">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Installation is complete.  You may now run Ubuntu on other computers by booting them with this drive inserted.</property>
+                        <property name="label" translatable="yes">Installation is complete.  You may now run Debian/Ubuntu on other computers by booting them with this drive inserted.</property>
                         <property name="wrap">True</property>
                         <property name="selectable">True</property>
                       </object>
@@ -468,7 +468,7 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">To try or install Ubuntu from a removable disk, it needs to be set up as a startup disk.</property>
+                <property name="label" translatable="yes">To try or install Debian or Ubuntu from a removable disk, it needs to be set up as a startup disk.</property>
                 <property name="wrap">True</property>
                 <property name="selectable">True</property>
               </object>
diff -urN usb-creator-0.2.38/gui/usbcreator-kde.ui /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/gui/usbcreator-kde.ui
--- usb-creator-0.2.38/gui/usbcreator-kde.ui	2012-03-19 17:40:32.000000000 +0000
+++ /home/wookey/packages/usb-creator/debian/usb-creator-0.2.38/gui/usbcreator-kde.ui	2012-05-16 10:58:49.000000000 +0000
@@ -23,7 +23,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>To try or install Ubuntu from a removable disk, it needs to be set up as a startup disk.</string>
+      <string>To try or install Debian or Ubuntu from a removable disk, it needs to be set up as a startup disk.</string>
      </property>
     </widget>
    </item>

Reply to: