Imported Debian patch 2007.06.22-1

diff --cc debian/changelog
index a3fd0d7485292cadc369cdfcffa71c7b0e39d48a,0000000000000000000000000000000000000000..47eb40e066caffb41a3089a7700fb4f1a4a6d026
mode 100644,000000..100644
--- 1/debian/changelog
--- /dev/null
+++ b/debian/changelog
@@@ -1,57 -1,0 +1,64 @@@
++youtube-dl (2007.06.22-1) unstable; urgency=low
++
++  * New upstream release:
++    - regex update.
++
++ -- Robert S. Edmonds <edmonds@debian.org>  Thu, 21 Jun 2007 20:42:57 -0400
++
 +youtube-dl (2007.06.06-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - "--title-too" command line option to print the video's title.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Thu, 07 Jun 2007 01:04:01 -0400
 +
 +youtube-dl (2007.03.27-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Progress meter.
 +    - "--literal" command line option to use the video title in the filename.
 +    - "--get-url" command line option to print the real video URL.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Mon,  2 Apr 2007 21:46:56 -0400
 +
 +youtube-dl (2007.02.18-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Diction.
 +    - Catches socket errors.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Tue, 20 Feb 2007 13:57:32 -0500
 +
 +youtube-dl (2007.01.19-1) unstable; urgency=low
 +
 +  * New upstream release, closes: #406146.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun, 28 Jan 2007 17:41:44 -0500
 +
 +youtube-dl (2006.12.07-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - Use -t to name the downloaded file after the title, closes: #395184.
 +    - Parses URLs without a leading "http://", closes: #400321.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun, 10 Dec 2006 13:52:36 -0500
 +
 +youtube-dl (2006.11.12-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sat, 25 Nov 2006 16:12:03 -0500
 +
 +youtube-dl (2006.09.25-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * python >= 2.4 is now required.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Wed, 27 Sep 2006 17:43:07 -0400
 +
 +youtube-dl (2006.08.28-1) unstable; urgency=low
 +
 +  * Initial release, closes: #385748.
 +
 + -- Robert S. Edmonds <edmonds@debian.org>  Sun,  3 Sep 2006 19:43:27 -0400
 +

diff --cc debian/install
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4aff75b308a5c1cdff712336c2814e73bf728100
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/install
@@@ -1,0 -1,0 +1,1 @@@
++youtube-dl usr/bin

diff --cc debian/rules
index 90317821b4125c2a77751a6dbe32b3537494aa58,0000000000000000000000000000000000000000..8271a237e289a0034daf42dd18cb0feb69bfe6a9
mode 100755,000000..100755
--- 1/debian/rules
--- /dev/null
+++ b/debian/rules
@@@ -1,33 -1,0 +1,30 @@@
-       dh_installdirs
- 
-       install -m 0755 $(CURDIR)/youtube-dl $(CURDIR)/debian/youtube-dl/usr/bin
 +#!/usr/bin/make -f
 +
 +build:
 +
 +clean:
 +      dh_testdir
 +      dh_clean 
 +
 +install: build
 +      dh_testdir
 +      dh_testroot
 +      dh_clean -k 
- 
- binary-arch: build install
++      dh_install
 +
++binary-arch:
 +binary-indep: build install
-       dh_installman $(CURDIR)/debian/youtube-dl.1
 +      dh_testdir
 +      dh_testroot
 +      dh_installchangelogs 
 +      dh_installdocs
++      dh_installman debian/youtube-dl.1
 +      dh_compress
 +      dh_fixperms
 +      dh_installdeb
 +      dh_gencontrol
 +      dh_md5sums
 +      dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install