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

Bug#776227: unblock: qtruby/4.11.3-4.1



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package qtruby

clean up diversions remaining from libqt4-ruby1.8/lenny
that would cause the /usr/bin/rbqtapi binary being diverted
away in jessie (#775894)

minor build system tweak to allow arch-indep-only builds:
override_dh_installexamples -> override_dh_installexamples-arch

unblock qtruby/4.11.3-4.1


Andreas
diff -Nru qtruby-4.11.3/debian/changelog qtruby-4.11.3/debian/changelog
--- qtruby-4.11.3/debian/changelog	2014-05-19 00:39:40.000000000 +0200
+++ qtruby-4.11.3/debian/changelog	2015-01-25 15:42:39.000000000 +0100
@@ -1,3 +1,13 @@
+qtruby (4:4.11.3-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload with maintainer approval.
+  * ruby-qt4.postinst: Clean up obsolete diversions of rbqtapi dating back to
+    libqt4-ruby1.8/lenny.  (Closes: #775894)
+  * Allow arch-indep-only builds by restricting the dh_installexamples
+    override to arch-specific builds.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sun, 25 Jan 2015 12:43:54 +0100
+
 qtruby (4:4.11.3-4) unstable; urgency=medium
 
   * Build against Ruby 2.1.
diff -Nru qtruby-4.11.3/debian/ruby-qt4.postinst qtruby-4.11.3/debian/ruby-qt4.postinst
--- qtruby-4.11.3/debian/ruby-qt4.postinst	1970-01-01 01:00:00.000000000 +0100
+++ qtruby-4.11.3/debian/ruby-qt4.postinst	2015-01-25 00:32:48.000000000 +0100
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+# clean up obsolete diversions dating back to libqt4-ruby1.8/lenny
+# perform the cleanup here in the "successor" ruby-qt4 since the
+# transitional package libqt4-ruby1.8 may already have been removed
+if [ "$1" = "configure" ]; then
+	if [ -n "$(dpkg-divert --listpackage /usr/bin/rbqtapi)" ]; then
+		dpkg-divert --remove --rename --package libqt4-ruby1.8 \
+			--divert /usr/bin/rbqtapi.qt3 /usr/bin/rbqtapi
+	fi
+	if [ -n "$(dpkg-divert --listpackage /usr/share/man/man1/rbqtapi.1.gz)" ]; then
+		dpkg-divert --remove --rename --package libqt4-ruby1.8 \
+			--divert /usr/share/man/man1/rbqtapi.qt3.1.gz \
+			/usr/share/man/man1/rbqtapi.1.gz 
+	fi
+fi
+
+#DEBHELPER#
diff -Nru qtruby-4.11.3/debian/rules qtruby-4.11.3/debian/rules
--- qtruby-4.11.3/debian/rules	2014-05-11 15:01:19.000000000 +0200
+++ qtruby-4.11.3/debian/rules	2015-01-25 15:38:21.000000000 +0100
@@ -25,8 +25,8 @@
 override_dh_compress:
 	dh_compress -X.rb -X.ui -X.mng -X.xbel
 
-override_dh_installexamples:
-	dh_installexamples
+override_dh_installexamples-arch:
+	dh_installexamples -a
 	tar cvzf $(CURDIR)/debian/ruby-qt4/usr/share/doc/ruby-qt4/examples.tar.gz examples
 
 override_dh_makeshlibs:

Reply to: