Merge lp:~ubuntu-branches/ubuntu/precise/b43-fwcutter/precise-201405131653 into lp:ubuntu/precise/b43-fwcutter

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/b43-fwcutter reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/b43-fwcutter/precise-201405131653. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

14. By Fabrizio Regalli on 2011-10-09

* Fixed unversioned-copyright-format-url lintian message
* Fixed firmware-b43-lpphy-installer posinst script (Closes: #644816)

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-26 17:04:23 +0000
+++ debian/changelog	2014-05-13 17:25:16 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 b43-fwcutter (1:015-9) unstable; urgency=low
 
   * Install firmware-b43legacy unconditionally when installed in chroot 
@@ -62,6 +63,23 @@
 
  -- Fabrizio Regalli <[e-mail]>  Mon, 26 Sep 2011 12:06:56 +0200
 
+=======
+b43-fwcutter (1:015-3) unstable; urgency=low
+
+  * Fixed unversioned-copyright-format-url lintian message
+  * Fixed firmware-b43-lpphy-installer posinst script (Closes: #644816)
+
+ -- Fabrizio Regalli <[e-mail]>  Sun, 09 Oct 2011 14:48:19 +0200
+
+b43-fwcutter (1:015-2) unstable; urgency=low
+
+  * Fixed lintian comma-separated-files-in-dep5-copyright message
+  * Added check for chroot environment (Closes: #586605)
+  * Added DM-Upload-Allowed field.
+
+ -- Fabrizio Regalli <[e-mail]>  Mon, 26 Sep 2011 12:06:56 +0200
+
+>>>>>>> MERGE-SOURCE
 b43-fwcutter (1:015-1) unstable; urgency=low
 
   * New upstream version

=== modified file 'debian/firmware-b43-installer.postinst'
--- debian/firmware-b43-installer.postinst	2011-11-26 17:04:23 +0000
+++ debian/firmware-b43-installer.postinst	2014-05-13 17:25:16 +0000
@@ -2,8 +2,11 @@
 
 set -e
 
+<<<<<<< TREE
 tmp=`mktemp -q -d`
 
+=======
+>>>>>>> MERGE-SOURCE
 latest_firmware ()
 {
 cd $tmp
@@ -40,6 +43,7 @@
 rm -rf $tmp
 }
 
+<<<<<<< TREE
 # check environment
 if [ "$(stat -c %d/%i /)" != "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ];
  then
@@ -62,6 +66,30 @@
 fi
 
 
+=======
+# check environment
+if [ "$(stat -c %d/%i /)" != "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ];
+ then
+    echo "A chroot environment has been detected."
+    echo "Remember this firmware needs kernel >= 2.6.25."
+    latest_firmware
+    exit 0
+ else 
+    echo "No chroot environment found. Starting normal installation"
+fi
+     
+     
+
+
+# check kernel version
+if dpkg --compare-versions 2.6.25 gt `uname -r | cut -d- -f1`; then
+	echo "Kernel too old. This firmware needs >= 2.6.25!."
+	echo "Aborting!"
+	exit 0
+fi
+
+
+>>>>>>> MERGE-SOURCE
 # Fix for BCM4306/3 [14e4:4320] (rev 03)
 chip=`lspci -n | grep -o "14e4:4320 (rev 03)"` || true
 if [ "$chip" ] ; then
@@ -124,3 +152,4 @@
 fi
 
 #DEBHELPER#
+

=== modified file 'debian/firmware-b43-lpphy-installer.postinst'
--- debian/firmware-b43-lpphy-installer.postinst	2011-11-26 17:04:23 +0000
+++ debian/firmware-b43-lpphy-installer.postinst	2014-05-13 17:25:16 +0000
@@ -2,10 +2,15 @@
 
 set -e
 
+<<<<<<< TREE
 tmp=`mktemp -q -d`
 
 latest_firmware ()
 {
+=======
+latest_firmware ()
+{
+>>>>>>> MERGE-SOURCE
 cd $tmp
 export FIRMWARE_INSTALL_DIR="/lib/firmware"
 
@@ -37,6 +42,7 @@
 tar xvjf broadcom-wl-4.178.10.4.tar.bz2
 cd broadcom-wl-4.178.10.4/linux
 b43-fwcutter -w "$FIRMWARE_INSTALL_DIR" wl_apsta.o
+<<<<<<< TREE
 rm -rf $tmp
 }
 
@@ -82,5 +88,55 @@
 fi
 
 latest_firmware
+=======
+cd $tmp
+rm -rf broadcom-wl-4.178.10.4.tar.bz2 broadcom-wl-4.178.10.4
+}
+
+
+# check environment
+if [ "$(stat -c %d/%i /)" != "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ];
+ then
+    echo "A chroot environment has been detected."
+    echo "Remember this firmware needs kernel >= 2.6.25."
+    latest_firmware
+    exit 0
+ else 
+    echo "No chroot environment found. Starting normal installation"
+fi
+
+
+# check kernel version
+if dpkg --compare-versions 2.6.32 gt `uname -r | cut -d- -f1`; then
+	echo "Kernel too old. This firmware needs >= 2.6.32!."
+	echo "Aborting!"
+	exit 0
+fi
+
+# check chip
+supported=0
+pci=`lspci -n | grep -o "14e4:[1234567890abcdef]\+"` || true
+
+if [ -n "$pci" ]; then
+	for device in $pci; do
+		device_id=`echo $device | cut -d: -f2`
+		if [ $device_id = 4315 ]; then
+			supported=1
+			break
+		fi
+	done
+fi
+
+if [ "$supported" = 0 ]; then
+	echo "No supported card found."
+	echo "Use proper b43 or b43legacy firmware."
+	echo "Aborting."
+	exit 0
+fi
+
+latest_firmware
+
+tmp=`mktemp -q -d`
+>>>>>>> MERGE-SOURCE
 
 #DEBHELPER#

=== modified file 'debian/firmware-b43legacy-installer.postinst'
--- debian/firmware-b43legacy-installer.postinst	2011-11-26 17:04:23 +0000
+++ debian/firmware-b43legacy-installer.postinst	2014-05-13 17:25:16 +0000
@@ -2,10 +2,15 @@
 
 set -e
 
+<<<<<<< TREE
 tmp=`mktemp -q -d`
 
 latest_firmware ()
 {
+=======
+latest_firmware ()
+{
+>>>>>>> MERGE-SOURCE
 cd $tmp
 export FIRMWARE_INSTALL_DIR="/lib/firmware"
 
@@ -35,6 +40,7 @@
         fi
 fi
 b43-fwcutter -w "$FIRMWARE_INSTALL_DIR" wl_apsta-3.130.20.0.o
+<<<<<<< TREE
 rm -rf $tmp
 }
 
@@ -71,5 +77,33 @@
 fi
 
 latest_firmware
+=======
+rm wl_apsta-3.130.20.0.o
+}
+
+
+# check chip
+supported=0
+pci=`lspci -n | grep -o "14e4:[1234567890abcdef]\+"` || true
+
+if [ -n "$pci" ]; then
+        for device in $pci; do
+                device_id=`echo $device | cut -d: -f2`
+                if [ $device_id = 4301 ] || [ $device_id = 4306 ] || [ $device_id = 4320 ] || [ $device_id = 4324] ; then
+                        supported=1
+                        break
+                fi
+        done
+fi
+
+if [ "$supported" = 0 ]; then
+        echo "No supported card found."
+        echo "Use b43 firmware. This is just for the b43legacy driver."
+        echo "Aborting."
+        exit 0
+fi
+
+tmp=`mktemp -q -d`
+>>>>>>> MERGE-SOURCE
 
 #DEBHELPER#