--- ohcount-3.0.0.orig/debian/changelog
+++ ohcount-3.0.0/debian/changelog
@@ -0,0 +1,29 @@
+ohcount (3.0.0-2) unstable; urgency=low
+
+  * Missing dependency (Closes: #558491)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 29 Nov 2009 18:19:46 +0100
+
+ohcount (3.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * New package ohcount-doc added
+  * Homepage updated
+  * Vcs-* added
+  * Many changes on the debian/rules due to a refactoring from upstream which
+    has been done (patches are now obsolete or upstream)
+  * Upstream has redeveloped ohcount with C (instead of ruby). (Closes: #542892)
+  * Update of the watch file
+  * Repack script updated (upstream has a .so)
+  * Standards-Version updated to version 3.8.3
+  * Change of my email address since I am now DD 
+  * Standards-Version updated to 3.8.3
+  * DM-Upload-Allowed removed
+	
+ -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 27 Nov 2009 11:22:21 +0100
+
+ohcount (2.0.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #523006) 
+
+ -- Sylvestre Ledru <sylvestre.ledru@inria.fr>  Tue, 07 Apr 2009 20:18:38 +0200
--- ohcount-3.0.0.orig/debian/copyright
+++ ohcount-3.0.0/debian/copyright
@@ -0,0 +1,135 @@
+This package was debianized by Sylvestre Ledru <sylvestre.ledru@inria.fr> on
+Tue, 07 Apr 2009 20:18:38 +0200.
+
+It was downloaded from <http://labs.ohloh.net/ohcount/>
+
+Upstream Author:
+
+    Ohloh <info@ohloh.net>
+
+Copyright:
+
+    Copyright (C) 2007-2009 Ohloh
+
+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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+The full text of the license can be found in
+`/usr/share/common-licenses/GPL-2'.
+
+The Debian packaging is (C) 2009, Sylvestre Ledru <sylvestre.ledru@inria.fr> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+ohcount incorporates some piece of code in order to test during build time 
+its capabilities. These files are not included in the binary.
+
+
+Files: test/expected_dir/haxe1.hx  test/src_dir/haxe1.hx
+
+Copyright:
+		Thomas Pfeiffer - kiroukou
+		Niel Drummond
+
+License:
+    Copyright the original author or authors.
+    Licensed under the MOZILLA PUBLIC LICENSE, Version 1.1 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/MPL-1.1.html
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Files: test/src_dir/pascal2.pp test/expected_dir/pascal2.pp
+
+Copyright:
+		Simon Steele 1998-2000
+
+License:
+    BSD
+    Redistribution and use in source and binary forms, with or without 
+    modification, are permitted provided that the following conditions are
+    met:
+
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+    * Neither the name of the <ORGANIZATION> nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+The full text of the license can be found in
+`/usr/share/common-licenses/BSD'.
+
+Files: test/src_dir/js1.js test/expected_dir/js1.js
+
+Copyright: 
+    2005-2008 Sam Stephenson
+
+License:
+    MIT
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+
+Files: test/src_dir/foo.ebuild test/detect_files/foo.ebuild
+
+License: 
+		GPL-2
+
+Files: test/src_dir/as1.as test/expected_dir/as1.as
+
+Copyright:
+		Sean Chatman and Garrett Woodworth 2008
+
+License:
+		MIT
+
+Files: test/src_dir/perl_module.pm test/expected_dir/perl_module.pm
+
+Copyright: 
+		Audrey Tang 2003-2007
+
+License: 
+    This program is free software; you can redistribute it and/or modify it
+    under the same terms as Perl itself.
+
+    a) the GNU General Public License as published by the Free Software
+       Foundation; either version 1, or (at your option) any later
+       version, or
+
+    b) the "Artistic License" which comes with Perl.
+
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL' and
+    the Artistic Licence in `/usr/share/common-licenses/Artistic'.
--- ohcount-3.0.0.orig/debian/compat
+++ ohcount-3.0.0/debian/compat
@@ -0,0 +1 @@
+7
--- ohcount-3.0.0.orig/debian/orig-tar.exclude
+++ ohcount-3.0.0/debian/orig-tar.exclude
@@ -0,0 +1 @@
+*.so
--- ohcount-3.0.0.orig/debian/watch
+++ ohcount-3.0.0/debian/watch
@@ -0,0 +1,5 @@
+version=3
+http://sf.net/ohcount/ohcount-(\d+[0-9\-\.r]+)\.tar\.gz \
+debian debian/orig-tar.sh
+
+
--- ohcount-3.0.0.orig/debian/rules
+++ ohcount-3.0.0/debian/rules
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+libdir18 = $(shell ruby1.8 -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
+
+clean::
+	$(CURDIR)/build clean
+	rm -rf $(DEB_DESTDIR)
+
+build/ohcount::
+	$(CURDIR)/build all
+
+build/ohcount-doc::
+	(cd doc && doxygen Doxyfile)
+
+install/ohcount::
+		mkdir -p debian/ohcount/usr/bin debian/ohcount/$(libdir18)/ohcount/
+		cp bin/ohcount debian/ohcount/usr/bin/
+		cp -R ruby/gestalt ruby/gestalt.rb ruby/ohcount.rb debian/ohcount/$(libdir18)/ohcount/
+
+
+install/ohcount-doc::
+		mkdir -p debian/ohcount-doc/usr/share/doc/ohcount-doc
+		cp -aR doc/html/* debian/ohcount-doc/usr/share/doc/ohcount-doc
+		cp -a README debian/ohcount-doc/usr/share/doc/ohcount-doc
+
+get-orig-source:
+	uscan --force-download
--- ohcount-3.0.0.orig/debian/orig-tar.sh
+++ ohcount-3.0.0/debian/orig-tar.sh
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=ohcount-$2
+TAR=../ohcount_$2.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxf $3 
+# Remove vendor/ because it is including 
+tar -c -z -X debian/orig-tar.exclude -f $TAR $DIR/
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
+fi
+
--- ohcount-3.0.0.orig/debian/control
+++ ohcount-3.0.0/debian/control
@@ -0,0 +1,38 @@
+Source: ohcount
+Section: utils
+Priority: optional
+Maintainer: Sylvestre Ledru <sylvestre@debian.org>
+Uploaders: Torsten Werner <twerner@debian.org>
+Build-Depends: debhelper (>= 7), libpcre3-dev, ruby1.8, ruby1.8-dev, rake,
+ rubygems, ragel (>= 6.3), cdbs, libdifflcs-ruby, doxygen, gperf
+Standards-Version: 3.8.3
+Homepage: http://sourceforge.net/projects/ohcount/
+Vcs-Svn: https://bollin.googlecode.com/svn/ohcount/trunk
+Vcs-Browser: http://bollin.googlecode.com/svn/ohcount/trunk
+
+Package: ohcount
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, ruby1.8, 
+ libdifflcs-ruby
+Description: Source code line counter
+ Ohcount supports over 70 popular programming languages.
+ Ohcount does more than just count lines of code. It can also detect
+ popular open source licenses such as GPL within a large directory of source
+ code. It can also detect code that targets a particular programming API, 
+ such as Win32 or KDE. 
+ Ohcount is the line counter which powers http://www.ohloh.net/
+ .
+
+Package: ohcount-doc
+Section: doc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ohcount
+Description: Source code line counter - Documentation
+ Ohcount supports over 70 popular programming languages.
+ Ohcount does more than just count lines of code. It can also detect
+ popular open source licenses such as GPL within a large directory of source
+ code. It can also detect code that targets a particular programming API, 
+ such as Win32 or KDE. 
+ Ohcount is the line counter which powers http://www.ohloh.net/
+ .
+ This package contains the documentation.
