tags 565847 + patch
thanks
Hi Michael,
On 19/01/10 at 13:34 +1300, Lucas Nussbaum wrote:
> Package: libncurses-ruby1.9
> Version: 1.2.4-1
> Severity: serious
> User: debian-r...@lists.debian.org
> Usertags: ruby190transition
>
> Hi,
>
> Ruby 1.9.0 is going away in Squeeze, replaced by Ruby 1.9.1. This
> transition is made mandatory by API changes upstream.
>
> Your package currently ships some files in /usr/lib/ruby/1.9.0. This
> will no longer work with 1.9.1.
>
> You can either:
> - port your package to Ruby 1.9.1
> - drop the Ruby 1.9.X binary package
>
> There is (or will be) more information on
> http://wiki.debian.org/Ruby191Transition
The attached patch fixes that issue. I've also converted the package to
use ruby-pkg-tools, since it makes things much easier. I've _not_
uploaded to DELAYED due the the large changes (switch to cdbs).
Please tell me what you think. Also, if you are interested, we could
probably maintain this inside the pkg-ruby-extras team.
--
| Lucas Nussbaum
| lu...@lucas-nussbaum.net http://www.lucas-nussbaum.net/ |
| jabber: lu...@nussbaum.fr GPG: 1024D/023B3F4F |
reverted:
--- ncurses-ruby-1.2.4/debian/libncurses-ruby1.9.examples
+++ ncurses-ruby-1.2.4.orig/debian/libncurses-ruby1.9.examples
@@ -1,6 +0,0 @@
-examples/example.rb
-examples/hello_ncurses.rb
-examples/rain.rb
-examples/read_line.rb
-examples/tclock.rb
-examples/test_scanw.rb
diff -u ncurses-ruby-1.2.4/debian/rules ncurses-ruby-1.2.4/debian/rules
--- ncurses-ruby-1.2.4/debian/rules
+++ ncurses-ruby-1.2.4/debian/rules
@@ -3,76 +3,2 @@
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- rm -rf build-1.9 build-1.8
- mkdir build-1.9 build-1.8
- ruby1.9 -C build-1.9 ../extconf.rb
- sed -i -e 's/-shared/-shared -fPIC/g' -i -e 's/\/local\/lib\/site_ruby/\/lib\/ruby\//g' build-1.9/Makefile
- ruby1.8 -C build-1.8 ../extconf.rb
- sed -i -e 's/-shared/-shared -fPIC/g' -i -e 's/\/local\/lib\/site_ruby/\/lib\/ruby\//g' build-1.8/Makefile
-
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- $(MAKE) -C build-1.9/
- $(MAKE) -C build-1.8/
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- rm -rf build-1.9 build-1.8
- rm -f mkmf.log
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
-
- $(MAKE) -C build-1.9/ install DESTDIR=$(CURDIR)/debian/libncurses-ruby1.9/
- rm -rf $(CURDIR)/debian/usr/lib/ruby/1.9/
- $(MAKE) -C build-1.8/ install DESTDIR=$(CURDIR)/debian/libncurses-ruby1.8/
-
- dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs Changes
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
diff -u ncurses-ruby-1.2.4/debian/control ncurses-ruby-1.2.4/debian/control
--- ncurses-ruby-1.2.4/debian/control
+++ ncurses-ruby-1.2.4/debian/control
@@ -2,12 +2,12 @@
Section: ruby
Priority: optional
Maintainer: Michael Ablassmeier <a...@debian.org>
-Build-Depends: debhelper (>= 5.0), ruby1.8, ruby1.9, libncurses-dev, ruby1.9-dev, ruby1.8-dev
+Build-Depends: debhelper (>= 5.0), ruby1.8, ruby1.9.1, libncurses-dev, ruby1.9.1-dev, ruby1.8-dev, ruby-pkg-tools (>= 0.17), cdbs
Standards-Version: 3.8.2
Package: libncurses-ruby
Architecture: all
-Depends: libncurses-ruby1.8 (<< 1.8.1)
+Depends: libncurses-ruby1.8 (<< 1.8.1), ${misc:Depends}
Description: ruby Extension for the ncurses C library
All C functions are wrapped by module functions of the module "Ncurses",
with exactly the same name. Additionally, C functions expecting a WINDOW* as
@@ -22,7 +22,7 @@
Package: libncurses-ruby1.8
Architecture: any
-Depends: ${shlibs:Depends}, ruby1.8
+Depends: ${shlibs:Depends}, ruby1.8, ${misc:Depends}
Description: ruby Extension for the ncurses C library
All C functions are wrapped by module functions of the module "Ncurses",
with exactly the same name. Additionally, C functions expecting a WINDOW* as
@@ -32,9 +32,9 @@
The panel library (for support of overlapping windows) is also wrapped, in
the module "Ncurses::Panel".
-Package: libncurses-ruby1.9
+Package: libncurses-ruby1.9.1
Architecture: any
-Depends: ${shlibs:Depends}, ruby1.9
+Depends: ${shlibs:Depends}, ruby1.9.1, ${misc:Depends}
Description: ruby Extension for the ncurses C library
All C functions are wrapped by module functions of the module "Ncurses",
with exactly the same name. Additionally, C functions expecting a WINDOW* as
diff -u ncurses-ruby-1.2.4/debian/changelog ncurses-ruby-1.2.4/debian/changelog
--- ncurses-ruby-1.2.4/debian/changelog
+++ ncurses-ruby-1.2.4/debian/changelog
@@ -1,3 +1,10 @@
+ncurses-ruby (1.2.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop 1.9 package, add 1.9.1 package. Closes: #501294, #565847.
+
+ -- Lucas Nussbaum <lu...@lucas-nussbaum.net> Wed, 20 Jan 2010 21:40:45 +1300
+
ncurses-ruby (1.2.4-1) unstable; urgency=low
* New upstream release
only in patch2:
unchanged:
--- ncurses-ruby-1.2.4.orig/debian/libncurses-ruby1.9.1.examples
+++ ncurses-ruby-1.2.4/debian/libncurses-ruby1.9.1.examples
@@ -0,0 +1,6 @@
+examples/example.rb
+examples/hello_ncurses.rb
+examples/rain.rb
+examples/read_line.rb
+examples/tclock.rb
+examples/test_scanw.rb
