--- dos2unix-5.0.orig/debian/control
+++ dos2unix-5.0/debian/control
@@ -0,0 +1,23 @@
+Source: dos2unix
+Section: text
+Priority: extra
+Maintainer: Jari Aalto <jari.aalto@cante.net>
+Build-Depends: debhelper (>= 7.1), ghostscript
+Standards-Version: 3.8.4
+Vcs-Browser: http://git.debian.org/?p=collab-maint/dos2unix.git
+Vcs-Git: git://git.debian.org/git/collab-maint/dos2unix.git
+Homepage: http://freshmeat.net/projects/dos2unix
+
+Package: dos2unix
+Conflicts: tofrodos (<< 1.7.8.debian.1-2)
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: convert text file line endings between CRLF and LF
+ This package includes two utilities to handle conversion of the text
+ file line ending: dos2unix and mac2unix. The text files stored under
+ Windows and DOS typically have two ASCII characters at the end: the
+ CR followed by LF code. The Unix and Linux store text files ending
+ only to LF and older Macs stored the files ending to CR. While modern
+ editors can read any one of them, there may be need to convert files
+ to one format or another.
+ This is the classic utility developed 1989.
--- dos2unix-5.0.orig/debian/changelog
+++ dos2unix-5.0/debian/changelog
@@ -0,0 +1,28 @@
+dos2unix (5.0-2) unstable; urgency=medium
+
+  * debian/control
+    - (Conflicts): add tofrodos (<< 1.7.8.debian.1-2) to handle
+      upgrades (serious; Closes: #573495). See
+      http://packages.qa.debian.org/t/tofrodos/news/20100121T214032Z.html
+
+ -- Jari Aalto <jari.aalto@cante.net>  Fri, 12 Mar 2010 11:17:24 +0200
+
+dos2unix (5.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - (Build-Depends): update to debhelper 7.1.
+  * debian/debian-save-restore.mk
+    - New file.
+  * debian/rules
+    - (.PHONY::binary): remove undefined target binary-indep.
+  * debian/watch
+    - Adjust URL and regexp.
+
+ -- Jari Aalto <jari.aalto@cante.net>  Tue, 09 Mar 2010 21:09:55 +0200
+
+dos2unix (4.1.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #561307)
+
+ -- Jari Aalto <jari.aalto@cante.net>  Mon, 15 Feb 2010 00:04:25 +0200
--- dos2unix-5.0.orig/debian/rules
+++ dos2unix-5.0/debian/rules
@@ -0,0 +1,74 @@
+#!/usr/bin/make -f
+
+PACKAGE         = dos2unix
+DOCROOTDIR      = $(CURDIR)/debian/$(PACKAGE)/usr/share/doc
+PKGDOCDIR       = $(DOCROOTDIR)/$(PACKAGE)
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include debian/debian-save-restore.mk
+
+# Preserve original files, that will be generated afresh by Makefile
+FILE_LIST_PRESERVE = \
+ dos2unix.pdf \
+ dos2unix.ps \
+ dos2unix.txt \
+ unix2dos.pdf \
+ unix2dos.ps \
+ unix2dos.txt
+
+override_dh_auto_clean:
+	$(file-state-save)
+	dh_auto_clean
+
+install: build
+	# target: install
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	dh_auto_install
+
+	# dos2unix-N.N/ => dos2unix/
+	mv -v $(DOCROOTDIR)/$$( cd $(DOCROOTDIR) && ls ) $(PKGDOCDIR)
+
+	# Remove files that are not needed. The PS and PDF are
+	# copies of manual pages.
+
+	rm -vf $(PKGDOCDIR)/COPYING.txt \
+	       $(PKGDOCDIR)/INSTALL.txt \
+	       $(PKGDOCDIR)/ChangeLog.txt \
+	       $(PKGDOCDIR)/dos2unix.ps \
+	       $(PKGDOCDIR)/dos2unix.pdf \
+	       $(PKGDOCDIR)/unix2dos.ps \
+	       $(PKGDOCDIR)/unix2dos.pdf
+
+binary-arch: build install
+	# target: binary-arch - Build architecture-dependent files here.
+	$(file-state-restore)
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs -X INSTALL.txt -X COPYING.txt -X ChangeLog.txt
+	dh_installexamples
+	dh_install
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-arch
+
+%:
+	dh  $@
+
+.PHONY: install
+.PHONY: binary binary-arch
+
+# End of file
--- dos2unix-5.0.orig/debian/watch
+++ dos2unix-5.0/debian/watch
@@ -0,0 +1,3 @@
+version=3
+# <Webpage URL> <string match>
+http://www.xs4all.nl/~waterlan/dos2unix.html .*dos2unix-(.*)\.tar\.gz
--- dos2unix-5.0.orig/debian/debian-save-restore.mk
+++ dos2unix-5.0/debian/debian-save-restore.mk
@@ -0,0 +1,70 @@
+#   debian-autotools.mk -- Common settings for Autotoolsx
+#
+#   Copyright
+#
+#       Copyright (C) 2008-2010 Jari Aalto <jari.aalto@cante.net>
+#
+#   License
+#
+#       This program is free software; you can redistribute it and/or modify
+#       it under the terms of the GNU General Public License as published by
+#       the Free Software Foundation; either version 2 of the License, or
+#       (at your option) any later version.
+#
+#       This program is distributed in the hope that it will be useful,
+#       but WITHOUT ANY WARRANTY; without even the implied warranty of
+#       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#       GNU General Public License for more details.
+#
+#       You should have received a copy of the GNU General Public License
+#       along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   Description
+#
+#       This is GNU makefile part, that defines common variables,
+#       targets and macros to be used from debian/rules.
+#
+#   Usage (format 3.0)
+#
+#	FILE_LIST_PRESERVE = <file list of upstream files>
+#
+#	override_dh_clean:
+#		$(file-state-save)
+#		dh_clean
+# 		$(file-state-restore)
+#
+#   Alternative usage, in case more file updates happens during configure etc.
+#
+#       override_dh_auto_configure:
+#               $(file-state-save)
+#               <configure call>
+#
+#       binary-arch:
+#               $(file-state-restore)
+#               ...
+
+define file-state-save
+	# save files
+	suffix=.original; \
+        for file in $(FILE_LIST_PRESERVE); \
+        do \
+	        backup=/tmp/$$(echo $$file | sed 's,/,%,g')$$suffix; \
+                if [ -f "$$file" ] && [ ! -f "$$backup" ]; then \
+		 	cp --verbose "$$file" "$$backup"; \
+		fi; \
+        done
+endef
+
+define file-state-restore
+	# restore files
+	suffix=.original; \
+        for file in $(FILE_LIST_PRESERVE); \
+        do \
+	        backup=/tmp/$$(echo $$file | sed 's,/,%,g')$$suffix; \
+                if [ -f "$$backup" ]; then \
+			 mv --verbose "$$backup" "$$file"; \
+		fi; \
+        done
+endef
+
+# End of file
--- dos2unix-5.0.orig/debian/docs
+++ dos2unix-5.0/debian/docs
@@ -0,0 +1,8 @@
+ChangeLog.txt
+COPYING.txt
+dos2unix.txt
+INSTALL.txt
+README.txt
+README.txt
+TODO.txt
+TODO.txt
--- dos2unix-5.0.orig/debian/copyright
+++ dos2unix-5.0/debian/copyright
@@ -0,0 +1,56 @@
+This work was packaged for Debian by:
+
+    Jari Aalto <jari.aalto@cante.net> on Wed, 16 Dec 2009 02:52:24 +0200
+
+It was downloaded from:
+
+    http://freshmeat.net/projects/dos2unix
+    http://www.sourceforge.net/projects/dos2unix
+
+Upstream Authors:
+
+    Erwin Waterlander (Current maintainer) <waterlan@xs4all.nl>,
+    	  <waterlan@users.sourceforge.net>
+
+    Christian Wurll <wurll@ira.uka.de>
+    Bernd Johannes Wuebben <wuebben@kde.org>
+    Benjamin Lin <blin@socs.uts.edu.au>
+
+Copyright:
+
+    Copyright (C) 2009-2010 Erwin Waterlander
+    Copyright (C) 1998 Christian Wurll
+    Copyright (C) 1988 Bernd Johannes Wuebben
+    Copyright (C) 1989, 1994, 1995 Benjamin Lin
+
+License: MIT/X
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice in the documentation and/or other materials provided with
+       the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+    OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The Debian packaging is licensed under the GPL 2 or, (at your option),
+any later version, see below, and is:
+
+    Copyright (C) 2009-2010      Jari Aalto <jari.aalto@cante.net>
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in "/usr/share/common-licenses/GPL-2".
--- dos2unix-5.0.orig/debian/compat
+++ dos2unix-5.0/debian/compat
@@ -0,0 +1 @@
+7