Merge lp:~noskcaj/ubuntu/wily/dell-dup/dh-python into lp:ubuntu/wily/dell-dup

[Jackson Doak]

Switch to using dh and dh-python. This package might be better RMed though

[Luke Faraone (lfaraone)]

We should probably check with ~superm1 as to whether this package is still useful, agreed.

review: Needs Information

[Piotr Ożarowski (piotr)]

is missing --buildsystem=pybuild in debian/rules intentional?

[Jackson Doak (noskcaj)]

Is pybuild needed?

On Wednesday, August 12, 2015, Piotr Ożarowski <email address hidden> wrote:

> is missing --buildsystem=pybuild in debian/rules intentional?
>
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/wily/dell-dup/dh-python/+merge/264080
> You are the owner of lp:~noskcaj/ubuntu/wily/dell-dup/dh-python.
>

[Mario Limonciello (superm1)]

jared is probably better to review if this is still relevant. Adding him.

review: Abstain

[Jared Dominguez (jared-dominguez)]

I'll need to check on whether this is needed at all anymore.

[Jared Dominguez (jared-dominguez)]

Changes in this package are fine with me, but the internal feedback I got is that this package is no longer in use by Dell for building DUPs.

review: Abstain

[Michael Terry (mterry)]

Sounds like this can be removed from the archive. I've filed bug 1491140 to do that (assigned to you, Jared to confirm it should go ahead -- if you say yes, we can subscribe ~ubuntu-archive).

In the meantime, I'll mark this branch as WIP to get it off the sponsors list.

Thanks, Jackson! Even though we may not use it, good patch. :)

Unmerged revisions

8. By Jackson Doak on 2015-07-07

Depend on firmware-tools, firmware-addon-dell

7. By Jackson Doak on 2015-07-07

Add missing build-depends

6. By Jackson Doak on 2015-07-07

* Switch to dh and dh-python
* Bump standards-version

=== modified file 'debian/changelog'
--- debian/changelog	2009-08-27 11:56:18 +0000
+++ debian/changelog	2015-07-07 22:38:42 +0000
@@ -1,3 +1,11 @@
+dell-dup (1.1.3-0ubuntu3) wily; urgency=medium
+
+  * Switch to dh and dh-python
+  * Bump standards-version
+  * Depend on firmware-tools, firmware-addon-dell
+
+ -- Jackson Doak <[e-mail]>  Wed, 08 Jul 2015 08:14:21 +1000
+
 dell-dup (1.1.3-0ubuntu2) karmic; urgency=low
 
   * Adjust debian/rules to install all Python modules into the right place,

=== modified file 'debian/compat'
--- debian/compat	2008-02-12 14:42:54 +0000
+++ debian/compat	2015-07-07 22:38:42 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2009-08-27 11:56:18 +0000
+++ debian/control	2015-07-07 22:38:42 +0000
@@ -3,15 +3,23 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Michael Brown <[e-mail]>
-Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.49)
-Build-Depends-Indep: python-support (>= 0.5.3)
-Standards-Version: 3.8.3
+Build-Depends:
+ debhelper (>= 9),
+ firmware-addon-dell,
+ firmware-tools,
+ python:any
+Standards-Version: 3.9.6
 Homepage: http://linux.dell.com/firmware-tools
 
 Package: dell-dup
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
+Depends:
+ firmware-addon-dell,
+ firmware-tools,
+ ${misc:Depends},
+ ${python:Depends}
+Provides:
+ ${python:Provides}
 Description: A firmware-tools plugin for Dell DUP images
  Firmware archives can be distributed in a variety of formats.
  This package provides a plugin for firmware tools to extract

=== modified file 'debian/copyright'
--- debian/copyright	2009-08-27 11:56:18 +0000
+++ debian/copyright	2015-07-07 22:38:42 +0000
@@ -63,7 +63,7 @@
 
          4. to perform the Original Work publicly; and
 
-         5. to display the Original Work publicly. 
+         5. to display the Original Work publicly.
 
    2. Grant of Patent License. Licensor grants You a worldwide,
       royalty-free, non-exclusive, sublicensable license, under patent

=== removed file 'debian/pycompat'
--- debian/pycompat	2008-02-12 14:42:54 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file 'debian/pyversions'
--- debian/pyversions	2008-02-12 14:42:54 +0000
+++ debian/pyversions	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2.2-

=== modified file 'debian/rules'
--- debian/rules	2009-08-27 11:56:18 +0000
+++ debian/rules	2015-07-07 22:38:42 +0000
@@ -1,28 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# vim:noet:ts=8:sw=8:filetype=make
-
-DEB_PYTHON_SYSTEM=pysupport
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
-
-TARFILE+=$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-URL+=http://linux.dell.com/git/dell-dup.git/
-
-get-orig-source:: git-export build-source
-git-export::
-	git clone $(URL) $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-build-source::
-	cd $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) && sh autogen.sh
-	cd $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) && rm -rf autom4te.cache
-	tar czf $(CURDIR)/../$(TARFILE) $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) --exclude=.git
-	rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
-
-DEB_INSTALL_DOCS_ALL :=
-
-install/dell-dup::
+
+%:
+	dh $@ --with python2
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+override_dh_install:
 	find ./ -name *.pyc | xargs rm
-	dh_pysupport -pdell-dup
+	dh_install

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2015-07-07 22:38:42 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
\ No newline at end of file