[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#777047: pu: vpim



Package: release.debian.org
Tags: wheezy
User: release.debian.org@packages.debian.org
UserTags: unblock

The package vpim in wheezy is broken, wheezy has Ruby 1.9 but the
package installs files for Ruby 1.8.  Here is the bug:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682772

The package was fixed with an NMU for jessie, this should also be
uploaded to wheezy-proposed-updates

Please confirm if I can upload the jessie version to wheezy-proposed-updates

I've asked DSA to install it to ullmann.debian.org, please add it to
wheezy-updates if possible to make that easier.

Please let me know if I have written the changelog entry correctly or if
I need to change anything else.


diff -u vpim-0.695/debian/rules vpim-0.695/debian/rules
--- vpim-0.695/debian/rules
+++ vpim-0.695/debian/rules
@@ -28,12 +28,13 @@
 installdoc = install -g root -o root -m 644
 
 build:
-	ruby setup.rb config --installdirs=std
-	ruby setup.rb setup
+	dh_ruby --setuprb --build
 	touch stamp-build
 
 clean: debclean
+	dh_ruby --setuprb --clean
 	ruby setup.rb distclean
+	rm -f debian/vpim.substvars
 	rm -f stamp-build
 
 debclean:
@@ -44,6 +45,9 @@
 binary-arch:
 # Nothing to be done here
 
+export DH_RUBY_IGNORE_TESTS=require-rubygems
+export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=yes
+
 binary-indep: debclean
 	test -f stamp-build || $(MAKE) -f debian/rules build
 	$(installbin) -d debian/tmp/DEBIAN
@@ -56,7 +60,7 @@
 	$(installdoc) debian/copyright debian/tmp/usr/share/doc/$(package)/
 	$(installdoc) debian/README.Debian debian/tmp/usr/share/doc/$(package)/
 	#
-	ruby setup.rb install --prefix=debian/tmp
+	dh_ruby --setuprb --install debian/tmp
 	$(installdoc) CHANGES debian/tmp/usr/share/doc/$(package)/changelog
 	$(installdoc) samples/README.mutt debian/tmp/usr/share/doc/$(package)/
 	$(installdoc) README debian/tmp/usr/share/doc/$(package)/
diff -u vpim-0.695/debian/control vpim-0.695/debian/control
--- vpim-0.695/debian/control
+++ vpim-0.695/debian/control
@@ -2,14 +2,15 @@
 Section: libs
 Priority: optional
 Maintainer: Joey Schulze <joey@debian.org>
-Build-Depends: ruby, ruby1.8
+Build-Depends: gem2deb
 Standards-Version: 3.8.0
+XS-Ruby-Versions: all
 
 Package: vpim
 Architecture: all
 Section: libs
 Priority: optional
-Depends: ruby, ruby1.8
+Depends: ruby
 Suggests: facter
 Description: Ruby support for vCard and iCalendar
  This package provides calendaring, scheduling, and contact support
diff -u vpim-0.695/debian/changelog vpim-0.695/debian/changelog
--- vpim-0.695/debian/changelog
+++ vpim-0.695/debian/changelog
@@ -1,3 +1,22 @@
+vpim (0.695-1.1+deb7u1) wheezy-proposed-updates; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport the fix uploaded to jessie for #682772
+
+ -- Daniel Pocock <daniel@pocock.pro>  Tue, 03 Feb 2015 20:37:43 +0100
+
+vpim (0.695-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Port to Ruby 1.9+ (Closes: #682772)
+    - debian/control: change Build-Depends to gem2deb; drop dependency on
+      ruby1.8
+    - debian/rules: change build to call `dh_ruby --setuprb` instead of
+      manually calling `ruby setup.rb`. This will make sure the package will
+      install code that is available for all Ruby interpreters.
+
+ -- Antonio Terceiro <terceiro@debian.org>  Wed, 15 Jan 2014 13:30:44 +0100
+
 vpim (0.695-1) unstable; urgency=low
 
   * New upstream release

Reply to: