diff -u rt2500-1.1.0-b4/debian/control rt2500-1.1.0-b4/debian/control --- rt2500-1.1.0-b4/debian/control +++ rt2500-1.1.0-b4/debian/control @@ -1,8 +1,9 @@ Source: rt2500 Section: net Priority: extra -Build-Depends: debhelper (>= 4.0), libqt3-mt-dev (>= 3.3.4-4), bzip2, quilt -Maintainer: Debian Ralink packages maintainers +Build-Depends: debhelper (>= 4.0), libqt3-mt-dev (>= 3.3.4-4), bzip2, quilt, libiw-dev +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Ralink packages maintainers Uploaders: Aurelien Jarno , Ben Hutchings , Romain Beauxis Standards-Version: 3.7.2 diff -u rt2500-1.1.0-b4/debian/rules rt2500-1.1.0-b4/debian/rules --- rt2500-1.1.0-b4/debian/rules +++ rt2500-1.1.0-b4/debian/rules @@ -60,6 +60,7 @@ install -m 755 -o root -g root $(CURDIR)/Utilitys/RaConfig2500 $(CURDIR)/debian/rt2500/usr/bin install -m 644 -o root -g root $(CURDIR)/Utilitys/ico/RaConfig2500.xpm $(CURDIR)/debian/rt2500/usr/share/pixmaps + install -m 644 -o root -g root $(CURDIR)/debian/rt2500.desktop $(CURDIR)/debian/rt2500/usr/share/applications install -m 644 -o root -g root $(CURDIR)/Module/RT2500STA.dat $(CURDIR)/debian/rt2500/etc/Wireless/RT2500STA/RT2500STA.dat touch install-arch-stamp diff -u rt2500-1.1.0-b4/debian/changelog rt2500-1.1.0-b4/debian/changelog --- rt2500-1.1.0-b4/debian/changelog +++ rt2500-1.1.0-b4/debian/changelog @@ -1,3 +1,12 @@ +rt2500 (1:1.1.0-b4-3ubuntu1) gutsy; urgency=low + + * Add .desktop file (LP: #113054) + * Change Maintainer field + * Fix failed compilation (LP: #120301) Thanks to Andrew Price + * Fix rt2500 module compilation + + -- Cesare Tirabassi Mon, 7 May 2007 14:19:35 +0200 + rt2500 (1:1.1.0-b4-3) unstable; urgency=low * Fixed 2.6.19.patch (Closes: #399051) diff -u rt2500-1.1.0-b4/debian/patches/series rt2500-1.1.0-b4/debian/patches/series --- rt2500-1.1.0-b4/debian/patches/series +++ rt2500-1.1.0-b4/debian/patches/series @@ -5,0 +6,2 @@ +iwlib.diff +rt2500_module.diff diff -u rt2500-1.1.0-b4/debian/patches/2.6.20.diff rt2500-1.1.0-b4/debian/patches/2.6.20.diff --- rt2500-1.1.0-b4/debian/patches/2.6.20.diff +++ rt2500-1.1.0-b4/debian/patches/2.6.20.diff @@ -1,5 +1,7 @@ ---- Module/mlme.c 2006/11/28 08:00:02 1.34 -+++ Module/mlme.c 2007/01/20 21:12:59 1.35 +Index: Module/mlme.c +=================================================================== +--- Module/mlme.c.orig 2007-07-04 11:15:00.000000000 +0200 ++++ Module/mlme.c 2007-07-04 11:21:20.000000000 +0200 @@ -357,9 +357,15 @@ schedule_work(&pAd->mlme_work); } @@ -17,8 +19,10 @@ #endif MLME_QUEUE_ELEM *Elem = NULL; unsigned long flags; ---- Module/rtmp_init.c 2006/06/16 07:07:25 1.30 -+++ Module/rtmp_init.c 2007/01/20 21:12:59 1.31 +Index: Module/rtmp_init.c +=================================================================== +--- Module/rtmp_init.c.orig 2007-07-04 11:15:00.000000000 +0200 ++++ Module/rtmp_init.c 2007-07-04 11:21:20.000000000 +0200 @@ -916,7 +916,11 @@ DBGPRINT(RT_DEBUG_TRACE, "<-- NICInitAsicFromEEPROM\n"); } @@ -31,7 +35,7 @@ void NICInitializeAdapter(IN PRTMP_ADAPTER pAdapter) { -@@ -974,7 +980,9 @@ +@@ -974,7 +978,9 @@ // Initialze ASIC for TX & Rx operation NICInitializeAsic(pAdapter); diff -u rt2500-1.1.0-b4/debian/rt2500.dirs rt2500-1.1.0-b4/debian/rt2500.dirs --- rt2500-1.1.0-b4/debian/rt2500.dirs +++ rt2500-1.1.0-b4/debian/rt2500.dirs @@ -3,0 +4 @@ +usr/share/applications only in patch2: unchanged: --- rt2500-1.1.0-b4.orig/debian/rt2500.desktop +++ rt2500-1.1.0-b4/debian/rt2500.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Name=RT2500 +Comment=RT2500 configuration utility +TryExec=RaConfig2500 +Exec=gksu /usr/bin/RaConfig2500 +Icon=RaConfig2500.xpm +Categories=System only in patch2: unchanged: --- rt2500-1.1.0-b4.orig/debian/patches/iwlib.diff +++ rt2500-1.1.0-b4/debian/patches/iwlib.diff @@ -0,0 +1,52 @@ +Index: rt2500-1.1.0-b4/Utilitys/addprofiledlg.cpp +=================================================================== +--- rt2500-1.1.0-b4.orig/Utilitys/addprofiledlg.cpp 2007-07-04 14:36:45.000000000 +0000 ++++ rt2500-1.1.0-b4/Utilitys/addprofiledlg.cpp 2007-07-04 14:36:45.000000000 +0000 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "rt_tool.h" +Index: rt2500-1.1.0-b4/Utilitys/raconfig.cpp +=================================================================== +--- rt2500-1.1.0-b4.orig/Utilitys/raconfig.cpp 2007-07-04 14:36:45.000000000 +0000 ++++ rt2500-1.1.0-b4/Utilitys/raconfig.cpp 2007-07-04 14:36:45.000000000 +0000 +@@ -7,7 +7,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include /* for mode definitions */ +Index: rt2500-1.1.0-b4/Utilitys/rt_tool.cpp +=================================================================== +--- rt2500-1.1.0-b4.orig/Utilitys/rt_tool.cpp 2007-07-04 09:32:28.000000000 +0000 ++++ rt2500-1.1.0-b4/Utilitys/rt_tool.cpp 2007-07-04 14:36:45.000000000 +0000 +@@ -3,7 +3,7 @@ + #include + #include + #include +-#include ++#include + + #include "rt_tool.h" + #include "sha1.h" +Index: rt2500-1.1.0-b4/Utilitys/rt_tool.h +=================================================================== +--- rt2500-1.1.0-b4.orig/Utilitys/rt_tool.h 2007-07-04 09:32:28.000000000 +0000 ++++ rt2500-1.1.0-b4/Utilitys/rt_tool.h 2007-07-04 14:36:45.000000000 +0000 +@@ -3,7 +3,7 @@ + + #include + #include +-#include ++#include + + #define CONFIGURATION_UI_VERSION "1.2.1.0" + #define CONFIGURATION_UI_DATE "2004-08-12" only in patch2: unchanged: --- rt2500-1.1.0-b4.orig/debian/patches/rt2500_module.diff +++ rt2500-1.1.0-b4/debian/patches/rt2500_module.diff @@ -0,0 +1,26 @@ +Index: rt2500-1.1.0-b4/Module/rtmp_data.c +=================================================================== +--- rt2500-1.1.0-b4.orig/Module/rtmp_data.c 2007-07-04 14:46:50.000000000 +0000 ++++ rt2500-1.1.0-b4/Module/rtmp_data.c 2007-07-04 14:48:50.000000000 +0000 +@@ -1196,7 +1196,7 @@ + + skb->dev = pAdapter->net_dev; + memcpy(skb_put(skb, pRxD->DataByteCnt), pData, pRxD->DataByteCnt); +- skb->mac.raw = skb->data; ++ skb->mac_header = skb->data; + skb->pkt_type = PACKET_OTHERHOST; + skb->protocol = htons(ETH_P_802_2); + skb->ip_summed = CHECKSUM_NONE; +Index: rt2500-1.1.0-b4/Module/rtmp_main.c +=================================================================== +--- rt2500-1.1.0-b4.orig/Module/rtmp_main.c 2007-07-04 14:47:09.000000000 +0000 ++++ rt2500-1.1.0-b4/Module/rtmp_main.c 2007-07-04 14:48:04.000000000 +0000 +@@ -1012,7 +1012,7 @@ + // + static INT __init rt2500_init_module(VOID) + { +- return pci_module_init(&rt2500_driver); ++ return pci_register_driver(&rt2500_driver); + } + + // only in patch2: unchanged: --- rt2500-1.1.0-b4.orig/.pc/.version +++ rt2500-1.1.0-b4/.pc/.version @@ -0,0 +1 @@ +2 only in patch2: unchanged: --- rt2500-1.1.0-b4.orig/patches/series +++ rt2500-1.1.0-b4/patches/series @@ -0,0 +1 @@ +iwlist.diff only in patch2: unchanged: --- rt2500-1.1.0-b4.orig/patches/iwlist.diff +++ rt2500-1.1.0-b4/patches/iwlist.diff @@ -0,0 +1,13 @@ +Index: rt2500-1.1.0-b4/Utilitys/raconfig.cpp +=================================================================== +--- rt2500-1.1.0-b4.orig/Utilitys/raconfig.cpp 2007-07-04 10:59:53.000000000 +0200 ++++ rt2500-1.1.0-b4/Utilitys/raconfig.cpp 2007-07-04 11:00:31.000000000 +0200 +@@ -7,7 +7,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include /* for mode definitions */