[debootstrap] rebase to 1.0.25

[jvcelak]

commit bdce0e28513f641f4f6e3285aea9563f9a605ad2
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Mon Oct 25 16:08:08 2010 +0200

    rebase to 1.0.25

 .gitignore                                         |    2 +-
 debootstrap-1.0.19-devices.patch                   |   13 -------------
 debootstrap-devices.patch                          |   14 ++++++++++++++
 ...p-1.0.19-perms.patch => debootstrap-perms.patch |    7 ++++---
 debootstrap.spec                                   |    9 ++++++---
 sources                                            |    2 +-
 6 files changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bd13ca..ef92268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-debootstrap_1.0.23.tar.gz
+/debootstrap_1.0.25.tar.gz
diff --git a/debootstrap-devices.patch b/debootstrap-devices.patch
new file mode 100644
index 0000000..945d1b3
--- /dev/null
+++ b/debootstrap-devices.patch
@@ -0,0 +1,14 @@
+diff -u -uNPrp debootstrap/Makefile debootstrap.new/Makefile
+--- debootstrap/Makefile	2010-09-26 19:14:28.000000000 +0200
++++ debootstrap.new/Makefile	2010-10-25 15:59:20.151248078 +0200
+@@ -27,7 +27,9 @@ devices.tar.gz:
+ 	mkdir -p dev
+ 	chown 0:0 dev
+ 	chmod 755 dev
+-	(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
++	$(MAKEDEV) -d dev std ptmx fd
++	$(MAKEDEV) -d dev -x console
++	mknod dev/console c 5 1
+ 	tar cf - dev | gzip -9 >devices.tar.gz
+ 	@if [ "$$(tar tvf devices.tar.gz | wc -l)" -lt 2 ]; then \
+ 		echo " ** devices.tar.gz is empty!" >&2; \
diff --git a/debootstrap-1.0.19-perms.patch b/debootstrap-perms.patch
similarity index 68%
rename from debootstrap-1.0.19-perms.patch
rename to debootstrap-perms.patch
index 132b64a..8f3def6 100644
--- a/debootstrap-1.0.19-perms.patch
+++ b/debootstrap-perms.patch
@@ -1,6 +1,7 @@
---- debootstrap-1.0.22/Makefile.orig	2010-03-05 18:44:05.000000000 +0100
-+++ debootstrap-1.0.22/Makefile	2010-03-05 18:44:30.000000000 +0100
-@@ -14,13 +14,12 @@
+diff -u -uNPrp debootstrap/Makefile debootstrap.new/Makefile
+--- debootstrap/Makefile	2010-10-25 15:59:20.151248078 +0200
++++ debootstrap.new/Makefile	2010-10-25 16:04:52.814373124 +0200
+@@ -14,13 +14,12 @@ install:
  	mkdir -p $(DESTDIR)/usr/sbin
  
  	cp -a scripts/* $(DSDIR)/scripts/
diff --git a/debootstrap.spec b/debootstrap.spec
index 06b60b8..d7ec931 100644
--- a/debootstrap.spec
+++ b/debootstrap.spec
@@ -1,5 +1,5 @@
 Name:           debootstrap
-Version:        1.0.23
+Version:        1.0.25
 Release:        1%{?dist}
 Summary:        Debian GNU/Linux bootstrapper
 
@@ -7,8 +7,8 @@ Group:          System Environment/Base
 License:        MIT
 URL:            http://code.erisian.com.au/Wiki/debootstrap
 Source0:        http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz
-Patch0:         debootstrap-1.0.19-devices.patch
-Patch1:         debootstrap-1.0.19-perms.patch
+Patch0:         debootstrap-devices.patch
+Patch1:         debootstrap-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 25 2010 Jan Vcelak <jvcelak at redhat.com> 1.0.25-1
+- new upstream release (support for HTTPS, added Ubuntu Nanty, added Debian Wheezy)
+
 * Wed May 26 2010 Jan Zeleny <jzeleny at redhat.com> - 1.0.23-1
 - rebased to 1.0.23 (Add ${misc:Depends}, Add (Ubuntu) maverick as symlink to gutsy)
 
diff --git a/sources b/sources
index 07639ca..a8217c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac61b31a9dc58caf4cade91c486f20c6  debootstrap_1.0.23.tar.gz
+200bbbe101c5901b4f0072ac90a945e2  debootstrap_1.0.25.tar.gz