diff -Nru rdtool-0.6.38/debian/changelog rdtool-0.6.38/debian/changelog --- rdtool-0.6.38/debian/changelog 2013-08-11 21:37:22.000000000 +0000 +++ rdtool-0.6.38/debian/changelog 2014-01-23 18:25:38.000000000 +0000 @@ -1,3 +1,15 @@ +rdtool (0.6.38-2) unstable; urgency=medium + + * Team upload. + * Change packaging to a more conventional gem2deb style + + drop dependency on cdbs and quilt + + drop explicit dependency on libruby* (Closes: #735658) + * Fix typo in package description + * Do not install TODO as documentation anymore + * Add simple DEP-3 headers to applied patches + + -- Cédric Boutillier Thu, 23 Jan 2014 19:13:13 +0100 + rdtool (0.6.38-1) unstable; urgency=low * Team upload. diff -Nru rdtool-0.6.38/debian/clean rdtool-0.6.38/debian/clean --- rdtool-0.6.38/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ rdtool-0.6.38/debian/clean 2014-01-23 18:25:38.000000000 +0000 @@ -0,0 +1,2 @@ +debian/rd2.1 +debian/rdswap.1 diff -Nru rdtool-0.6.38/debian/control rdtool-0.6.38/debian/control --- rdtool-0.6.38/debian/control 2013-08-11 21:36:25.000000000 +0000 +++ rdtool-0.6.38/debian/control 2014-01-23 18:25:38.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian Ruby Extras Maintainers Uploaders: akira yamada , Taku YASUI -Build-Depends: debhelper (>= 8), gem2deb (>= 0.2.13~), racc, quilt, cdbs -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 8), gem2deb (>= 0.2.13~), racc +Standards-Version: 3.9.5 Homepage: http://uwabami.github.com/rdtool/ Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/rdtool.git Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/rdtool.git;a=summary @@ -27,11 +27,8 @@ Package: ruby-rd Section: ruby Architecture: all -Depends: ${misc:Depends}, libruby1.8, libruby1.9.1 +Depends: ${misc:Depends} Conflicts: rdtool (<< 0.6.14-2) -Provides: librd-ruby1.8, librd-html-ext-ruby1.8, librd-html-ext-ruby, ruby-rd-html-ext -Replaces: librd-ruby1.8 (<< 0.6.31-1~), librd-html-ext-ruby1.8 (<< 0.1.4-3~), ruby-rd-html-ext (<< 0.1.4-3~) -Breaks: librd-ruby1.8 (<< 0.6.31-1~), librd-html-ext-ruby1.8 (<< 0.1.4-3~), ruby-rd-html-ext (<< 0.1.4-3~) Description: RDTool library for Ruby - library RD is multipurpose documentation format created for documentating Ruby and output of Ruby world. @@ -40,7 +37,7 @@ to read document in Ruby script. On the other hand, RD have a feature for class reference. . - This package contains a library which is usedgg by RDTool. + This package contains a library which is used by RDTool. Package: rdtool-elisp Architecture: all diff -Nru rdtool-0.6.38/debian/patches/010_change_dot_rd2rc_path rdtool-0.6.38/debian/patches/010_change_dot_rd2rc_path --- rdtool-0.6.38/debian/patches/010_change_dot_rd2rc_path 2012-05-16 13:55:57.000000000 +0000 +++ rdtool-0.6.38/debian/patches/010_change_dot_rd2rc_path 2014-01-23 18:25:38.000000000 +0000 @@ -1,3 +1,5 @@ +Description: use systemwide rd2 configuration file +Origin: vendor --- a/bin/rd2 +++ b/bin/rd2 @@ -77,10 +77,10 @@ diff -Nru rdtool-0.6.38/debian/patches/020_test_load_fix rdtool-0.6.38/debian/patches/020_test_load_fix --- rdtool-0.6.38/debian/patches/020_test_load_fix 2012-05-16 13:55:57.000000000 +0000 +++ rdtool-0.6.38/debian/patches/020_test_load_fix 2014-01-23 18:25:38.000000000 +0000 @@ -1,3 +1,6 @@ +Description: fix relative path to find dummy.rb as test/ is not in the loadpath +Origin: vendor + --- a/test/test-nonterminal-inline.rb +++ b/test/test-nonterminal-inline.rb @@ -2,7 +2,7 @@ diff -Nru rdtool-0.6.38/debian/ruby-rd.install rdtool-0.6.38/debian/ruby-rd.install --- rdtool-0.6.38/debian/ruby-rd.install 2012-05-16 13:55:57.000000000 +0000 +++ rdtool-0.6.38/debian/ruby-rd.install 2014-01-23 18:25:38.000000000 +0000 @@ -1 +1,3 @@ -/usr/lib/ruby +/usr/lib/ruby/vendor_ruby/rd/*.rb +/usr/lib/ruby/vendor_ruby/rd/*.ry +/usr/share/rubygems-integration/ diff -Nru rdtool-0.6.38/debian/rules rdtool-0.6.38/debian/rules --- rdtool-0.6.38/debian/rules 2012-05-16 13:55:57.000000000 +0000 +++ rdtool-0.6.38/debian/rules 2014-01-23 18:25:38.000000000 +0000 @@ -1,34 +1,24 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk +export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=1 +export DEB_DESTDIR=debian/tmp -DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR = debian/tmp -libdir := $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["vendordir"]') +%: + dh $@ --buildsystem=ruby --with ruby -clean:: - dh_ruby --clean - rm -f debian/rd2.1 debian/rdswap.1 RD2.1 RDSWAP.1 -configure/rdtool:: - dh_ruby --configure -build/rdtool:: - dh_ruby --build +override_dh_install: + mkdir -p $(DEB_DESTDIR)/etc/rdtool $(DEB_DESTDIR)/usr/share/emacs/site-lisp/rdtool-elisp + mv $(DEB_DESTDIR)/usr/bin/rdswap.rb $(DEB_DESTDIR)/usr/bin/rdswap + mv $(DEB_DESTDIR)/usr/lib/ruby/vendor_ruby/rd/dot.rd2rc $(DEB_DESTDIR)/etc/rdtool/rd2rc + cp utils/rd-mode.el $(DEB_DESTDIR)/usr/share/emacs/site-lisp/rdtool-elisp + dh_install -O--buildsystem=ruby - # Build manuals +override_dh_installman: ruby -Ilib bin/rd2 -rrd/rd2man-lib -oRD2 bin/rd2 mv RD2.1 debian/rd2.1 ruby -Ilib bin/rd2 -rrd/rd2man-lib -oRDSWAP debian/rdswap.rd mv RDSWAP.1 debian/rdswap.1 + dh_installman -install/rdtool:: - env DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=1 dh_ruby --install debian/tmp - install -D -m644 lib/rd/dot.rd2rc $(DEB_DESTDIR)/etc/rdtool/rd2rc - mv $(DEB_DESTDIR)/usr/bin/rdswap.rb $(DEB_DESTDIR)/usr/bin/rdswap - - # Remove needless files - rm -f $(DEB_DESTDIR)/$(libdir)/rd/dot.rd2rc - -install/rdtool-elisp:: - install -D -m644 utils/rd-mode.el $(DEB_DESTDIR)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el