r74 - / unstable/rt73/trunk unstable/rt73/trunk/debian

dexter at alioth.debian.org dexter at alioth.debian.org
Fri Nov 2 15:35:19 UTC 2007 

Author: dexter
Date: 2007-11-02 15:35:18 +0000 (Fri, 02 Nov 2007)
New Revision: 74

Added:
   unstable/rt73/trunk/rt73_1.0.3.6-cvs20071030.orig.tar.gz
Removed:
   unstable/rt73/trunk/rt73_1.0.3.6-cvs20071013.orig.tar.gz
Modified:
   /
   unstable/rt73/trunk/debian/changelog
   unstable/rt73/trunk/debian/modules.packages
   unstable/rt73/trunk/debian/packages
Log:
* New CVS snapshot.
* Maintaining by pkg-ralink Alioth project.
* Recommends: rt73-common
* The /lib/firmware/rt73.bin symlink is created with postinst script, so the
package won't conflict with rt73-firmware package.


Property changes on: 
___________________________________________________________________
Name: svk:merge
   - a768dc91-4809-499b-a2f1-8fca22b1f4b0:/local:74
   + a768dc91-4809-499b-a2f1-8fca22b1f4b0:/local:76

Modified: unstable/rt73/trunk/debian/changelog
===================================================================
--- unstable/rt73/trunk/debian/changelog	2007-11-02 15:01:25 UTC (rev 73)
+++ unstable/rt73/trunk/debian/changelog	2007-11-02 15:35:18 UTC (rev 74)
@@ -1,3 +1,13 @@
+rt73 (1:1.0.3.6-cvs20071030-1) unstable; urgency=low
+
+  * New CVS snapshot.
+  * Maintaining by pkg-ralink Alioth project.
+  * Recommends: rt73-common
+  * The /lib/firmware/rt73.bin symlink is created with postinst script, so the
+    package won't conflict with rt73-firmware package.
+
+ -- Piotr Roszatycki <dexter at debian.org>  Fri, 02 Nov 2007 16:02:51 +0100
+
 rt73 (1:1.0.3.6-cvs20071013-1) unstable; urgency=low
 
   * Uploaded to unstable.

Modified: unstable/rt73/trunk/debian/modules.packages
===================================================================
--- unstable/rt73/trunk/debian/modules.packages	2007-11-02 15:01:25 UTC (rev 73)
+++ unstable/rt73/trunk/debian/modules.packages	2007-11-02 15:35:18 UTC (rev 74)
@@ -1,30 +1,18 @@
-# $Id: /svn/trunk/debian/dists/rt73/debian/modules.packages 2435 2007-10-30T12:03:10.654050Z dexter  $
-
-# Uncomment if you need to compile on older system
-# %define with_debian_etch 1
-
-%define yada_version @YADA_VERSION@
-
 %define KSRC %{?$KSRC:%{$KSRC}}%{!?$KSRC:/usr/src/linux}
 %define KVERS %{?$KVERS:%{$KVERS}}%{!?$KVERS:%`sed -n -e '/UTS_RELEASE/s/^[^"]*"\([^"]*\)".*$/\1/p' %{KSRC}/include/linux/version.h 2>/dev/null || echo "UNKNOWN"`}
 %define KDREV %{?$KDREV:%{$KDREV}}%{!?$KDREV:UNKNOWN}
 
-#   KSRC=%{KSRC}
-#   KVERS=%{KVERS}
-#   KDREV=%{KDREV}
-
 Source: rt73-source
 Section: net
 Priority: extra
-Maintainer: Piotr Roszatycki <dexter at debian.org>
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Uploaders: Piotr Roszatycki <dexter at debian.org>
 Standards-Version: 3.7.2
-Upstream-Source: <URL:http://rt2x00.serialmonkey.com/wiki/index.php?title=Downloads>
-%if %{with_debian_etch}
-Home-Page: <URL:http://rt2x00.serialmonkey.com/>
-%else
-Homepage: <URL:http://rt2x00.serialmonkey.com/>
-Vcs-Browser: http://svn.debian.org/wsvn/cvsdebuild/trunk/debian/dists/rt73/
-Vcs-Svn: svn://svn.debian.org/cvsdebuild/trunk/debian/dists/rt73/
+Upstream-Source: http://rt2x00.serialmonkey.com/wiki/index.php?title=Downloads
+%if %`dpkg --compare-versions %{YADA_VERSION} ge 0.54 && echo 1`
+Homepage: http://rt2x00.serialmonkey.com/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt73/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-ralink/unstable/rt73/trunk
 %endif
 Description: RT73(RT2571W) Wireless Lan Linux Driver - kernel module sources
  This is a linux device driver for Ralink RT73 a/b/g WLAN Card.
@@ -39,7 +27,9 @@
  Licensed under the GNU GPL
  Original code supplied under license from RaLink Inc, 2004.
 Build-Depends: module-assistant, bzip2
-Build-Depends: yada (>= %{yada_version})
+%if %`test -x debian/yada || echo 1`
+Build-Depends: yada
+%endif
 Build: sh
  CC=${CC:-gcc}
  make -C /lib/modules/%{KVERS}/build SUBDIRS=$(pwd) modules
@@ -48,7 +38,7 @@
 
 Package: rt73-module-%{KVERS}
 Architecture: any
