r110 - tarballs unstable/rutilt/debian unstable/rutilt/debian/patches
benh at alioth.debian.org
benh at alioth.debian.org
Sun Dec 2 19:25:47 UTC 2007
Author: benh
Date: 2007-12-02 19:25:47 +0000 (Sun, 02 Dec 2007)
New Revision: 110
Added:
tarballs/rutilt_0.16.orig.tar.gz
unstable/rutilt/debian/patches/021_fix_configure_arg_parsing.diff
Removed:
unstable/rutilt/debian/manpages
unstable/rutilt/debian/patches/001_fix_desktop.diff
unstable/rutilt/debian/patches/002_fix_install.diff
unstable/rutilt/debian/patches/003_fix_ELF_location.diff
unstable/rutilt/debian/patches/004_fix_ctype_usage.diff
unstable/rutilt/debian/patches/005_fix_extraction_checks.diff
unstable/rutilt/debian/patches/006_fix_temporary_c_str.diff
unstable/rutilt/debian/patches/007_fix_buffer_lengths.diff
unstable/rutilt/debian/patches/008_fix_row_toggled.diff
unstable/rutilt/debian/patches/009_remove_unsafe_signal_handler.diff
unstable/rutilt/debian/patches/010_fix_cflags.diff
unstable/rutilt/debian/patches/011_fix_trayicon_toggle.diff
unstable/rutilt/debian/patches/012_fix_set_ip.diff
unstable/rutilt/debian/patches/013_fix_install_failure.diff
unstable/rutilt/debian/patches/014_make_dialogs_transient.diff
unstable/rutilt/debian/patches/016_fix_about_comment.diff
unstable/rutilt/debian/patches/017_change_version.diff
unstable/rutilt/debian/patches/018_up_and_down.diff
unstable/rutilt/debian/patches/019_fix_ap_address.diff
unstable/rutilt/debian/patches/020_fix_refresh_rate_crash.diff
unstable/rutilt/debian/rutilt_helper.1
Modified:
unstable/rutilt/debian/changelog
unstable/rutilt/debian/patches/015_use_su-to-root.diff
unstable/rutilt/debian/patches/series
unstable/rutilt/debian/rules
Log:
Imported rutilt version 0.16.
Removed patches applied upstream.
Removed rutilt_helper manual page, included upstream.
Implemented debug build option separately from noopt.
Added patch for configure.sh to handle options with spaces in correctly.
Added: tarballs/rutilt_0.16.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/rutilt_0.16.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/rutilt/debian/changelog
===================================================================
--- unstable/rutilt/debian/changelog 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/changelog 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,10 +1,14 @@
-rutilt (0.15-4) unstable; urgency=low
+rutilt (0.16-1) unstable; urgency=low
- * Revised 018_up_and_down.diff. Removed the change to configuration
- code that would bring the interface down before setting ESSID, as this
- is not necessary and does not work with all drivers. (LP #164058)
+ * New upstream version
+ * Removed patches applied upstream
+ * Removed the remaining changes in 018_up_and_down.diff. Bringing the
+ interface down before setting ESSID is not necessary and does not work
+ with all drivers. (LP #164058)
+ * Removed rutilt_helper manual page, included upstream
+ * Implemented debug build option separately from noopt
- -- Ben Hutchings <ben at decadent.org.uk> Thu, 22 Nov 2007 00:01:13 +0000
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 02 Dec 2007 18:39:05 +0000
rutilt (0.15-3) unstable; urgency=low
Deleted: unstable/rutilt/debian/manpages
===================================================================
--- unstable/rutilt/debian/manpages 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/manpages 2007-12-02 19:25:47 UTC (rev 110)
@@ -1 +0,0 @@
-debian/rutilt_helper.1
Deleted: unstable/rutilt/debian/patches/001_fix_desktop.diff
===================================================================
--- unstable/rutilt/debian/patches/001_fix_desktop.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/001_fix_desktop.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,26 +0,0 @@
---- rutilt.orig/configure.sh
-+++ rutilt/configure.sh
-@@ -250,17 +250,19 @@
- echo "[Desktop Entry]
- Name=RutilT WLAN Manager
- Name[fr]=Utilitaire de Configuration Wifi RutilT
-+Name[it]=Strumento di Configurazione WiFi RutilT
- GenericName=WLAN Manager
- GenericName[fr]=Utilitaire de Configuration Wifi
-+GenericName[it]=Strumento di Configurazione WiFi
- Comment=Manage your wireless network interfaces
- Comment[fr]=Configurer vos cartes Wifi
-+Comment[it]=Configura le tue schede WiFi
- Terminal=false
- Type=Application
--Encoding=UTF-8
--Categories=GTK;System;Settings;Application;Network
--Version=0.14
-+Categories=GTK;System;Settings;Network;
-+Version=1.0
- StartupNotify=false
--Icon=$prefix/$icon_prefix$icon_64x64_name
-+Icon=$prefix/$icon_prefix$icon_48x48_name
- Exec=$rutilt_name" > $desktop_launcher_name
- echo done
- #
Deleted: unstable/rutilt/debian/patches/002_fix_install.diff
===================================================================
--- unstable/rutilt/debian/patches/002_fix_install.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/002_fix_install.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,91 +0,0 @@
---- rutilt-0.15~/Makefile 2007-06-30 19:28:16.000000000 +0200
-+++ rutilt-0.15/Makefile 2007-09-04 22:54:07.000000000 +0200
-@@ -273,64 +273,40 @@
- install :
- @if [ -e $(RUTILT_NAME) ]; then \
- echo "Installing $(RUTILT_NAME) in $(RUTILT_PREFIX)"; \
-- install -d $(RUTILT_PREFIX); \
-- install $(RUTILT_NAME) $(RUTILT_PREFIX); \
-+ install -d $(DESTDIR)$(RUTILT_PREFIX); \
-+ install $(RUTILT_NAME) $(DESTDIR)$(RUTILT_PREFIX); \
- if [ `echo $(BUILD) | grep -c helper` -gt 0 ]; then \
- echo "Installing $(HELPER_NAME) in $(HELPER_PREFIX)"; \
-- install -d $(HELPER_PREFIX); \
-- install -m $(HELPER_MODE) -o root $(HELPER_NAME) $(HELPER_PREFIX); \
-- chmod $(HELPER_MODE) $(HELPER_PREFIX)/$(HELPER_NAME); \
-+ install -d $(DESTDIR)$(HELPER_PREFIX); \
-+ install -m $(HELPER_MODE) -o root $(HELPER_NAME) $(DESTDIR)$(HELPER_PREFIX); \
-+ chmod $(HELPER_MODE) $(DESTDIR)$(HELPER_PREFIX)/$(HELPER_NAME); \
- fi; \
- echo "Installing $(IP_SCRIPT_NAME) in $(IP_SCRIPT_PREFIX)"; \
-- if [ -e $(IP_SCRIPT_PREFIX)/$(IP_SCRIPT_NAME) ]; then \
-- echo -n "Overwrite previous $(IP_SCRIPT_NAME)? <y/N> "; \
-- read answer; \
-- if [ -z $$answer ]; then \
-- answer=N; \
-- fi; \
-- if [ $$answer = 'y' ] || [ $$answer = 'yes' ] || [ $$answer = 'Y' ]; then \
-- echo "Overwritting previous $(IP_SCRIPT_NAME)..."; \
-- install $(IP_SCRIPT_NAME) $(IP_SCRIPT_PREFIX); \
-- fi; \
-- else \
-- install -d $(IP_SCRIPT_PREFIX); \
-- install $(IP_SCRIPT_NAME) $(IP_SCRIPT_PREFIX); \
-- fi; \
-+ install -d $(DESTDIR)$(IP_SCRIPT_PREFIX); \
-+ install $(IP_SCRIPT_NAME) $(DESTDIR)$(IP_SCRIPT_PREFIX); \
- if [ $(HELPER_MODE) -eq 755 ]; then \
- echo "Installing $(HELPER_LAUNCHER_NAME) in $(HELPER_LAUNCHER_PREFIX)"; \
-- if [ -e $(HELPER_LAUNCHER_PREFIX)/$(HELPER_LAUNCHER_NAME) ]; then \
-- echo -n "Overwrite previous $(HELPER_LAUNCHER_NAME)? <y/N> "; \
-- read answer; \
-- if [ -z $$answer ]; then \
-- answer=N; \
-- fi; \
-- if [ $$answer = 'y' ] || [ $$answer = 'yes' ] || [ $$answer = 'Y' ]; then \
-- echo "Overwritting previous $(HELPER_LAUNCHER_NAME)..."; \
-- install $(HELPER_LAUNCHER_NAME) $(HELPER_LAUNCHER_PREFIX); \
-- fi; \
-- else \
-- install -d $(HELPER_LAUNCHER_PREFIX); \
-- install $(HELPER_LAUNCHER_NAME) $(HELPER_LAUNCHER_PREFIX); \
-- fi; \
-+ install -d $(DESTDIR)$(HELPER_LAUNCHER_PREFIX); \
-+ install $(HELPER_LAUNCHER_NAME) $(DESTDIR)$(HELPER_LAUNCHER_PREFIX); \
- fi; \
- echo "Installing icons in $(ICON_PREFIX)"; \
-- install -d $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(TRAY_ICON_DISCONNECTED_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(TRAY_ICON_LOW_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(TRAY_ICON_MEDIUM_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(TRAY_ICON_HIGH_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(ICON_16X16_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(ICON_32X32_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(ICON_48X48_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(ICON_64X64_NAME) $(ICON_PREFIX); \
-- install -m 644 $(ART)/$(ICON_128X128_NAME) $(ICON_PREFIX); \
-+ install -d $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(TRAY_ICON_DISCONNECTED_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(TRAY_ICON_LOW_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(TRAY_ICON_MEDIUM_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(TRAY_ICON_HIGH_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(ICON_16X16_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(ICON_32X32_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(ICON_48X48_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(ICON_64X64_NAME) $(DESTDIR)$(ICON_PREFIX); \
-+ install -m 644 $(ART)/$(ICON_128X128_NAME) $(DESTDIR)$(ICON_PREFIX); \
- echo "Installing $(DESKTOP_LAUNCHER) in $(DESKTOP_LAUNCHER_PREFIX)"; \
-- install -d $(DESKTOP_LAUNCHER_PREFIX); \
-- install -m 644 $(DESKTOP_LAUNCHER) $(DESKTOP_LAUNCHER_PREFIX); \
-+ install -d $(DESTDIR)$(DESKTOP_LAUNCHER_PREFIX); \
-+ install -m 644 $(DESKTOP_LAUNCHER) $(DESTDIR)$(DESKTOP_LAUNCHER_PREFIX); \
- echo "Installing manual page in $(RUTILT_MAN_PREFIX)"; \
-- install -d $(RUTILT_MAN_PREFIX); \
-- install -m 644 $(RUTILT_MAN) $(RUTILT_MAN_PREFIX); \
-- gzip -f --best $(RUTILT_MAN_PREFIX)/$(RUTILT_MAN); \
-+ install -d $(DESTDIR)$(RUTILT_MAN_PREFIX); \
-+ install -m 644 $(RUTILT_MAN) $(DESTDIR)$(RUTILT_MAN_PREFIX); \
-+ gzip -f --best $(DESTDIR)$(RUTILT_MAN_PREFIX)/$(RUTILT_MAN); \
- else echo Compile the program before, run \"make\".; \
- fi
- #
Deleted: unstable/rutilt/debian/patches/003_fix_ELF_location.diff
===================================================================
--- unstable/rutilt/debian/patches/003_fix_ELF_location.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/003_fix_ELF_location.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,11 +0,0 @@
---- rutilt.orig/configure.sh
-+++ rutilt/configure.sh
-@@ -29,7 +29,7 @@
- rutilt_name=rutilt
- rutilt_prefix=bin/
- helper_name=rutilt_helper
--helper_prefix=share/rutilt/
-+helper_prefix=bin/
- ip_script_name=set_ip.sh
- ip_script_prefix=share/rutilt/
- helper_launcher_name=helper_launcher.sh
Deleted: unstable/rutilt/debian/patches/004_fix_ctype_usage.diff
===================================================================
--- unstable/rutilt/debian/patches/004_fix_ctype_usage.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/004_fix_ctype_usage.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,51 +0,0 @@
---- rutilt.orig/lib/src/Parameters.cxx
-+++ rutilt/lib/src/Parameters.cxx
-@@ -223,7 +223,7 @@
- for (std::string::size_type i (Key.size()) ; i-- ; )
- if (Key [i] == '-' || Key [i] == ':' || Key [i] == ' ')
- Key.erase (i, 1);
-- else if (!isxdigit (Key [i]))
-+ else if (!isxdigit (static_cast<unsigned char> (Key[i])))
- {
- #ifndef NDEBUG
- std::cerr << "Bad format, key : #" << Key << "# byte " << i
-@@ -232,7 +232,7 @@
- throw CBadFormatExc();
- }
- else
-- Key [i] = toupper (Key [i]);
-+ Key [i] = toupper (static_cast<unsigned char> (Key[i]));
- if (Key.empty())
- {
- #ifndef NDEBUG
---- rutilt.orig/lib/src/WWidgets.cxx
-+++ rutilt/lib/src/WWidgets.cxx
-@@ -68,7 +68,7 @@
- CKeyEntry* This) throw()
- {
- if (!::gtk_toggle_button_get_active (This->m_pIsASCIIButton) &&
-- !std::isxdigit (*NewText))
-+ !std::isxdigit (static_cast<unsigned char> (*NewText)))
- ::g_signal_stop_emission_by_name (pEditable, "insert-text");
-
- } // NewTextTyped()
-@@ -80,7 +80,7 @@
- if (!::gtk_toggle_button_get_active (This->m_pIsASCIIButton))
- for (const char* KeyStr (::gtk_entry_get_text (This->m_pEntry)) ;
- *KeyStr ; ++KeyStr)
-- if (!std::isxdigit (*KeyStr))
-+ if (!std::isxdigit (static_cast<unsigned char> (*KeyStr)))
- {
- This->Clear();
- break;
---- rutilt.orig/lib/src/XMLParser.cxx
-+++ rutilt/lib/src/XMLParser.cxx
-@@ -148,7 +148,7 @@
- if (!Length) return;
- unsigned i (0);
- for ( ; i < Length ; ++i) // We ignore indentation and things like that.
-- if (!isspace (Text [i])) break;
-+ if (!isspace (static_cast<unsigned char> (Text [i]))) break;
- if (i == Length) return;
-
- try{This->Text (::g_markup_parse_context_get_element (pContext),
Deleted: unstable/rutilt/debian/patches/005_fix_extraction_checks.diff
===================================================================
--- unstable/rutilt/debian/patches/005_fix_extraction_checks.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/005_fix_extraction_checks.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,52 +0,0 @@
---- rutilt.orig/lib/src/CWirelessMsgHandler.cxx
-+++ rutilt/lib/src/CWirelessMsgHandler.cxx
-@@ -35,7 +35,7 @@
- std::istringstream Is (Str);
- T Value;
- Is >> Value;
-- if (Is || Is.eof()) return Value;
-+ if (Is) return Value;
- throw nsErrors::CException ("Invalid data read (from helper).",
- nsErrors::InvalidDataFromHelper);
-
-@@ -50,6 +50,9 @@
- unsigned DefaultKey;
- std::istringstream Is (Str);
- Is >> Encrypt >> Auth >> DefaultKey;
-+ if (!Is)
-+ throw nsErrors::CException ("Invalid data read (from helper).",
-+ nsErrors::InvalidDataFromHelper);
- nsWireless::CEncryptionD Descriptor;
- Descriptor.SetEncrypt (nsWireless::EncryptType_e (Encrypt));
- Descriptor.SetAuth (nsWireless::AuthType_e (Auth));
-@@ -70,7 +73,7 @@
- nsErrors::InvalidDataFromHelper);
- }
- }
-- if (!(Is || Is.eof()))
-+ if (!Is)
- throw nsErrors::CException ("Invalid data read (from helper).",
- nsErrors::InvalidDataFromHelper);
- return Descriptor;
---- rutilt.orig/lib/src/PrefsPage.cxx
-+++ rutilt/lib/src/PrefsPage.cxx
-@@ -246,7 +246,7 @@
-
- int nsGUI::CPrefsPage::GetSelectedRate () const throw()
- {
-- float Rate;
-+ float Rate = 0.0;
- std::istringstream Is (::gtk_combo_box_get_active_text (m_pRatesBox));
- Is >> Rate;
- return int (Rate * 1000);
---- rutilt.orig/lib/src/RTWMsgHandlers.cxx
-+++ rutilt/lib/src/RTWMsgHandlers.cxx
-@@ -35,7 +35,7 @@
- std::istringstream Is (Str);
- T Value;
- Is >> Value;
-- if (Is || Is.eof()) return Value;
-+ if (Is) return Value;
- throw nsErrors::CException ("Invalid data read (from helper).",
- nsErrors::InvalidDataFromHelper);
-
Deleted: unstable/rutilt/debian/patches/006_fix_temporary_c_str.diff
===================================================================
--- unstable/rutilt/debian/patches/006_fix_temporary_c_str.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/006_fix_temporary_c_str.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,14 +0,0 @@
---- rutilt.orig/lib/src/NetTools.cxx
-+++ rutilt/lib/src/NetTools.cxx
-@@ -129,8 +129,9 @@
- {
- if (nsSystem::Fork())
- {
-- const char* Argv [5] = {(nsCore::DhcpScriptPrefix +
-- nsCore::DhcpScriptName).c_str(),
-+ std::string ScriptName (nsCore::DhcpScriptPrefix +
-+ nsCore::DhcpScriptName);
-+ const char* Argv [5] = {ScriptName.c_str(),
- m_IfName.c_str(), Data.c_str(), 0};
- try {nsSystem::Exec (Argv);}
- catch (const nsErrors::CException& Exc)
Deleted: unstable/rutilt/debian/patches/007_fix_buffer_lengths.diff
===================================================================
--- unstable/rutilt/debian/patches/007_fix_buffer_lengths.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/007_fix_buffer_lengths.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,28 +0,0 @@
---- rutilt.orig/lib/src/RTDrivers.cxx
-+++ rutilt/lib/src/RTDrivers.cxx
-@@ -1039,9 +1039,9 @@
-
- void nsWireless::CRT73Driver::SetRfmontx (bool B) throw (nsErrors::CSystemExc)
- {
-- char Buffer (B ? '1' : '0');
-- m_Data.data.pointer = reinterpret_cast< ::caddr_t> (&Buffer);
-- m_Data.data.length = 2;
-+ char Buffer[2] = {B ? '1' : '0', 0};
-+ m_Data.data.pointer = reinterpret_cast< ::caddr_t> (Buffer);
-+ m_Data.data.length = sizeof (Buffer);
- m_Data.data.flags = 0;
- Ioctl (GetRfmontxIoctl(), "Can't set injection mode.");
- SetFlag (Rfmontx, B);
---- rutilt.orig/lib/src/SystemTools.cxx
-+++ rutilt/lib/src/SystemTools.cxx
-@@ -120,9 +120,7 @@
- std::memset(&addr, 0, sizeof (addr));
- const size_t UNIX_PATH_MAX (108U);
- addr.sun_family = AF_UNIX;
-- addr_name.copy (addr.sun_path + 1, UNIX_PATH_MAX - 2);
-- addr.sun_path [addr_name.size() > UNIX_PATH_MAX - 1 ? UNIX_PATH_MAX
-- : addr_name.size()] = '\0';
-+ addr_name.copy (addr.sun_path + 1, UNIX_PATH_MAX - 1);
-
- } // InitSockaddrUn()
-
Deleted: unstable/rutilt/debian/patches/008_fix_row_toggled.diff
===================================================================
--- unstable/rutilt/debian/patches/008_fix_row_toggled.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/008_fix_row_toggled.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,19 +0,0 @@
---- rutilt.orig/lib/src/CSelectableRowList.cxx
-+++ rutilt/lib/src/CSelectableRowList.cxx
-@@ -18,6 +18,7 @@
- /** \file CSelectableRowList.cxx
- \author Romain BONDUE
- \date 28/07/2005 */
-+#include <cstdlib> // atoi()
- #include <cstring> // memset()
-
- #include "CSelectableRowList.h"
-@@ -184,7 +185,7 @@
- {
- ::gtk_tree_selection_select_iter (::gtk_tree_view_get_selection
- (This->m_pListView),
-- &This->m_IterVec [Path [0] - '0']);
-+ &This->m_IterVec [atoi(Path)]);
- This->RowTriggered();
- }
-
Deleted: unstable/rutilt/debian/patches/009_remove_unsafe_signal_handler.diff
===================================================================
--- unstable/rutilt/debian/patches/009_remove_unsafe_signal_handler.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/009_remove_unsafe_signal_handler.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,12 +0,0 @@
---- rutilt.orig/lib/src/GtkGUI.cxx
-+++ rutilt/lib/src/GtkGUI.cxx
-@@ -283,7 +283,9 @@
- m_PrefsPage.AddTrayIconButtonCallBack
- (G_CALLBACK (DisplayTrayIconButtonCallBack), this);
-
-+#if 0
- TrapSignals();
-+#endif
- LoadOptions();
- SetWindowIcons();
- #ifndef NDEBUG
Deleted: unstable/rutilt/debian/patches/010_fix_cflags.diff
===================================================================
--- unstable/rutilt/debian/patches/010_fix_cflags.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/010_fix_cflags.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,13 +0,0 @@
---- rutilt.orig/configure.sh
-+++ rutilt/configure.sh
-@@ -23,8 +23,8 @@
- helper_mode=4755
- makefile_target='$(RUTILT_NAME) $(HELPER_NAME)'
- kernel_sources_path='/lib/modules/'`uname -r`'/build/include/'
--options_base='-pipe -Wall -s'
--options="$options_base -O3 -DNDEBUG"
-+options_base='-pipe -Wall -g'
-+options="$options_base -O -DNDEBUG"
- # Generated variables :
- rutilt_name=rutilt
- rutilt_prefix=bin/
Deleted: unstable/rutilt/debian/patches/011_fix_trayicon_toggle.diff
===================================================================
--- unstable/rutilt/debian/patches/011_fix_trayicon_toggle.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/011_fix_trayicon_toggle.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,127 +0,0 @@
---- rutilt.orig/lib/src/TrayIcon.cxx
-+++ rutilt/lib/src/TrayIcon.cxx
-@@ -28,15 +28,49 @@
-
- nsGUI::CTrayIcon::CTrayIcon (const std::string& FileName,
- ::GCallback CallBack, void* pData) throw()
-- : m_pTrayIcon (GTK_WIDGET (::egg_tray_icon_new ("RutilT"))),
-- m_pIcon (GTK_IMAGE (::gtk_image_new_from_file (FileName.c_str()))),
-+ : m_pTrayIcon (0),
-+ m_pIcon (0),
- m_pToolTipsGroup (::gtk_tooltips_new()),
-- m_CurrentIconFileName (FileName)
-+ m_CurrentIconFileName (FileName),
-+ m_CallBack (CallBack),
-+ m_pCallBackData (pData)
- {
-+} // CTrayIcon()
-+
-+
-+nsGUI::CTrayIcon::~CTrayIcon () throw()
-+{
-+ if (m_pTrayIcon)
-+ ::gtk_widget_destroy (GTK_WIDGET (m_pTrayIcon));
-+ ::gtk_object_destroy (GTK_OBJECT (m_pToolTipsGroup));
-+
-+} // ~CTrayIcon()
-+
-+
-+void nsGUI::CTrayIcon::Show () throw()
-+{
-+ if (m_pTrayIcon)
-+ return;
-+
-+ m_pTrayIcon = GTK_WIDGET (::egg_tray_icon_new ("RutilT"));
-+ m_pIcon = GTK_IMAGE (::gtk_image_new_from_file
-+ (m_CurrentIconFileName.c_str()));
- ::GtkWidget* const pEventBox (::gtk_event_box_new());
- ::g_signal_connect_swapped (G_OBJECT (pEventBox), "button-press-event",
-- CallBack, pData);
-+ m_CallBack, m_pCallBackData);
- ::gtk_container_add (GTK_CONTAINER (pEventBox), GTK_WIDGET (m_pIcon));
- ::gtk_container_add (GTK_CONTAINER (m_pTrayIcon), pEventBox);
-+ ::gtk_widget_show_all (m_pTrayIcon);
-
--} // CTrayIcon()
-+} // Show()
-+
-+
-+void nsGUI::CTrayIcon::Hide () throw()
-+{
-+ if (!m_pTrayIcon)
-+ return;
-+
-+ ::gtk_widget_destroy (m_pTrayIcon);
-+ m_pTrayIcon = 0;
-+
-+} // Hide()
---- rutilt.orig/include/TrayIcon.h
-+++ rutilt/include/TrayIcon.h
-@@ -36,6 +36,7 @@
- public :
- // Callback : void (*) (void*, ::GdkEventButton*) throw();
- CTrayIcon (const std::string&, ::GCallback, void*) throw();
-+ ~CTrayIcon () throw();
- void SetIcon (const std::string&) throw();
- void SetTooltip (const std::string&) throw();
- void Show () throw();
-@@ -44,10 +45,12 @@
-
-
- private :
-- ::GtkWidget* const m_pTrayIcon;
-- ::GtkImage* const m_pIcon;
-+ ::GtkWidget* m_pTrayIcon;
-+ ::GtkImage* m_pIcon;
- ::GtkTooltips* const m_pToolTipsGroup;
- std::string m_CurrentIconFileName;
-+ ::GCallback const m_CallBack;
-+ void* const m_pCallBackData;
-
- }; // CTrayIcon
-
---- rutilt.orig/include/private/TrayIcon.hxx
-+++ rutilt/include/private/TrayIcon.hxx
-@@ -23,36 +23,25 @@
- {
- if (FileName != m_CurrentIconFileName)
- {
-- ::gtk_image_set_from_file (m_pIcon, FileName.c_str());
-+ if (m_pIcon)
-+ ::gtk_image_set_from_file (m_pIcon, FileName.c_str());
- m_CurrentIconFileName = FileName;
- }
-
- } // SetIcon()
-
-
--inline void nsGUI::CTrayIcon::Show () throw()
--{
-- ::gtk_widget_show_all (m_pTrayIcon);
--
--} // Show()
--
--
--inline void nsGUI::CTrayIcon::Hide () throw()
--{
-- ::gtk_widget_hide (m_pTrayIcon);
--
--} // Hide()
--
--
- inline void nsGUI::CTrayIcon::SetTooltip (const std::string& Text) throw()
- {
-- ::gtk_tooltips_set_tip (m_pToolTipsGroup, m_pTrayIcon, Text.c_str(), 0);
-+ if (m_pTrayIcon)
-+ ::gtk_tooltips_set_tip (m_pToolTipsGroup, m_pTrayIcon,
-+ Text.c_str(), 0);
-
- } // SetTooltip()
-
-
- inline bool nsGUI::CTrayIcon::IsVisible () const throw()
- {
-- return GTK_WIDGET_VISIBLE (m_pTrayIcon);
-+ return m_pTrayIcon != 0;
-
- } // IsVisible()
Deleted: unstable/rutilt/debian/patches/012_fix_set_ip.diff
===================================================================
--- unstable/rutilt/debian/patches/012_fix_set_ip.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/012_fix_set_ip.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,17 +0,0 @@
---- rutilt.orig/set_ip.sh
-+++ rutilt/set_ip.sh
-@@ -39,11 +39,7 @@
- # WARNING : Always put your static settings above this line.
- # No known essid, fallback on DHCP but first kill any previously running
- # dhcp client :
-- *) if [ -e /sbin/dhclient ]; then
-- kill `ps -o pid= -C"dhclient $1"`
-- exec /sbin/dhclient $1
-- else
-- kill `ps -o pid= -C"dhcpd $1"`
-- exec /sbin/dhcpd $1
-- fi;;
-+ *) pkill -f "dhclient $1"
-+ exec /sbin/dhclient $1
-+ ;;
- esac
Deleted: unstable/rutilt/debian/patches/013_fix_install_failure.diff
===================================================================
--- unstable/rutilt/debian/patches/013_fix_install_failure.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/013_fix_install_failure.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,10 +0,0 @@
---- rutilt.orig/Makefile
-+++ rutilt/Makefile
-@@ -308,6 +308,7 @@
- install -m 644 $(RUTILT_MAN) $(DESTDIR)$(RUTILT_MAN_PREFIX); \
- gzip -f --best $(DESTDIR)$(RUTILT_MAN_PREFIX)/$(RUTILT_MAN); \
- else echo Compile the program before, run \"make\".; \
-+ false; \
- fi
- #
- uninstall :
Deleted: unstable/rutilt/debian/patches/014_make_dialogs_transient.diff
===================================================================
--- unstable/rutilt/debian/patches/014_make_dialogs_transient.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/014_make_dialogs_transient.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,463 +0,0 @@
---- rutilt.orig/lib/src/GtkGUI.cxx
-+++ rutilt/lib/src/GtkGUI.cxx
-@@ -141,7 +141,8 @@
-
-
- int SelectInterface
-- (const std::vector<nsWireless::CDeviceInfo>& DevicesVec)
-+ (::GtkWindow* pMainWindow,
-+ const std::vector<nsWireless::CDeviceInfo>& DevicesVec)
- throw (nsErrors::CException)
- {
- ::GtkWidget* const pDialog (::gtk_dialog_new_with_buttons (
-@@ -154,6 +155,9 @@
- 0));
- ::gtk_window_set_resizable (GTK_WINDOW (pDialog), false);
- ::gtk_dialog_set_has_separator (GTK_DIALOG (pDialog), false);
-+ if (pMainWindow)
-+ ::gtk_window_set_transient_for (GTK_WINDOW (pDialog),
-+ GTK_WINDOW (pMainWindow));
- ::gtk_container_set_border_width (GTK_CONTAINER (pDialog), 6);
- ::gtk_container_add (GTK_CONTAINER (GTK_DIALOG (pDialog)->vbox),
- ::gtk_label_new ("Select the interface to use"
-@@ -871,7 +875,9 @@
- if (IfaceName.empty())
- {
- if (DevicesVec.size() > 1 || m_pModule.get())
-- Pos = SelectInterface (DevicesVec);
-+ Pos = SelectInterface (GTK_WIDGET_VISIBLE (GTK_WIDGET (m_pWindow))
-+ ? m_pWindow : 0,
-+ DevicesVec);
- }
- else
- {
-@@ -969,7 +975,8 @@
- IsCurrentCell = true;
- }
- catch (const nsErrors::CSystemExc& Exc) {} // Ignored.
-- const nsUserData::CProfile* const pProfile (m_pModule->NewProfile (Cell));
-+ const nsUserData::CProfile* const pProfile
-+ (m_pModule->NewProfile (m_pWindow, Cell));
- if (pProfile) // The user may change his mind and "cancel".
- {
- m_ProfileTab.AddProfile (*pProfile);
---- rutilt.orig/include/CWE17Module.h
-+++ rutilt/include/CWE17Module.h
-@@ -65,9 +65,10 @@
- ~CWE17Module () throw();
- nsWireless::IDriver& GetDriver () throw();
- const nsWireless::IDriver& GetDriver () const throw();
-- nsUserData::CProfile* NewProfile () throw();
-- nsUserData::CProfile* NewProfile (const nsWireless::CCell&) throw();
-- bool EditProfile (unsigned) throw();
-+ nsUserData::CProfile* NewProfile (::GtkWindow*) throw();
-+ nsUserData::CProfile* NewProfile
-+ (::GtkWindow*, const nsWireless::CCell&) throw();
-+ bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
- /** \warning No bound check! */
-@@ -81,7 +82,7 @@
-
-
- protected :
-- nsUserData::CProfile* EditNewProfile () throw();
-+ nsUserData::CProfile* EditNewProfile (::GtkWindow*) throw();
- static const char* const NewProfileDefaultName;
-
-
---- rutilt.orig/include/Module.h
-+++ rutilt/include/Module.h
-@@ -73,10 +73,10 @@
- virtual ~IModule () throw() {}
- virtual nsWireless::IDriver& GetDriver () throw() = 0;
- virtual const nsWireless::IDriver& GetDriver () const throw() = 0;
-- virtual nsUserData::CProfile* NewProfile () throw() = 0;
-- virtual nsUserData::CProfile* NewProfile (const nsWireless::CCell&)
-- throw() = 0;
-- virtual bool EditProfile (unsigned) throw() = 0;
-+ virtual nsUserData::CProfile* NewProfile (::GtkWindow*) throw() = 0;
-+ virtual nsUserData::CProfile* NewProfile
-+ (::GtkWindow*, const nsWireless::CCell&) throw() = 0;
-+ virtual bool EditProfile (::GtkWindow*, unsigned) throw() = 0;
- virtual void DeleteProfile (unsigned) throw() = 0;
- virtual void ApplyProfile (unsigned) throw (nsErrors::CSystemExc) = 0;
- virtual nsUserData::CProfile& GetProfile (unsigned) throw() = 0;
---- rutilt.orig/include/ProfileEditor.h
-+++ rutilt/include/ProfileEditor.h
-@@ -23,6 +23,8 @@
-
- #include <memory> // auto_ptr<>
-
-+#include <gtk/gtkwindow.h>
-+
-
-
- namespace nsUserData {class CProfile;}
-@@ -44,7 +46,7 @@
- ~CProfileEditor () throw();
- nsGUI::CConfigDialog* GetDialog () throw();
- const nsGUI::CConfigDialog* GetDialog () const throw();
-- bool Edit (nsUserData::CProfile&) throw();
-+ bool Edit (::GtkWindow*, nsUserData::CProfile&) throw();
-
-
- private :
---- rutilt.orig/include/RTModules.h
-+++ rutilt/include/RTModules.h
-@@ -102,9 +102,10 @@
- void BecomeRoot () throw (nsErrors::CException, std::bad_alloc);
- nsWireless::IDriver& GetDriver () throw();
- const nsWireless::IDriver& GetDriver () const throw();
-- nsUserData::CProfile* NewProfile () throw();
-- nsUserData::CProfile* NewProfile (const nsWireless::CCell&) throw();
-- bool EditProfile (unsigned) throw();
-+ nsUserData::CProfile* NewProfile (::GtkWindow*) throw();
-+ nsUserData::CProfile* NewProfile
-+ (::GtkWindow*, const nsWireless::CCell&) throw();
-+ bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
- nsUserData::CProfile& GetProfile (unsigned) throw();
-@@ -123,7 +124,7 @@
- CRT2400Module (const CRT2400Module&);
- CRT2400Module& operator= (const CRT2400Module&);
-
-- nsUserData::CProfile* EditNewProfile () throw();
-+ nsUserData::CProfile* EditNewProfile (::GtkWindow*) throw();
-
- std::auto_ptr<nsWireless::CRT2400Driver> m_pDriver;
- CProfileEditor m_ProfileEditor;
-@@ -167,9 +168,10 @@
- ~CRTAdvancedModule () throw();
- nsWireless::IDriver& GetDriver () throw();
- const nsWireless::IDriver& GetDriver () const throw();
-- nsUserData::CProfile* NewProfile () throw();
-- nsUserData::CProfile* NewProfile (const nsWireless::CCell&) throw();
-- bool EditProfile (unsigned) throw();
-+ nsUserData::CProfile* NewProfile (::GtkWindow*) throw();
-+ nsUserData::CProfile* NewProfile
-+ (::GtkWindow*, const nsWireless::CCell&) throw();
-+ bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
- nsUserData::CProfile& GetProfile (unsigned) throw();
-@@ -207,7 +209,7 @@
- CProfileEditor m_ProfileEditor;
- nsUserData::CProfilesFile<> m_ProfilesFile;
-
-- nsUserData::CProfile* EditNewProfile () throw();
-+ nsUserData::CProfile* EditNewProfile (::GtkWindow*) throw();
-
- // Private tab :
- ::GtkTable* const m_pTable;
-@@ -332,9 +334,10 @@
- void BecomeRoot () throw (nsErrors::CException, std::bad_alloc);
- nsWireless::IDriver& GetDriver () throw();
- const nsWireless::IDriver& GetDriver () const throw();
-- nsUserData::CProfile* NewProfile () throw();
-- nsUserData::CProfile* NewProfile (const nsWireless::CCell&) throw();
-- bool EditProfile (unsigned) throw();
-+ nsUserData::CProfile* NewProfile (::GtkWindow*) throw();
-+ nsUserData::CProfile* NewProfile
-+ (::GtkWindow*, const nsWireless::CCell&) throw();
-+ bool EditProfile (::GtkWindow*, unsigned) throw();
- void DeleteProfile (unsigned) throw();
- void ApplyProfile (unsigned) throw (nsErrors::CSystemExc);
- nsUserData::CProfile& GetProfile (unsigned) throw();
-@@ -354,7 +357,7 @@
- CRT2570Module (const CRT2570Module&);
- CRT2570Module& operator= (const CRT2570Module&);
-
-- nsUserData::CProfile* EditNewProfile () throw();
-+ nsUserData::CProfile* EditNewProfile (::GtkWindow*) throw();
-
- std::auto_ptr<nsWireless::CRT2570Driver> m_pDriver;
- CProfileEditor m_ProfileEditor;
---- rutilt.orig/include/private/CWE17Module.hxx
-+++ rutilt/include/private/CWE17Module.hxx
-@@ -102,25 +102,27 @@
- inline ::GtkWidget* nsCore::CWE17Module::GetPrivateTab () throw() {return 0;}
-
-
--inline nsUserData::CProfile* nsCore::CWE17Module::NewProfile () throw()
-+inline nsUserData::CProfile* nsCore::CWE17Module::NewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-
- inline nsUserData::CProfile* nsCore::CWE17Module::NewProfile
-- (const nsWireless::CCell& Cell) throw()
-+ (::GtkWindow* pMainWindow, const nsWireless::CCell& Cell) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName, Cell);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-
--inline bool nsCore::CWE17Module::EditProfile (unsigned Pos) throw()
-+inline bool nsCore::CWE17Module::EditProfile
-+ (::GtkWindow* pMainWindow, unsigned Pos) throw()
- {
-- return m_Editor.Edit (m_ProfilesFile [Pos]);
-+ return m_Editor.Edit (pMainWindow, m_ProfilesFile [Pos]);
-
- } // EditProfile()
---- rutilt.orig/include/private/GtkGUI.hxx
-+++ rutilt/include/private/GtkGUI.hxx
-@@ -25,7 +25,7 @@
-
- inline const nsUserData::CProfile* nsGUI::CGtkGUI::EditProfile () throw()
- {
-- if (m_pModule->EditProfile (m_ProfileTab.GetSelectedRow()))
-+ if (m_pModule->EditProfile (m_pWindow, m_ProfileTab.GetSelectedRow()))
- return &m_pModule->GetProfile (m_ProfileTab.GetSelectedRow());
- return 0;
-
-@@ -43,7 +43,7 @@
-
- inline const nsUserData::CProfile* nsGUI::CGtkGUI::NewProfile () throw()
- {
-- return m_pModule->NewProfile();
-+ return m_pModule->NewProfile(m_pWindow);
-
- } // NewProfile()
-
---- rutilt.orig/include/private/RTModules.hxx
-+++ rutilt/include/private/RTModules.hxx
-@@ -103,26 +103,28 @@
- inline ::GtkWidget* nsCore::CRT2400Module::GetPrivateTab () throw() {return 0;}
-
-
--inline nsUserData::CProfile* nsCore::CRT2400Module::NewProfile () throw()
-+inline nsUserData::CProfile* nsCore::CRT2400Module::NewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-
- inline nsUserData::CProfile* nsCore::CRT2400Module::NewProfile
-- (const nsWireless::CCell& Cell) throw()
-+ (::GtkWindow* pMainWindow, const nsWireless::CCell& Cell) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName, Cell);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-
--inline bool nsCore::CRT2400Module::EditProfile (unsigned Pos) throw()
-+inline bool nsCore::CRT2400Module::EditProfile
-+ (::GtkWindow* pMainWindow, unsigned Pos) throw()
- {
-- return m_ProfileEditor.Edit (m_ProfilesFile [Pos]);
-+ return m_ProfileEditor.Edit (pMainWindow, m_ProfilesFile [Pos]);
-
- } // EditProfile()
-
-@@ -176,10 +178,11 @@
- } // GetDriver()
-
-
--inline nsUserData::CProfile* nsCore::CRTAdvancedModule::NewProfile () throw()
-+inline nsUserData::CProfile* nsCore::CRTAdvancedModule::NewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-@@ -200,10 +203,10 @@
-
-
- inline nsUserData::CProfile* nsCore::CRTAdvancedModule::NewProfile
-- (const nsWireless::CCell& Cell) throw()
-+ (::GtkWindow* pMainWindow, const nsWireless::CCell& Cell) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName, Cell);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-@@ -226,9 +229,10 @@
- : CRTAdvancedCLIModule (new nsWireless::CRT73Driver (DeviceName), Path) {}
-
-
--inline bool nsCore::CRTAdvancedModule::EditProfile (unsigned Pos) throw()
-+inline bool nsCore::CRTAdvancedModule::EditProfile
-+ (::GtkWindow* pMainWindow, unsigned Pos) throw()
- {
-- return m_ProfileEditor.Edit (m_ProfilesFile [Pos]);
-+ return m_ProfileEditor.Edit (pMainWindow, m_ProfilesFile [Pos]);
-
- } // EditProfile()
-
-@@ -461,26 +465,28 @@
- } // AdhocModeCallBack()
-
-
--inline nsUserData::CProfile* nsCore::CRT2570Module::NewProfile () throw()
-+inline nsUserData::CProfile* nsCore::CRT2570Module::NewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-
- inline nsUserData::CProfile* nsCore::CRT2570Module::NewProfile
-- (const nsWireless::CCell& Cell) throw()
-+ (::GtkWindow* pMainWindow, const nsWireless::CCell& Cell) throw()
- {
- m_ProfilesFile.NewProfile (NewProfileDefaultName, Cell);
-- return EditNewProfile();
-+ return EditNewProfile(pMainWindow);
-
- } // NewProfile()
-
-
--inline bool nsCore::CRT2570Module::EditProfile (unsigned Pos) throw()
-+inline bool nsCore::CRT2570Module::EditProfile
-+ (::GtkWindow* pMainWindow, unsigned Pos) throw()
- {
-- return m_ProfileEditor.Edit (m_ProfilesFile [Pos]);
-+ return m_ProfileEditor.Edit (pMainWindow, m_ProfilesFile [Pos]);
-
- } // EditProfile()
-
---- rutilt.orig/lib/src/CWE17Module.cxx
-+++ rutilt/lib/src/CWE17Module.cxx
-@@ -114,9 +114,10 @@
- } // CWE17Module()
-
-
--nsUserData::CProfile* nsCore::CWE17Module::EditNewProfile () throw()
-+nsUserData::CProfile* nsCore::CWE17Module::EditNewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
-- if (!m_Editor.Edit (m_ProfilesFile.back()))
-+ if (!m_Editor.Edit (pMainWindow, m_ProfilesFile.back()))
- {
- m_ProfilesFile.DeleteLastProfile();
- return 0;
---- rutilt.orig/lib/src/PrefsPage.cxx
-+++ rutilt/lib/src/PrefsPage.cxx
-@@ -126,10 +126,13 @@
- } // BuildUI()
-
-
--void nsGUI::CPrefsPage::AboutButtonClicked (::GtkButton*, CPrefsPage*) throw()
-+void nsGUI::CPrefsPage::AboutButtonClicked (::GtkButton*, CPrefsPage* This)
-+ throw()
- {
- ::GtkAboutDialog* const m_pAboutDialog (GTK_ABOUT_DIALOG
- (::gtk_about_dialog_new()));
-+ ::gtk_window_set_transient_for (GTK_WINDOW (m_pAboutDialog),
-+ GTK_WINDOW (::gtk_widget_get_toplevel (GTK_WIDGET (This->m_pTable))));
- ::gtk_about_dialog_set_name (m_pAboutDialog, "RutilT");
- ::gtk_about_dialog_set_version (m_pAboutDialog, "v0.15");
- ::gtk_about_dialog_set_copyright (m_pAboutDialog,
---- rutilt.orig/lib/src/ProfileEditor.cxx
-+++ rutilt/lib/src/ProfileEditor.cxx
-@@ -28,7 +28,8 @@
- nsCore::CProfileEditor::~CProfileEditor () throw() {}
-
-
--bool nsCore::CProfileEditor::Edit (nsUserData::CProfile& Profile) throw()
-+bool nsCore::CProfileEditor::Edit (::GtkWindow* pMainWindow,
-+ nsUserData::CProfile& Profile) throw()
- {
- m_pDialog->SetConfigName (Profile.GetName());
- m_pDialog->SetSSID (Profile.GetSSID());
-@@ -42,7 +43,7 @@
- m_pDialog->SetIPSetting (Profile.GetIPSettings().GetSetting());
-
- bool IsModified (false);
-- while (m_pDialog->Run())
-+ while (m_pDialog->Run (pMainWindow))
- {
- const std::string Name (m_pDialog->GetConfigName());
- const std::string SSID (m_pDialog->GetSSID());
---- rutilt.orig/lib/src/RTModules.cxx
-+++ rutilt/lib/src/RTModules.cxx
-@@ -244,9 +244,10 @@
- } // ApplyProfile()
-
-
--nsUserData::CProfile* nsCore::CRT2400Module::EditNewProfile () throw()
-+nsUserData::CProfile* nsCore::CRT2400Module::EditNewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
-- if (!m_ProfileEditor.Edit (m_ProfilesFile.back()))
-+ if (!m_ProfileEditor.Edit (pMainWindow, m_ProfilesFile.back()))
- {
- m_ProfilesFile.DeleteLastProfile();
- return 0;
-@@ -350,9 +351,10 @@
- } // CreateCheckButton()
-
-
--nsUserData::CProfile* nsCore::CRTAdvancedModule::EditNewProfile () throw()
-+nsUserData::CProfile* nsCore::CRTAdvancedModule::EditNewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
-- if (!m_ProfileEditor.Edit (m_ProfilesFile.back()))
-+ if (!m_ProfileEditor.Edit (pMainWindow, m_ProfilesFile.back()))
- {
- m_ProfilesFile.DeleteLastProfile();
- return 0;
-@@ -537,9 +539,10 @@
- } // ApplyProfile()
-
-
--nsUserData::CProfile* nsCore::CRT2570Module::EditNewProfile () throw()
-+nsUserData::CProfile* nsCore::CRT2570Module::EditNewProfile
-+ (::GtkWindow* pMainWindow) throw()
- {
-- if (!m_ProfileEditor.Edit (m_ProfilesFile.back()))
-+ if (!m_ProfileEditor.Edit (pMainWindow, m_ProfilesFile.back()))
- {
- m_ProfilesFile.DeleteLastProfile();
- return 0;
---- rutilt.orig/include/WWidgets.h
-+++ rutilt/include/WWidgets.h
-@@ -188,7 +188,7 @@
- throw (std::bad_alloc);
- virtual ~CConfigDialog () throw();
-
-- bool Run () throw();
-+ bool Run (::GtkWindow*) throw();
- void Hide () throw();
-
- std::string GetConfigName () const throw();
---- rutilt.orig/include/private/WWidgets.hxx
-+++ rutilt/include/private/WWidgets.hxx
-@@ -320,8 +320,10 @@
- } // SetDefaultKey()
-
-
--inline bool nsGUI::CConfigDialog::Run () throw()
-+inline bool nsGUI::CConfigDialog::Run (::GtkWindow* pMainWindow) throw()
- {
-+ if (pMainWindow)
-+ ::gtk_window_set_transient_for (GTK_WINDOW (m_pDialog), pMainWindow);
- ::gtk_widget_show_all (m_pDialog->vbox);
- return ::gtk_dialog_run (m_pDialog) == GTK_RESPONSE_OK;
-
Modified: unstable/rutilt/debian/patches/015_use_su-to-root.diff
===================================================================
--- unstable/rutilt/debian/patches/015_use_su-to-root.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/015_use_su-to-root.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,6 +1,6 @@
--- rutilt.orig/configure.sh
+++ rutilt/configure.sh
-@@ -294,12 +294,7 @@
+@@ -330,12 +330,7 @@
# within this script too to apply different policy for each user.
# This script is not executed with root privileges.
#
Deleted: unstable/rutilt/debian/patches/016_fix_about_comment.diff
===================================================================
--- unstable/rutilt/debian/patches/016_fix_about_comment.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/016_fix_about_comment.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,11 +0,0 @@
---- rutilt-0.15~/lib/src/PrefsPage.cxx
-+++ rutilt-0.15/lib/src/PrefsPage.cxx
-@@ -135,7 +135,7 @@
- ::gtk_about_dialog_set_copyright (m_pAboutDialog,
- "Copyright © 2005-2007 Romain BONDUE");
- ::gtk_about_dialog_set_comments (m_pAboutDialog, "Wireless devices"
-- " configuration tool, with extra support for Ralink devices.");
-+ " configuration tool\n with extra support for Ralink devices.");
- ::gtk_about_dialog_set_license (m_pAboutDialog,
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
Deleted: unstable/rutilt/debian/patches/017_change_version.diff
===================================================================
--- unstable/rutilt/debian/patches/017_change_version.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/017_change_version.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,22 +0,0 @@
---- rutilt.orig/lib/src/PrefsPage.cxx
-+++ rutilt/lib/src/PrefsPage.cxx
-@@ -134,7 +134,7 @@
- ::gtk_window_set_transient_for (GTK_WINDOW (m_pAboutDialog),
- GTK_WINDOW (::gtk_widget_get_toplevel (GTK_WIDGET (This->m_pTable))));
- ::gtk_about_dialog_set_name (m_pAboutDialog, "RutilT");
-- ::gtk_about_dialog_set_version (m_pAboutDialog, "v0.15");
-+ ::gtk_about_dialog_set_version (m_pAboutDialog, "v" VERSION);
- ::gtk_about_dialog_set_copyright (m_pAboutDialog,
- "Copyright © 2005-2007 Romain BONDUE");
- ::gtk_about_dialog_set_comments (m_pAboutDialog, "Wireless devices"
---- rutilt.orig/lib/src/RutilT.cxx
-+++ rutilt/lib/src/RutilT.cxx
-@@ -118,7 +118,7 @@
- "All Gtk+ specific options are also supported, see the Gtk+ documentation."
- << std::endl;
- else if (Opt.Version())
-- std::cout << "RutilT v0.15\nCopyright (C) 2005-2007 Romain BONDUE\n"
-+ std::cout << "RutilT v" VERSION "\nCopyright (C) 2005-2007 Romain BONDUE\n"
- "This is free software. You may redistribute copies of it under the terms of\n"
- "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
- "There is NO WARRANTY, to the extent permitted by law.\n\n"
Deleted: unstable/rutilt/debian/patches/018_up_and_down.diff
===================================================================
--- unstable/rutilt/debian/patches/018_up_and_down.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/018_up_and_down.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,42 +0,0 @@
---- rutilt.orig/lib/src/WE17Driver.cxx
-+++ rutilt/lib/src/WE17Driver.cxx
-@@ -112,7 +112,8 @@
- std::cerr << "CWE17Driver::CWE17Driver() Can't get interface"
- " information : " << Exc.GetCode() << std::endl;
- #endif // NDEBUG
-- if (Exc.GetCode() != EOPNOTSUPP) throw;
-+ if (Exc.GetCode() != EOPNOTSUPP && Exc.GetCode() != ENETDOWN)
-+ throw;
- }
- if (m_SupportedFreqVec.empty())
- {
---- rutilt.orig/lib/src/GtkGUI.cxx
-+++ rutilt/lib/src/GtkGUI.cxx
-@@ -697,6 +697,7 @@
- if (BecomeRoot())
- {
- m_CellVec.clear();
-+ m_pIface->Up();
- m_pModule->GetDriver().Scan();
- m_SiteSurveyTab.ScanningStarted();
- m_TimeRemaining = 15000; // The driver has 15 seconds.
-@@ -751,6 +752,8 @@
- #endif // NDEBUG
- if (Exc.GetCode() == EINTR || Exc.GetCode() == EAGAIN)
- return true; // We go for another SiteSurveyTimerPeriod.
-+ if (Exc.GetCode() == ENETDOWN)
-+ return false;
- This->ProcessError (Exc);
- }
- This->m_SiteSurveyTab.ScanningStopped();
---- rutilt.orig/lib/src/NetTools.cxx
-+++ rutilt/lib/src/NetTools.cxx
-@@ -190,7 +190,7 @@
- {
- ::ifreq Req;
- GetInterfaceFlags (Req, m_IfName);
-- nsSystem::Ioctl (SIOCSIFFLAGS, &Req, "Can't bring interface down.");
- Req.ifr_flags &= ~IFF_UP;
-+ nsSystem::Ioctl (SIOCSIFFLAGS, &Req, "Can't bring interface down.");
-
- } // Down()
Deleted: unstable/rutilt/debian/patches/019_fix_ap_address.diff
===================================================================
--- unstable/rutilt/debian/patches/019_fix_ap_address.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/019_fix_ap_address.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,21 +0,0 @@
---- rutilt.orig/lib/src/WE17Driver.cxx
-+++ rutilt/lib/src/WE17Driver.cxx
-@@ -29,6 +29,8 @@
- #include <iostream>
- #endif // NDEBUG
-
-+#include <net/if_arp.h>
-+
- #include "WE17Driver.h"
- #include "ErrorsCode.h"
-
-@@ -405,7 +407,8 @@
- #ifndef NDEBUG
- std::cerr << "CWE17Driver::SetAPMacAddr() " << Addr.GetStr() << std::endl;
- #endif // NDEBUG
-- strncpy (m_Req.u.ap_addr.sa_data, Addr.Get(), CMacAddress::Size);
-+ m_Req.u.ap_addr.sa_family = ARPHRD_ETHER;
-+ memcpy (m_Req.u.ap_addr.sa_data, Addr.Get(), CMacAddress::Size);
- Ioctl (SIOCSIWAP, std::string ("Can't set access point Mac address : ") +
- Addr.GetStr());
-
Deleted: unstable/rutilt/debian/patches/020_fix_refresh_rate_crash.diff
===================================================================
--- unstable/rutilt/debian/patches/020_fix_refresh_rate_crash.diff 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/020_fix_refresh_rate_crash.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,12 +0,0 @@
---- rutilt.orig/lib/src/GtkGUI.cxx
-+++ rutilt/lib/src/GtkGUI.cxx
-@@ -1359,7 +1359,9 @@
- << Exc.GetCode() << std::endl;
- #endif // NDEBUG
- }
-+ m_IsIgnored = true;
- m_PrefsPage.SetRates (RatesVec);
-+ m_IsIgnored = false;
- if (!RatesVec.empty())
- {
- unsigned Index (0);
Added: unstable/rutilt/debian/patches/021_fix_configure_arg_parsing.diff
===================================================================
--- unstable/rutilt/debian/patches/021_fix_configure_arg_parsing.diff (rev 0)
+++ unstable/rutilt/debian/patches/021_fix_configure_arg_parsing.diff 2007-12-02 19:25:47 UTC (rev 110)
@@ -0,0 +1,21 @@
+--- rutilt.orig/configure.sh
++++ rutilt/configure.sh
+@@ -65,10 +65,14 @@
+ #
+ #
+ # Parse options :
+-for arg_iter in $@; do
+- arg=`echo $arg_iter | cut -f1 -d=`
+- arg_value=`echo $arg_iter | cut -f2 -d=`
+- case $arg in
++for arg_iter in "$@"; do
++ arg="${arg_iter%%=*}"
++ if [ "x$arg" != "x$arg_iter" ]; then
++ arg_value="${arg_iter#*=}"
++ else
++ arg_value=''
++ fi
++ case "$arg" in
+ --help)
+ echo "This script generates RutilT's configuration and build files. It also
+ checks if all dependencies are fulfilled.
Modified: unstable/rutilt/debian/patches/series
===================================================================
--- unstable/rutilt/debian/patches/series 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/patches/series 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,19 +1,2 @@
-004_fix_ctype_usage.diff
-005_fix_extraction_checks.diff
-006_fix_temporary_c_str.diff
-007_fix_buffer_lengths.diff
-008_fix_row_toggled.diff
-010_fix_cflags.diff
-011_fix_trayicon_toggle.diff
-012_fix_set_ip.diff
-016_fix_about_comment.diff
-001_fix_desktop.diff
-002_fix_install.diff
-003_fix_ELF_location.diff
-013_fix_install_failure.diff
-019_fix_ap_address.diff
-020_fix_refresh_rate_crash.diff
-014_make_dialogs_transient.diff
+021_fix_configure_arg_parsing.diff
015_use_su-to-root.diff
-017_change_version.diff
-018_up_and_down.diff
Modified: unstable/rutilt/debian/rules
===================================================================
--- unstable/rutilt/debian/rules 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/rules 2007-12-02 19:25:47 UTC (rev 110)
@@ -5,19 +5,23 @@
include /usr/share/quilt/quilt.make
-CONFIGURE_OPTIONS := --launcher=external --prefix=/usr --kernel_sources=/usr
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CONFIGURE_OPTIONS += --debug
+CFLAGS := -pipe -Wall
+ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -DNDEBUG
+else
+ CFLAGS += -g
endif
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O3
+endif
+VERSION := $(shell dpkg-parsechangelog | sed 's/^Version: //; t; d')
+CONFIGURE_OPTIONS := --launcher=external --prefix=/usr --kernel_sources=/usr \
+ --cflags="$(CFLAGS)" --version="$(VERSION)"
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
dh_testdir
./configure.sh $(CONFIGURE_OPTIONS)
- VERSION="$$(dpkg-parsechangelog | sed 's/^Version: //; t; d')" && \
- [ -n "$$VERSION" ] && \
- echo "OPTIONS += -DVERSION=\"\\\"$$VERSION\\\"\"" >>Makefile_cst
touch configure-stamp
@@ -58,9 +62,9 @@
dh_testroot
dh_installchangelogs
dh_installdocs
- dh_installman
dh_installmenu
dh_install
+ dh_icons
dh_strip
dh_compress
dh_fixperms
Deleted: unstable/rutilt/debian/rutilt_helper.1
===================================================================
--- unstable/rutilt/debian/rutilt_helper.1 2007-12-01 20:09:40 UTC (rev 109)
+++ unstable/rutilt/debian/rutilt_helper.1 2007-12-02 19:25:47 UTC (rev 110)
@@ -1,22 +0,0 @@
-.TH RUTILT_HELPER "1" "August 2007" "RutilT v0.15" "User Commands"
-.SH NAME
-RutilT Helper \- execute RutilT internal commands as root.
-.SH SYNOPSIS
-.B rutilt_helper
-.SH DESCRIPTION
-rutilt_helper is an helper program used by RutilT to obtain root privileges.
-.B It is not designed to be used on its own.
-.SH AUTHOR
-Written by Romain BONDUE. See the AUTHORS file or the about dialog for all
-contributors.
-.SH "REPORTING BUGS"
-Report bugs to <spy84464 at hotmail.com>, on the rt2x00 mailing lists or on the
-forum <http://rt2x00.serialmonkey.com>.
-.SH COPYRIGHT
-Copyright \(co 2005-2007 Romain BONDUE
-.br
-This is free software. You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-.SH "SEE ALSO"
-\fBrutilt\fR(1)
More information about the Pkg-ralink-commits
mailing list