severity 733724 serious
thanks
Hello ohcount-Maintainer,
we want to remove Ruby1.8 and rubygems from the archive. An patch is included
to fix that
problem.
Please feel free to use that and upload your package to unstable.
Thanks,
Jonasdiff --git a/debian/control b/debian/control
index 52dd620..6ffe9b1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,18 @@ Source: ohcount
Section: utils
Priority: optional
Maintainer: Sylvestre Ledru <sylves...@debian.org>
-Build-Depends: debhelper (>= 7), libpcre3-dev, ruby1.8, ruby1.8-dev, rake,
- rubygems, ragel (>= 6.3), cdbs, ruby-diff-lcs, doxygen, gperf, quilt,
- file
+Build-Depends: debhelper (>= 7), libpcre3-dev, gem2deb, rake,
+ ragel (>= 6.3), ruby-diff-lcs, doxygen, gperf, file
Standards-Version: 3.9.4
Homepage: http://sourceforge.net/projects/ohcount/
Vcs-Svn: https://bollin.googlecode.com/svn/ohcount/trunk
Vcs-Browser: http://bollin.googlecode.com/svn/ohcount/trunk
+XS-Ruby-Versions: all
Package: ohcount
+XB-Ruby-Versions: ${ruby:Versions}
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby, ruby1.8,
+Depends: ruby | ruby-interpreter, ${shlibs:Depends}, ${misc:Depends},
ruby-diff-lcs, file
Suggests: ohcount-doc
Description: Source code line counter
@@ -32,8 +33,8 @@ 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.
+ 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.
diff --git a/debian/ohcount-doc.doc-base b/debian/ohcount-doc.doc-base
new file mode 100644
index 0000000..dbb3297
--- /dev/null
+++ b/debian/ohcount-doc.doc-base
@@ -0,0 +1,9 @@
+Document: ohcount
+Title: Debian ohcount Manual
+Author: Ohloh
+Abstract: ohcount manual
+Section: Programming/Ruby
+
+Format: HTML
+Index: /usr/share/doc/ohcount-doc/index.html
+Files: /usr/share/doc/ohcount-doc/*
diff --git a/debian/ohcount-doc.docs b/debian/ohcount-doc.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/ohcount-doc.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/rules b/debian/rules
index c6851b0..653a282 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,28 @@
#!/usr/bin/make -f
-export DH_VERBOSE=1
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.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
+%:
+ dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_clean:
+ dh_auto_clean -O--buildsystem=ruby
+ ./build clean
+ rm -rf doc_build
+
+override_dh_install:
+ ./build all
+ dh_install --buildsystem=ruby --with ruby
+ install -d debian/ohcount/usr/lib/ruby/vendor_ruby/ohcount
+ install -d debian/ohcount/bin
+ install -d debian/ohcount-doc/usr/share/doc/ohcount-doc
+ cp bin/ohcount debian/ohcount/usr/bin/
+ cp -R ruby/gestalt ruby/gestalt.rb ruby/ohcount.rb debian/ohcount/usr/lib/ruby/vendor_ruby/ohcount/
+ # build doxygen
+ mkdir doc_build
+ cp -aR doc/* doc_build/
+ (cd doc_build && doxygen Doxyfile)
+ cp -aR doc_build/html/* debian/ohcount-doc/usr/share/doc/ohcount-doc
+ rm -rf debian/ohcount/ruby
+ rmdir debian/ohcount/bin
get-orig-source:
uscan --force-download