-Depends: rt73-common
+Recommends: rt73-common
 %if %{KDREV}
 Recommends: linux-image-%{KVERS} (= %{KDREV})
 %else
@@ -71,3 +61,8 @@
      /sbin/depmod -a
  fi
 Contains: unstripped kernel-modules
+
+# Debug:
+#   KSRC=%{KSRC}
+#   KVERS=%{KVERS}
+#   KDREV=%{KDREV}

Modified: unstable/rt73/trunk/debian/packages
===================================================================
--- unstable/rt73/trunk/debian/packages	2007-11-02 15:01:25 UTC (rev 73)
+++ unstable/rt73/trunk/debian/packages	2007-11-02 15:35:18 UTC (rev 74)
@@ -1,29 +1,21 @@
-# $Id: /svn/trunk/debian/dists/rt73/debian/packages 2435 2007-10-30T12:03:10.654050Z dexter  $
-
 # If the debian/rules or debian/control file is missing, rebuild the file:
 #
 #   $ yada rebuild control
 #   $ yada rebuild rules
 
-# Uncomment if you need to compile for etch
-# %define with_debian_etch 1
-
 %define is_yada_bundled %`test -x debian/yada && echo 1`
 
-%define yada_from_etch 0.52
-
 Source: rt73
 Section: contrib/net
 Priority: extra
-Maintainer: Piotr Roszatycki <dexter at debian.org>
+Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers at lists.alioth.debian.org>
+Uploaders: Piotr Roszatycki <dexter at debian.org>
 Standards-Version: 3.7.2
-Upstream-Source: <URL:http://rt2x00.serialmonkey.com/wiki/index.php?title=Downloads>
-%if %{with_debian_etch}
-Home-Page: <URL:http://rt2x00.serialmonkey.com/>
-%else
-Homepage: <URL:http://rt2x00.serialmonkey.com/>
-Vcs-Browser: http://svn.debian.org/wsvn/cvsdebuild/trunk/debian/dists/rt73/
-Vcs-Svn: svn://svn.debian.org/cvsdebuild/trunk/debian/dists/rt73/
+Upstream-Source: http://rt2x00.serialmonkey.com/wiki/index.php?title=Downloads
+%if %`dpkg --compare-versions %{YADA_VERSION} ge 0.54 && echo 1`
+Homepage: http://rt2x00.serialmonkey.com/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ralink/unstable/rt73/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-ralink/unstable/rt73/trunk
 %endif
 Description: RT73(RT2571W) Wireless Lan Linux Driver - kernel module sources
  This is a linux device driver for Ralink RT73 a/b/g WLAN Card.
@@ -38,15 +30,9 @@
  Licensed under the GNU GPL
  Original code supplied under license from RaLink Inc, 2004.
 Build-Depends: bzip2
-%if %{is_yada_bundled}
-# Build-Depends: yada
-%else
-%if %{with_debian_etch}
-Build-Depends: yada (>= %{yada_from_etch})
-%else
+%if %{!?is_yada_bundled:1}
 Build-Depends: yada
 %endif
-%endif
 Build: bash
  rm -rf modules || true
  mkdir -p modules/rt73
@@ -56,13 +42,8 @@
  sed 's/^rt73/rt73-source/' debian/changelog > modules/rt73/debian/changelog
  cp -a debian/modules.packages modules/rt73/debian/packages
 %if %{is_yada_bundled}
- sed -i 's/^\(Build-Depends: yada\)/# \1/' modules/rt73/debian/packages
  cp -a debian/yada modules/rt73/debian
 %endif
- sed -i 's/@YADA_VERSION@/%{YADA_VERSION}/g' modules/rt73/debian/packages
-%if %{with_debian_etch}
- sed -i 's/^# \(%define with_debian_etch 1\)/\1/' modules/rt73/debian/packages
-%endif
  pushd modules/rt73
      %{YADA_COMMAND} rebuild
      debian/rules clean
@@ -79,9 +60,7 @@
 Package: rt73-source
 Architecture: all
 Depends: module-assistant, bzip2
-%if %{with_debian_etch}
-Depends: yada (>= %{yada_from_etch})
-%else
+%if %{!?is_yada_bundled:1}
 Depends: yada
 %endif
 Recommends: rt73-common
@@ -117,6 +96,9 @@
          echo "Please download the firmware with update-rt73-firmware command."
          echo ""
      fi
+     if [ ! -f /lib/firmware/rt73.bin ]; then
+         ln -s /etc/firmware/rt73.bin /lib/firmware/rt73.bin
+     fi
  fi
 Postrm: sh
  if [ "$1" = "purge" ]; then
@@ -126,7 +108,3 @@
      rm -f /etc/firmware/rt73.bin || true
      rmdir --ignore-fail-on-non-empty --parents /etc/firmware || true
  fi
-
-# Debug:
-#   with_debian_etch=%{with_debian_etch}
-#   is_yada_bundled=%{is_yada_bundled}

Deleted: unstable/rt73/trunk/rt73_1.0.3.6-cvs20071013.orig.tar.gz
===================================================================
(Binary files differ)

Added: unstable/rt73/trunk/rt73_1.0.3.6-cvs20071030.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: unstable/rt73/trunk/rt73_1.0.3.6-cvs20071030.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

More information about the Pkg-ralink-commits mailing list