From: Robert S. Edmonds <edmonds@debian.org>
Date: Fri, 22 Jun 2007 00:42:57 +0000 (-0400)
Subject: Imported Debian patch 2007.06.22-1
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/ae51746b072e62f27512cf4d5093327e3453be01?hp=a4ca6ba1ad763074e063831f46d1996994ba557b

Imported Debian patch 2007.06.22-1
---

diff --git a/debian/changelog b/debian/changelog
index a3fd0d7..47eb40e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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:
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..4aff75b
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+youtube-dl usr/bin
diff --git a/debian/rules b/debian/rules
index 9031782..8271a23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,18 +10,15 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	dh_installdirs
-
-	install -m 0755 $(CURDIR)/youtube-dl $(CURDIR)/debian/youtube-dl/usr/bin
+	dh_install
 
+binary-arch:
 binary-indep: build install
-
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_installman $(CURDIR)/debian/youtube-dl.1
+	dh_installman debian/youtube-dl.1
 	dh_compress
 	dh_fixperms
 	dh_installdeb
diff --git a/youtube-dl b/youtube-dl
index 3ad5cd8..98fbeed 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -40,7 +40,7 @@ import urllib2
 
 # Global constants
 const_video_url_str = 'http://www.youtube.com/watch?v=%s'
-const_video_url_re = re.compile(r'^((?:http://)?(?:www\d*\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
+const_video_url_re = re.compile(r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:v/|(?:watch(?:\.php)?)?\?(?:.+&)?v=))?([0-9A-Za-z_-]+)(?(1)[&/].*)?$')
 const_login_url_str = 'http://www.youtube.com/login?next=/watch%%3Fv%%3D%s'
 const_login_post_str = 'current_form=loginForm&next=%%2Fwatch%%3Fv%%3D%s&username=%s&password=%s&action_login=Log+In'
 const_age_url_str = 'http://www.youtube.com/verify_age?next_url=/watch%%3Fv%%3D%s'
@@ -191,7 +191,7 @@ def calc_speed(start, now, bytes):
 
 # Create the command line options parser and parse command line
 cmdl_usage = 'usage: %prog [options] video_url'
-cmdl_version = '2007.06.06'
+cmdl_version = '2007.06.22'
 cmdl_parser = optparse.OptionParser(usage=cmdl_usage, version=cmdl_version, conflict_handler='resolve')
 cmdl_parser.add_option('-h', '--help', action='help', help='print this help text and exit')
 cmdl_parser.add_option('-v', '--version', action='version', help='print program version and exit')