aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:52:57 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:52:57 +0100
commit678f804ce4b71da04e1846cd65a0e57d93c7dc49 (patch)
treeb52482972f2f73defa96cc7869977a683384d0ff
parentb382d0f71eeece4e6e1cc3662f3c89884d5ac05d (diff)
downloadyoutube-dl-678f804ce4b71da04e1846cd65a0e57d93c7dc49.zip
youtube-dl-678f804ce4b71da04e1846cd65a0e57d93c7dc49.tar.gz
youtube-dl-678f804ce4b71da04e1846cd65a0e57d93c7dc49.tar.bz2
updates from Debian package
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--debian/README.source37
-rw-r--r--debian/compat2
-rw-r--r--debian/control11
-rw-r--r--debian/copyright4
4 files changed, 43 insertions, 11 deletions
diff --git a/debian/README.source b/debian/README.source
index 6a942b0..f0cea40 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,12 +1,14 @@
Debian packaging for youtube-dl
-------------------------------
+# Basic building of the package
+
A quick summary of how one can update the Debian packaging of youtube-dl is
to, assuming that one already has the packages `devscripts`,
`git-buildpackage`, and `pristine-tar` installed:
- gbp clone --all ssh://git.debian.org/git/collab-maint/youtube-dl.git
- cd youtube-dl
+ gbp clone --all https://github.com/rbrito/pkg-youtube-dl
+ cd pkg-youtube-dl
gbp import-orig --pristine-tar --uscan
[ Make here some adaptations, like updating debian/patches, if needed ]
gbp buildpackage --git-pristine-tar
@@ -15,4 +17,33 @@ 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).
- -- Rogério Brito <rbrito@ime.usp.br>, Mon, 18 May 2015 02:17:12 -0300
+# Maintaining the repository
+
+I keep my development of the package (in particular, the master branch) at
+GitHub and I usually try to have my changes there, since I am not always
+with my SSH/GPG keys at hand.
+
+For the benefit of the co-maintainers, I keep a backup copy of the changes
+at git.debian.org, where, due to said keys not being available at all times,
+I can't push my changes, which leads, sometimes to my GitHub repository to
+be ahead of the Debian mirror.
+
+I prefer that, if possible, when working with the master branch:
+
+* Please, check if I don't have changes already made at:
+
+ https://github.com/rbrito/pkg-youtube-dl
+
+* People send me pull requests there
+
+* If they are not comfortable with the use of GitHub for any kind of reason
+ (political, ideological etc.), that they send me patches via email (git
+ send-email is best).
+
+ This can be sent to my personal email or to the Debian BTS. I'm flexible.
+
+Of course, if it is not possible to coordinate in the way described above,
+alas... :-(
+
+
+ -- Rogério Brito <rbrito@ime.usp.br>, Thu, 19 Oct 2017 16:19:25 -0200
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index b5184a0..0b7e153 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
Source: youtube-dl
Section: web
-Priority: extra
+Priority: optional
Maintainer: Rogério Brito <rbrito@ime.usp.br>
Build-Depends:
bash-completion,
- debhelper (>= 9),
+ debhelper (>= 10),
dh-exec,
dh-python,
pandoc,
@@ -13,10 +13,10 @@ Build-Depends:
Build-Depends-Indep:
python3
X-Python3-Version: >= 3.2
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
Homepage: https://rg3.github.com/youtube-dl/
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/youtube-dl.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/youtube-dl.git
+Vcs-Git: https://github.com/rbrito/pkg-youtube-dl
+Vcs-Browser: https://github.com/rbrito/pkg-youtube-dl
Package: youtube-dl
Architecture: all
@@ -31,6 +31,7 @@ Recommends:
ca-certificates,
ffmpeg | libav-tools,
mpv | mplayer,
+ phantomjs,
rtmpdump
Description: downloader of videos from YouTube and other sites
youtube-dl is a small command-line program to download videos from
diff --git a/debian/copyright b/debian/copyright
index 53e4d7d..0de8c2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: youtube-dl
Upstream-Contact: https://github.com/rg3/youtube-dl
-Source: git://github.com/rg3/youtube-dl.git
+Source: https://github.com/rg3/youtube-dl
Files: *
Copyright: none