[pkg-java] r11567 - trunk/checkstyle/debian

[Torsten Werner]

Author: twerner
Date: 2010-02-11 20:56:48 +0000 (Thu, 11 Feb 2010)
New Revision: 11567

Modified:
   trunk/checkstyle/debian/changelog
   trunk/checkstyle/debian/rules
Log:
merge changes from 4.4 branch


Modified: trunk/checkstyle/debian/changelog
===================================================================
--- trunk/checkstyle/debian/changelog	2010-02-11 20:55:58 UTC (rev 11566)
+++ trunk/checkstyle/debian/changelog	2010-02-11 20:56:48 UTC (rev 11567)
@@ -9,6 +9,12 @@
 
  -- Michael Koch <konqueror at gmx.de>  Sun, 27 Sep 2009 11:25:29 +0200
 
+checkstyle (4.4+dfsg-5) unstable; urgency=high
+
+  * Switch to fromdos and todos which fixes a FTBFS. (Closes: #569424)
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 11 Feb 2010 21:48:55 +0100
+
 checkstyle (4.4+dfsg-4) unstable; urgency=low
 
   [ Dominik Smatana ]

Modified: trunk/checkstyle/debian/rules
===================================================================
--- trunk/checkstyle/debian/rules	2010-02-11 20:55:58 UTC (rev 11566)
+++ trunk/checkstyle/debian/rules	2010-02-11 20:56:48 UTC (rev 11567)
@@ -28,10 +28,10 @@
 	rm -rf orig_tmp
 
 makebuilddir/checkstyle::
-	dos2unix build.xml
+	fromdos build.xml
 
 clean::
-	unix2dos build.xml
+	todos build.xml
 
 binary-post-install/checkstyle::
 	dh_install target/dist/$(PACKAGE)-$(VERSION)/$(PACKAGE)-$(VERSION).jar usr/share/java