Merge lp:~noskcaj/ubuntu/saucy/mplayer-skins/3.1 into lp:ubuntu/saucy/mplayer-skins

[Jackson Doak]

Merge from upstream, lintian clean

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

7. By Jackson Doak on 2013-08-27

* Replace debian/README.Packaging with debian/README.Debian
* debian/control:
  - Set debhelper build-depend to 9
  - Set Standards-Version as 3.9.4
  - Change "Conflicts" to "Breaks"
  - Add Depends: ${misc:Depends} to both binaries
  - Add a homepage
* debian/compat: Set as 9
* debian/rules:
  - Remove .gz part, all tarballs are now .bz2
  - Change to simple debhelper setup
* Create debian/source/format
* Update blue theme to 1.8
* Update Clearplayer theme to 0.9

=== removed file 'clearplayer-0.8.tar.bz2'
Binary files clearplayer-0.8.tar.bz2	2005-12-08 20:46:50 +0000 and clearplayer-0.8.tar.bz2	1970-01-01 00:00:00 +0000 differ
=== added file 'clearplayer-0.9.tar.bz2'
Binary files clearplayer-0.9.tar.bz2	1970-01-01 00:00:00 +0000 and clearplayer-0.9.tar.bz2	2013-08-27 23:06:13 +0000 differ
=== added file 'debian/README.Debian'
--- debian/README.Debian	1970-01-01 00:00:00 +0000
+++ debian/README.Debian	2013-08-27 23:06:13 +0000
@@ -0,0 +1,7 @@
+This package was created to split of the Skins from the mplayer package.
+These skins are arch:all anyway, so we save a bit archive space.
+
+This makes it possible to distribute more mplayer skins. If a new skin
+is to be added to this package, just drop the new *.tar.bz file into 
+the orig.tar.gz and increase the version number. Please not that the
+skin needs a proper copyright statement!

=== removed file 'debian/README.Packaging'
--- debian/README.Packaging	2005-12-08 20:46:50 +0000
+++ debian/README.Packaging	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-This package was created to split of the Skins from the mplayer package.
-These skins are arch:all anyway, so we save a bit archive space.
-
-This makes it possible to distribute more mplayer skins. If a new skin
-is to be added to this package, just drop the new *.tar.bz file into 
-the orig.tar.gz and increase the version number. Please not that the
-skin needs a proper copyright statement!

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-16 18:08:01 +0000
+++ debian/changelog	2013-08-27 23:06:13 +0000
@@ -1,3 +1,22 @@
+mplayer-skins (3.1) saucy; urgency=low
+
+  * Replace debian/README.Packaging with debian/README.Debian
+  * debian/control:
+    - Set debhelper build-depend to 9
+    - Set Standards-Version as 3.9.4
+    - Change "Conflicts" to "Breaks"
+    - Add Depends: ${misc:Depends} to both binaries
+    - Add a homepage
+  * debian/compat: Set as 9
+  * debian/rules:
+    - Remove .gz part, all tarballs are now .bz2
+    - Change to simple debhelper setup
+  * Create debian/source/format
+  * Update blue theme to 1.8
+  * Update Clearplayer theme to 0.9
+
+ -- Jackson Doak <[e-mail]>  Wed, 28 Aug 2013 07:45:27 +1000
+
 mplayer-skins (3) karmic; urgency=low
 
   * merge the mplayer-skin-blue package LP: #386507, #386510

=== modified file 'debian/compat'
--- debian/compat	2009-10-16 18:08:01 +0000
+++ debian/compat	2013-08-27 23:06:13 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2009-10-16 18:08:01 +0000
+++ debian/control	2013-08-27 23:06:13 +0000
@@ -3,14 +3,16 @@
 Priority: extra
 Maintainer: Reinhard Tartler <[e-mail]>
 Uploaders: Sebastian Dröge <[e-mail]>, Reinhard Tartler <[e-mail]>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.4
 Build-Depends-Indep: bzip2
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 9)
+Homepage: http://www.mplayerhq.hu/design7/news.html
 
 Package: mplayer-skins
 Architecture: all
+Depends: ${misc:Depends}
 Replaces: mplayer-skin-blue (<< ${binary:Version})
-Conflicts: mplayer-skin-blue (<< ${binary:Version})
+Breaks: mplayer-skin-blue (<< ${binary:Version})
 Provides: mplayer-skin
 Enhances: mplayer
 Description: Skins for the Mplayer package
@@ -26,7 +28,7 @@
 
 Package: mplayer-skin-blue
 Architecture: all
-Depends: mplayer-skins
+Depends: ${misc:Depends}, mplayer-skins
 Description: Transitional package for the 'blue' mplayer-skin package
- This package can safely be removed and is only used for transitional
+ This empty package can safely be removed and is only used for transitional
  purposes.

=== modified file 'debian/rules'
--- debian/rules	2009-10-16 18:08:01 +0000
+++ debian/rules	2013-08-27 23:06:13 +0000
@@ -1,30 +1,15 @@
 #!/usr/bin/make -f
-clean::
-	dh_testdir
+
+%:
+	dh $@
+
+override_dh_clean:
 	dh_clean
 	rm -rf debian/tmp 
 
 d:=debian/mplayer-skins/usr/share/mplayer/skins
 
-install: 
+override_dh_install: 
 	mkdir -p $(d)
-	for s in *.tar.bz2 *.tar.gz; do tar xv -C $(d) -f $$s ; done
+	for s in *.tar.bz2; do tar xv -C $(d) -f $$s ; done
 	dh_link usr/share/mplayer/skins/clearplayer usr/share/mplayer/skins/default
-
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch:
-	# nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-08-27 23:06:13 +0000
@@ -0,0 +1,1 @@
+3.0 (native)
\ No newline at end of file

=== removed file 'mplayer-blue_1.6.tar.gz'
Binary files mplayer-blue_1.6.tar.gz	2009-10-16 18:08:01 +0000 and mplayer-blue_1.6.tar.gz	1970-01-01 00:00:00 +0000 differ
=== added file 'mplayer-blue_1.8.tar.bz2'
Binary files mplayer-blue_1.8.tar.bz2	1970-01-01 00:00:00 +0000 and mplayer-blue_1.8.tar.bz2	2013-08-27 23:06:13 +0000 differ