Hi, the package has apperaed now. Here are my remarks, some have already been mentioned, others are new. I have attached a patch that incorporates the necessary changes.
- Do not use only the date for your package version!
If you package a git master, use a version that sorts just below any
version number upstream might release in the future. Your version
string 2013.09.28 will supersede any upstream tag, should upstream
ever decide to introduce such. A good versioning scheme is
0~yyyymmdd+gitxxxxxxxxxx, e.g. for your package
0~20130928+git6e577736d0. You should remove the package from mentors
completely and reupload.
- omxplayer is not in Debian, so do not install the pi-yt script.
- Install docs; NEWS.txt is renamed to CHANGELOG.txt to satisfy lintian.
- Remove whitey egg-info.
- Do not just tar up a git clone to create an orig tgz! Use a proper
get-orig-source that repackages a Github snapshot. Once this is done,
you jsut need to do this to create a new orig tgz, even for a new
upstream version:
dch -i # insert proper new upstream version, we cannot use uscan
# here because we cannot really monitor upstream commits
debian/rules get-orig-source # drops yt_<UPSTREAM-VERSION>.orig.tar.xz
# in current directory
# unpack and move your Debian directory
# or use git-buildpackage
- As setup.py clearly states Apache 2.0, putthat dual license choice in
debian/copyright.
- I added myself to debian/copyright for the rules file, and to Uploaders
to justify the changelog entry. If you incorporate the changes and udpate
the changelog yourself, you can remvoe Uploaders if you want.
The package is lintian-clean now, except for the missing watch file,
which is ok.
HTH,
Nik
--
Wer den Grünkohl nicht ehrt, ist der Mettwurst nicht wert!
PGP-Fingerprint: 3C9D 54A4 7575 C026 FB17 FD26 B79A 3C16 A0C4 F296
diff -Naupr yt-2013.09.28.old/debian/changelog yt-0~20130928+git6e577736d0/debian/changelog
--- yt-2013.09.28.old/debian/changelog 2013-09-28 11:16:58.000000000 +0200
+++ yt-0~20130928+git6e577736d0/debian/changelog 2013-09-28 13:07:48.345923292 +0200
@@ -1,5 +1,5 @@
-yt (2013.09.28-1) unstable; urgency=low
+yt (0~20130928+git6e577736d0-1) unstable; urgency=low
* Initial release, closes: #724801.
- -- Javier P.L. <chilic...@ubuntu.com> Fri, 27 Sep 2013 17:14:24 -0500
+ -- Dominik George <n...@naturalnet.de> Sat, 28 Sep 2013 13:06:57 +0200
diff -Naupr yt-2013.09.28.old/debian/control yt-0~20130928+git6e577736d0/debian/control
--- yt-2013.09.28.old/debian/control 2013-09-28 10:48:18.000000000 +0200
+++ yt-0~20130928+git6e577736d0/debian/control 2013-09-28 13:12:47.853395413 +0200
@@ -2,6 +2,7 @@ Source: yt
Section: web
Priority: extra
Maintainer: Javier P.L. <chilic...@ubuntu.com>
+Uploaders: Dominik George <n...@naturalnet.de>
Build-Depends:
debhelper (>= 9),
python-setuptools
diff -Naupr yt-2013.09.28.old/debian/copyright yt-0~20130928+git6e577736d0/debian/copyright
--- yt-2013.09.28.old/debian/copyright 2013-09-28 10:47:52.000000000 +0200
+++ yt-0~20130928+git6e577736d0/debian/copyright 2013-09-28 13:51:19.697202306 +0200
@@ -5,14 +5,16 @@ Source: git://github.com/rjw57/yt.git
Files: *
Copyright: Copyright (c) 2012, 2013 Rich Wareham <rj...@cantab.net>
-License: MIT
+License: MIT or Apache-2.0
Files: debian/*
Copyright: Copyright (c) 2013 Javier P.L. <chilic...@ubuntu.com>
+ Copyright (c) 2013 Dominik George <n...@naturalnet.de>
License: MIT
-License: MIT
- yt is released into the MIT license by the copyright holders.
+License: Apache-2.0
+ On Debian systems, the text of the Apache License 2.0 can be found in
+ '/usr/share/common-licenses/Apache-2.0'.
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy
diff -Naupr yt-2013.09.28.old/debian/docs yt-0~20130928+git6e577736d0/debian/docs
--- yt-2013.09.28.old/debian/docs 1970-01-01 01:00:00.000000000 +0100
+++ yt-0~20130928+git6e577736d0/debian/docs 2013-09-28 13:26:41.763392178 +0200
@@ -0,0 +1,2 @@
+README.rst
+NEWS.txt
diff -Naupr yt-2013.09.28.old/debian/patches/remove-pi-yt.patch yt-0~20130928+git6e577736d0/debian/patches/remove-pi-yt.patch
--- yt-2013.09.28.old/debian/patches/remove-pi-yt.patch 1970-01-01 01:00:00.000000000 +0100
+++ yt-0~20130928+git6e577736d0/debian/patches/remove-pi-yt.patch 2013-09-28 13:20:07.182629526 +0200
@@ -0,0 +1,16 @@
+Description: Do not create the pi-yt script
+ The pi-yt entrypoint script defaults to omxplayer, which is not in Debian.
+ We remove this entrypoint so the script is not installed unnecessarily.
+Author: Dominik George <n...@naturalnet.de>
+--- a/setup.py
++++ b/setup.py
+@@ -34,8 +34,7 @@ setup(name='whitey',
+ entry_points={
+ 'console_scripts':
+ [
+- 'yt=yt:main',
+- 'pi-yt=yt:main_with_omxplayer'
++ 'yt=yt:main'
+ ]
+ }
+ )
diff -Naupr yt-2013.09.28.old/debian/patches/series yt-0~20130928+git6e577736d0/debian/patches/series
--- yt-2013.09.28.old/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ yt-0~20130928+git6e577736d0/debian/patches/series 2013-09-28 13:18:26.585414747 +0200
@@ -0,0 +1 @@
+remove-pi-yt.patch
diff -Naupr yt-2013.09.28.old/debian/README.source yt-0~20130928+git6e577736d0/debian/README.source
--- yt-2013.09.28.old/debian/README.source 2013-09-28 10:47:52.000000000 +0200
+++ yt-0~20130928+git6e577736d0/debian/README.source 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-Debian packaging for yt
------------------------
-
-A quick summary of how one can update the Debian packaging of yt is
-to:
-
- git clone --dept=1 https://github.com/rjw57/yt yt-yyyy.mm.dd
- tar zcf yt_yyyy.mm.dd.orig.tar.gz yt-yyyy.mm.dd/
- cd yt-yyyy.mm.dd
- git clone --dept=1 https://github.com/chilicuil/yt-deb
- mv yt-deb/debian . && rm yt-deb
- [ Make here some adaptations, like updating debian/patches, if needed ]
- dch -i
- debuild -S
- upload .dsc | .changes files
-
-These are the important steps and may need to be changed according to
-deviations, say, in the release process of upstream releases (e.g., if
-upstream changes the location where the tarballs reside).
-
- -- Javier P.L. <chilic...@ubuntu.com>, Sat 28 Sep 2013 11:04:54 PM CDT
diff -Naupr yt-2013.09.28.old/debian/rules yt-0~20130928+git6e577736d0/debian/rules
--- yt-2013.09.28.old/debian/rules 2013-09-28 10:47:52.000000000 +0200
+++ yt-0~20130928+git6e577736d0/debian/rules 2013-09-28 13:43:11.631326270 +0200
@@ -1,13 +1,24 @@
#!/usr/bin/make -f
+
+DEB_VERSION:=$(shell dpkg-parsechangelog -n1 | sed -n '/^Version: /s///p')
+DEB_UPSTREAM_VERSION:=$(shell DEB_VERSION=${DEB_VERSION}; echo $${DEB_VERSION%-*})
+DEB_MASTER_VERSION:=$(shell DEB_UPSTREAM_VERSION=${DEB_UPSTREAM_VERSION}; echo $${DEB_UPSTREAM_VERSION\#*+git})
+
%:
dh $@ --with python2 --buildsystem=python_distutils
-override_dh_install:
- dh_install
-
override_dh_installdocs:
dh_installdocs
+ mv debian/yt/usr/share/doc/yt/{NEWS,CHANGELOG}.txt
override_dh_clean:
dh_clean
- rm -rf yt.egg-info
+ rm -rf yt.egg-info src/whitey.egg-info
+
+get-orig-source:
+ rm -rf debian/tmp; mkdir debian/tmp
+ cd debian/tmp; wget https://github.com/rjw57/yt/archive/${DEB_MASTER_VERSION}.tar.gz
+ cd debian/tmp; tar xvzf ${DEB_MASTER_VERSION}.tar.gz
+ cd debian/tmp; mv yt-* yt-${DEB_UPSTREAM_VERSION}
+ cd debian/tmp; tar cvJf yt_${DEB_UPSTREAM_VERSION}.orig.tar.xz yt-${DEB_UPSTREAM_VERSION}
+ mv debian/tmp/yt_${DEB_UPSTREAM_VERSION}.orig.tar.xz .
signature.asc
Description: Digital signature
