r33 - unstable/rutilt/debian/patches

benh at alioth.debian.org benh at alioth.debian.org
Sun Oct 7 17:57:37 UTC 2007


Author: benh
Date: 2007-10-07 17:57:37 +0000 (Sun, 07 Oct 2007)
New Revision: 33

Added:
   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
Removed:
   unstable/rutilt/debian/patches/10_fix_desktop.diff
   unstable/rutilt/debian/patches/20_fix_install.diff
   unstable/rutilt/debian/patches/30_fix_ELF_location.diff
Modified:
   unstable/rutilt/debian/patches/series
Log:
Renumbered patches to match other packages.


Copied: unstable/rutilt/debian/patches/001_fix_desktop.diff (from rev 26, unstable/rutilt/debian/patches/10_fix_desktop.diff)
===================================================================
--- unstable/rutilt/debian/patches/001_fix_desktop.diff	                        (rev 0)
+++ unstable/rutilt/debian/patches/001_fix_desktop.diff	2007-10-07 17:57:37 UTC (rev 33)
@@ -0,0 +1,26 @@
+--- rutilt-0.15~/configure.sh	2007-06-30 19:28:16.000000000 +0200
++++ rutilt-0.15/configure.sh	2007-09-04 21:55:56.000000000 +0200
+@@ -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
+ #

Copied: unstable/rutilt/debian/patches/002_fix_install.diff (from rev 26, unstable/rutilt/debian/patches/20_fix_install.diff)
===================================================================
--- unstable/rutilt/debian/patches/002_fix_install.diff	                        (rev 0)
+++ unstable/rutilt/debian/patches/002_fix_install.diff	2007-10-07 17:57:37 UTC (rev 33)
@@ -0,0 +1,91 @@
+--- 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
+ #

Copied: unstable/rutilt/debian/patches/003_fix_ELF_location.diff (from rev 26, unstable/rutilt/debian/patches/30_fix_ELF_location.diff)
===================================================================
--- unstable/rutilt/debian/patches/003_fix_ELF_location.diff	                        (rev 0)
+++ unstable/rutilt/debian/patches/003_fix_ELF_location.diff	2007-10-07 17:57:37 UTC (rev 33)
@@ -0,0 +1,11 @@
+--- rutilt-0.15~/configure.sh	2007-06-30 19:28:16.000000000 +0200
++++ rutilt-0.15/configure.sh	2007-09-04 22:59:06.000000000 +0200
+@@ -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/10_fix_desktop.diff
===================================================================
--- unstable/rutilt/debian/patches/10_fix_desktop.diff	2007-10-07 00:05:50 UTC (rev 32)
+++ unstable/rutilt/debian/patches/10_fix_desktop.diff	2007-10-07 17:57:37 UTC (rev 33)
@@ -1,26 +0,0 @@
---- rutilt-0.15~/configure.sh	2007-06-30 19:28:16.000000000 +0200
-+++ rutilt-0.15/configure.sh	2007-09-04 21:55:56.000000000 +0200
-@@ -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/20_fix_install.diff
===================================================================
--- unstable/rutilt/debian/patches/20_fix_install.diff	2007-10-07 00:05:50 UTC (rev 32)
+++ unstable/rutilt/debian/patches/20_fix_install.diff	2007-10-07 17:57:37 UTC (rev 33)
@@ -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/30_fix_ELF_location.diff
===================================================================
--- unstable/rutilt/debian/patches/30_fix_ELF_location.diff	2007-10-07 00:05:50 UTC (rev 32)
+++ unstable/rutilt/debian/patches/30_fix_ELF_location.diff	2007-10-07 17:57:37 UTC (rev 33)
@@ -1,11 +0,0 @@
---- rutilt-0.15~/configure.sh	2007-06-30 19:28:16.000000000 +0200
-+++ rutilt-0.15/configure.sh	2007-09-04 22:59:06.000000000 +0200
-@@ -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

Modified: unstable/rutilt/debian/patches/series
===================================================================
--- unstable/rutilt/debian/patches/series	2007-10-07 00:05:50 UTC (rev 32)
+++ unstable/rutilt/debian/patches/series	2007-10-07 17:57:37 UTC (rev 33)
@@ -1,4 +1,3 @@
-10_fix_desktop.diff
-20_fix_install.diff
-30_fix_ELF_location.diff
-
+001_fix_desktop.diff
+002_fix_install.diff
+003_fix_ELF_location.diff




More information about the Pkg-ralink-commits mailing list