[DRE-commits] [SCM] rdtool.git branch, master, updated. upstream/0.6.22-28-gf8749af
Taku YASUI
tach at debian.org
Sat May 5 17:33:27 UTC 2012
The following commit has been merged in the master branch:
commit c0882558c6db13d5851bb7fac911c942c17031a3
Author: Taku YASUI <tach at debian.org>
Date: Sat May 5 19:31:49 2012 +0900
Change several brand-new thing
* Change maintainer to Debian Ruby Extras Maintainers.
- akira yamada <akira at debian.org> and Taku YASUI <tach at debian.org>
are uploaders.
* Ruby package name transition
- Replace librd-ruby1.8 with ruby-rd
* Bump Standards-Verson to 3.9.3
* Bump compat level to 8
* Change project homepage
- http://uwabami.github.com/rdtool/
* Use cdbs to build package
* Change source format to '3.0 (quilt)'
diff --git a/debian/changelog b/debian/changelog
index ba9a38b..edd8e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
rdtool (0.6.31-1) unstable; urgency=low
- * New upstream release
-
- -- Taku YASUI <tach at debian.org> Sat, 05 May 2012 16:38:51 +0900
+ * New upstream release.
+ * Change maintainer to Debian Ruby Extras Maintainers.
+ - akira yamada <akira at debian.org> and Taku YASUI <tach at debian.org>
+ are uploaders.
+ * Ruby package name transition
+ - Replace librd-ruby1.8 with ruby-rd
+ * Bump Standards-Verson to 3.9.3
+ * Bump compat level to 8
+ * Change project homepage
+ - http://uwabami.github.com/rdtool/
+ * Use cdbs to build package
+ * Change source format to '3.0 (quilt)'
+
+ -- Taku YASUI <tach at debian.org> Sat, 05 May 2012 19:31:04 +0900
rdtool (0.6.22-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 14e3f46..03c6b3a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,18 @@
Source: rdtool
Section: text
Priority: optional
-Maintainer: akira yamada <akira at debian.org>
-Build-Depends: debhelper (>> 5)
+Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Uploaders: akira yamada <akira at debian.org>, Taku YASUI <tach at debian.org>
+Build-Depends: debhelper (>= 8)
Build-Depends-Indep: racc, ruby1.8, ruby1.8-dev
-Standards-Version: 3.8.1
-Homepage: http://rubyforge.org/projects/rdtool/
+Standards-Version: 3.9.3
+Homepage: http://uwabami.github.com/rdtool/
+Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/rdtool
+Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/rdtool
Package: rdtool
Architecture: all
-Depends: librd-ruby1.8 (= ${source:Version}), ruby1.8
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-rd (= ${source:Version})
Description: RD document formatter
RD is multipurpose documentation format created for documentating Ruby and
output of Ruby world.
@@ -21,12 +24,15 @@ Description: RD document formatter
RDtool is one of frontends of formatter for RD. This package provides rd2
command.
-Package: librd-ruby1.8
+Package: ruby-rd
Section: ruby
Architecture: all
-Depends: libruby1.8
+Depends: ${misc:Depends}, libruby1.8, libruby1.9.1
Conflicts: rdtool (<< 0.6.14-2)
-Description: RDTool library for Ruby 1.8
+Provides: librd-ruby1.8
+Replaces: librd-ruby1.8 (<< 0.6.31-1~)
+Breaks: librd-ruby1.8 (<< 0.6.31-1~)
+Description: RDTool library for Ruby
RD is multipurpose documentation format created for documentating Ruby and
output of Ruby world.
.
@@ -34,7 +40,7 @@ Description: RDTool library for Ruby 1.8
to read document in Ruby script. On the other hand, RD have a feature for
class reference.
.
- This package contains a library for Ruby 1.8 which is used by RDTool.
+ This package contains a library which is used by RDTool.
Package: rdtool-elisp
Architecture: all
@@ -50,3 +56,10 @@ Description: Emacs-lisp rd-mode for writing RD document
.
This package provides Emacs major-mode for RD editing.
+Package: librd-ruby1.8
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends}, ruby-rd
+Description: RDTool library for Ruby (transitional package)
+ This is a dummy transition package that can be safely removed once no
+ package depend on it.
diff --git a/debian/rules b/debian/rules
index 8112de4..1c5f2b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,22 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-pkg_name := rdtool
-ruby := ruby1.8
-libdir := $(shell $(ruby) -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
+include /usr/share/cdbs/1/rules/debhelper.mk
-el_name := rd-mode.el
-el_base := $(CURDIR)/debian/$(pkg_name)-elisp
-el_dir := $(el_base)/usr/share/emacs/site-lisp/$(pkg_name)-elisp
+libdir := $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["vendordir"]')
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+clean::
+ -ruby setup.rb clean
-build: build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- $(ruby) setup.rb config --rbdir='$$stdruby'
+configure/ruby-rd::
+ ruby setup.rb config --rbdir=$(libdir)
+build/rdtool::
$(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
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- -rm -f debian/rd2.1
- -rm -f debian/rdswap.1
- -rm -f debian/rmi2html.rb.1
-
- # Add here commands to clean up after the build process.
- -$(ruby) setup.rb clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
+install/ruby-rd::
$(ruby) setup.rb install --prefix=$(CURDIR)/debian/tmp
cp lib/rd/dot.rd2rc $(CURDIR)/debian/tmp$(libdir)/rd/
@@ -54,41 +25,5 @@ install: build
dh_movefiles
- install -d $(el_dir)
-
- install -m444 utils/rd-mode.el $(el_dir)
-
-# Build architecture-independent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-indep: build install
-# dh_testversion
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
-# dh_installmenu
- dh_installemacsen
-# dh_installpam
-# dh_installinit
-# dh_installcron
-# dh_installman -prdtool debian/rd2.1 debian/rmi2html.rb.1
-# dh_installinfo
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+install/rdtool-elisp::
+ install -D -m 444 utils/rd-mode.el $(cdbs_curdestdir)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
rdtool.git
More information about the Pkg-ruby-extras-commits
mailing list