Merge lp:~cr3/checkbox/hwtest into lp:checkbox

[Marc Tardif]

Tested sbuilding the changes which was successful. Also made sure that the hwtest packages were no longer being built.

[Daniel Manrique (roadmr)]

Awesome, let's hope nobody still needs hwtest :)

Merging, thanks!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-12-07 04:34:49 +0000
+++ .bzrignore	2012-02-01 15:07:39 +0000
@@ -10,9 +10,6 @@
 debian/*.debhelper
 debian/files
 debian/*-gtk.postrm
-debian/hwtest
-debian/hwtest-cli
-debian/hwtest-gtk
 debian/*.log
 debian/stamp-patched
 debian/*.substvars

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-31 20:04:09 +0000
+++ debian/changelog	2012-02-01 15:07:39 +0000
@@ -37,6 +37,7 @@
     and context info (LP: #912546)
   * Added support for skipping tests when the depends don't pass
     (LP: #509598)
+  * Removed deprecated hwtest package.
 
   [Daniel Manrique]
   * Update control files under debian/ to eliminate (most) lintian warnings

=== modified file 'debian/control'
--- debian/control	2012-01-31 01:23:23 +0000
+++ debian/control	2012-02-01 15:07:39 +0000
@@ -11,22 +11,16 @@
 Package: checkbox
 Section: python
 Architecture: any
-Replaces: hwtest (<< 0.1-0ubuntu12)
-Provides: hwtest
 Depends: ${misc:Depends}, ${python:Depends}, debconf, python-libxml2, udev
 Recommends: dpkg (>= 1.13), gstreamer0.10-gconf, lsb-release, perl, pm-utils, python-apport, python-apt, python-dateutil, python-gst0.10
 Suggests: checkbox-cli | checkbox-gtk, bonnie++, bootchart, bzr, cvs, ethtool, flex, fwts, git-core, hdparm, lshw, make, nmap, obexd-client, python-pexpect, smartmontools, sox, stress, wodim
-Conflicts: hwtest (<< 0.1-0ubuntu12)
 Description: System testing application 
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
 
 Package: checkbox-cli
 Architecture: all
-Replaces: hwtest-cli (<< 0.1-0ubuntu12)
-Provides: hwtest-cli
 Depends: checkbox (>= ${source:Version}), ${misc:Depends}
-Conflicts: hwtest-cli (<< 0.1-0ubuntu12)
 Description: Command line interface for checkbox 
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
@@ -46,10 +40,7 @@
 Package: checkbox-gtk
 Section: gnome
 Architecture: all
-Replaces: hwtest-gtk (<< 0.1-0ubuntu12)
-Provides: hwtest-gtk
 Depends: checkbox (>= ${source:Version}), gksu, python-gobject (>= 2.28), gir1.2-gtk-3.0, ${misc:Depends}
-Conflicts: hwtest-gtk (<< 0.1-0ubuntu12)
 Description: GTK interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.
@@ -64,25 +55,3 @@
  results can then be sent to Launchpad.
  .
  This package provides a non-interactive interface for SRU testing.
-
-Package: hwtest
-Section: python
-Architecture: all
-Depends: checkbox, ${misc:Depends}
-Description: Transitional package to checkbox
- This package is a transitional package for renaming hwtest to checkbox.
-
-Package: hwtest-cli
-Architecture: all
-Depends: checkbox-cli, ${misc:Depends}
-Description: Transitional package to checkbox-cli
- This package is a transitional package for renaming hwtest-cli to
- checkbox-cli.
-
-Package: hwtest-gtk
-Section: gnome
-Architecture: all
-Depends: checkbox-gtk, ${misc:Depends}
-Description: Transitional package to checkbox-gtk
- This package is a transitional package for renaming hwtest-gtk to
- checkbox-gtk.

=== removed file 'debian/hwtest-cli.postinst'
--- debian/hwtest-cli.postinst	2011-11-29 20:22:12 +0000
+++ debian/hwtest-cli.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#

=== removed file 'debian/hwtest-gtk.postinst'
--- debian/hwtest-gtk.postinst	2011-11-29 20:22:12 +0000
+++ debian/hwtest-gtk.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#

=== removed file 'debian/hwtest.postinst'
--- debian/hwtest.postinst	2011-11-29 20:22:12 +0000
+++ debian/hwtest.postinst	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#! /bin/sh -e
-
-base_package="checkbox"
-. /usr/share/debconf/confmodule
-. /usr/share/checkbox/install/postinst
-
-#DEBHELPER#

=== removed file 'debian/hwtest.postrm'
--- debian/hwtest.postrm	2009-03-25 03:19:48 +0000
+++ debian/hwtest.postrm	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#! /bin/sh -e
-
-name=`basename $0 .postrm`
-base=`echo $name | cut -d "-" -f "1"`
-file="/etc/$base.d/$name.ini"
-
-case "$1" in
-    purge)
-        # mimic dpkg as closely as possible, so remove configuration
-        # files with dpkg backup extensions too:
-        for ext in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist;  do
-            rm -f $file$ext
-        done
-
-        # remove the configuration file itself
-        rm -f $file
-        ;;
-    remove|disappear|upgrade|failed-upgrade|abort-install|abort-upgrade)
-        ;;
-    *)
-        echo "$0: didn't understand being called with \`$1'" 1>&2
-        exit 0
-        ;;
-esac
-
-#DEBHELPER#

=== modified file 'debian/rules'
--- debian/rules	2011-12-07 04:34:49 +0000
+++ debian/rules	2012-02-01 15:07:39 +0000
@@ -8,8 +8,6 @@
 	cp debian/checkbox.postrm debian/checkbox-urwid.postrm
 	cp debian/checkbox.postrm debian/checkbox-gtk.postrm
 	cp debian/checkbox.postrm debian/checkbox-sru.postrm
-	cp debian/hwtest.postrm debian/hwtest-cli.postrm
-	cp debian/hwtest.postrm debian/hwtest-gtk.postrm
 	dh_installdeb
 
 override_dh_installdocs:
@@ -18,14 +16,10 @@
 	dh_installdocs -pcheckbox-urwid ./README 
 	dh_installdocs -pcheckbox-gtk ./README 
 	dh_installdocs -pcheckbox-sru ./README 
-	dh_installdocs -phwtest ./README 
-	dh_installdocs -phwtest-cli ./README 
-	dh_installdocs -phwtest-gtk ./README 
 	dh_installdocs
 
 override_dh_clean:
 	-find . -name \*.mo -exec rm {} \;
 	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-sru.postrm
-	-rm -f debian/hwtest-cli.postrm debian/hwtest-gtk.postrm
 	debconf-updatepo
 	dh_clean

=== modified file 'install/postinst'
--- install/postinst	2011-11-29 20:22:12 +0000
+++ install/postinst	2012-02-01 15:07:39 +0000
@@ -32,10 +32,6 @@
         # Apply the patch file if it is less than the given version
         patch_version=`basename $patch_file`
         if dpkg --compare-versions $version lt $patch_version; then
-            # Package was renamed from hwtest to checkbox
-            dpkg --compare-versions $patch_version lt "0.1-ubuntu13" \
-                && patch_package=`echo $package | sed 's/checkbox/hwtest/'` \
-                || patch_package=`echo $package | sed 's/hwtest/checkbox/'`
             $patch_file $patch_package
         fi
 
@@ -47,20 +43,18 @@
 {
     root_package=`echo $package | cut -d '-' -f '1'`
 
-    if [ "$root_package" != "hwtest" ]; then
-        # Create a temporary file to generate the suggested
-        # configuration file.
-        tempfile=`tempfile -m 0644 -p checkbox`
-
-        # Update the temporary file with preseeded values.
-        /usr/share/checkbox/install/config --output=$tempfile $package $base_package
-
-        # Clobber the old config file.
-        cp $tempfile $config
-
-        # Now clear up the cruft.
-        rm -f $tempfile
-    fi
+    # Create a temporary file to generate the suggested
+    # configuration file.
+    tempfile=`tempfile -m 0644 -p checkbox`
+
+    # Update the temporary file with preseeded values.
+    /usr/share/checkbox/install/config --output=$tempfile $package $base_package
+
+    # Clobber the old config file.
+    cp $tempfile $config
+
+    # Now clear up the cruft.
+    rm -f $tempfile
 }
 
 case "$1" in