diff -Nru hyperestraier-1.4.13/debian/changelog hyperestraier-1.4.13/debian/changelog --- hyperestraier-1.4.13/debian/changelog 2013-10-24 12:37:00.000000000 +0000 +++ hyperestraier-1.4.13/debian/changelog 2014-04-06 14:28:09.000000000 +0000 @@ -1,3 +1,21 @@ +hyperestraier (1.4.13-12ubuntu1) trusty; urgency=medium + + * Merge with Debian; remaining changes: + - Transition package to use default Java implementation: + + d/control: BD on default-jdk instead of openjdk-7-jdk. + * Build on every architecture. + + -- Matthias Klose Sun, 06 Apr 2014 16:22:24 +0200 + +hyperestraier (1.4.13-12) unstable; urgency=low + + * Remove transitional packages. + * Drop ruby1.8 support. + * Fix build rules for ruby bindings. (Closes: #735475) + Thanks for Jonas Genannt + + -- KURASHIKI Satoru Thu, 26 Dec 2013 09:10:10 +0900 + hyperestraier (1.4.13-11ubuntu1) trusty; urgency=low * Resynchronise with Debian. Remaining changes: diff -Nru hyperestraier-1.4.13/debian/control hyperestraier-1.4.13/debian/control --- hyperestraier-1.4.13/debian/control 2013-10-24 12:36:35.000000000 +0000 +++ hyperestraier-1.4.13/debian/control 2014-04-06 14:27:59.000000000 +0000 @@ -3,14 +3,15 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: KURASHIKI Satoru -Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, zlib1g-dev, libqdbm-dev (>= 1.8.75), libfcgi-dev (>= 2.4.0-6), ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, default-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe s390 sparc], chrpath, perl +Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, zlib1g-dev, libqdbm-dev (>= 1.8.75), libfcgi-dev (>= 2.4.0-6), gem2deb, default-jdk [linux-any], chrpath, perl Standards-Version: 3.9.4 Homepage: http://fallabs.com/hyperestraier/ Vcs-Git: git://anonscm.debian.org/collab-maint/hyperestraier.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/hyperestraier.git +XS-Ruby-Versions: all Package: hyperestraier -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: wv, xlhtml, ppthtml, poppler-utils, wordnet Description: full-text search system for communities @@ -31,7 +32,7 @@ the network using node API. Package: libestraier8 -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: full-text search system Libraries [runtime] Hyper Estraier is a full-text search system. @@ -40,7 +41,7 @@ Package: libestraier-dev Section: libdevel -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 +Architecture: any Depends: ${shlibs:Depends}, libestraier8 (= ${binary:Version}), ${misc:Depends}, zlib1g-dev, libqdbm-dev Description: full-text search system Libraries [development] Hyper Estraier is a full-text search system. @@ -48,7 +49,9 @@ library. Package: ruby-hyperestraier -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 +XB-Ruby-Versions: ${ruby:Versions} +X-DhRuby-Root: rubynative/src +Architecture: any Section: ruby Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: ruby-hyperestraier-doc @@ -77,44 +80,8 @@ This is the documentation package, with upstream documentation, as well as generated rdoc. -Package: libestraier-ruby -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 -Section: oldlibs -Priority: extra -Depends: ${misc:Depends}, ruby-hyperestraier -Suggests: hyperestraier, ruby-hyperestraier-doc -Description: Hyper Estraier Node API Libraries for Ruby (transitional package) - This is a dummy package to ease transition to new package name. - -Package: libestraier-ruby1.8 -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 -Section: oldlibs -Priority: extra -Depends: ${shlibs:Depends}, ruby-hyperestraier, ${misc:Depends} -Suggests: hyperestraier, ruby-hyperestraier-doc -Description: Hyper Estraier Node API Libraries for Ruby 1.8 (transitional package) - This is a dummy package to ease transition to new package name. - -Package: libestraier-ruby1.9.1 -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 -Section: oldlibs -Priority: extra -Depends: ${shlibs:Depends}, ruby-hyperestraier, ${misc:Depends} -Suggests: hyperestraier, ruby-hyperestraier-doc -Description: Hyper Estraier Node API Libraries for Ruby 1.9.1 (transitional package) - This is a dummy package to ease transition to new package name. - -Package: libestraier-ruby-doc -Architecture: all -Section: oldlibs -Priority: extra -Depends: ${misc:Depends}, ruby-hyperestraier-doc -Suggests: ruby-hyperestraier -Description: Hyper Estraier Node API Libraries for Ruby doc (transitional package) - This is a dummy package to ease transition to new package name. - Package: libestraier-java -Architecture: linux-amd64 armel linux-i386 ia64 mips mipsel powerpc powerpcspe s390 sparc alpha armhf ppc64 +Architecture: any Section: java Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: hyperestraier, java-virtual-machine @@ -124,7 +91,7 @@ Hyper Estraier. Package: libestraier-perl -Architecture: i386 amd64 armel armhf ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 sparc hurd-i386 +Architecture: any Section: perl Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} Suggests: hyperestraier, perl diff -Nru hyperestraier-1.4.13/debian/ruby-hyperestraier.dirs hyperestraier-1.4.13/debian/ruby-hyperestraier.dirs --- hyperestraier-1.4.13/debian/ruby-hyperestraier.dirs 2013-06-27 11:32:56.000000000 +0000 +++ hyperestraier-1.4.13/debian/ruby-hyperestraier.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/ruby -usr/bin diff -Nru hyperestraier-1.4.13/debian/ruby-hyperestraier.examples hyperestraier-1.4.13/debian/ruby-hyperestraier.examples --- hyperestraier-1.4.13/debian/ruby-hyperestraier.examples 2013-06-27 11:32:56.000000000 +0000 +++ hyperestraier-1.4.13/debian/ruby-hyperestraier.examples 2014-01-16 11:20:25.000000000 +0000 @@ -1,3 +1,2 @@ rubypure/pure rubynative/native -rubynative19/native diff -Nru hyperestraier-1.4.13/debian/rules hyperestraier-1.4.13/debian/rules --- hyperestraier-1.4.13/debian/rules 2013-06-27 11:32:56.000000000 +0000 +++ hyperestraier-1.4.13/debian/rules 2014-01-16 11:20:25.000000000 +0000 @@ -11,7 +11,7 @@ # build-arch and build-indep targets by Bill Allombert 2001 # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 # This has to be exported to make some magic below work. export DH_OPTIONS @@ -34,8 +34,6 @@ JAVA_UNSUPPORTED_SYSTEMS = zkfreebsd-gnuz zgnuz RUBYLIBDIR=/usr/lib/ruby/vendor_ruby -RUBY18ARCHDIR=/usr/lib/ruby/vendor_ruby/1.8/$$(arch) -RUBY19ARCHDIR=/usr/lib/ruby/vendor_ruby/1.9.1/$$(arch) export CFLAGS += `dpkg-buildflags --get CFLAGS` export CPPFLAGS += `dpkg-buildflags --get CPPFLAGS` @@ -73,13 +71,8 @@ cp -f /usr/share/misc/config.guess config.guess endif $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES) -# cp -pR rubypure rubypure19 cd rubypure && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES) -# cd rubypure19 && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES) $(MAKE) - cp -pR rubynative rubynative19 - cd rubynative && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES) - cd rubynative19 && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES) ifeq "$(BUILD_JAVA)" "true" cd javapure && $(CONFIGURE_VARS) ./configure $(CONFIGURE_SWITCHES) \ --libdir=\$${prefix}/share/hyperestraier @@ -99,9 +92,7 @@ $(MAKE) estseek.fcgi cd rubypure && $(MAKE) perl -p -i -e 's@^#! /usr/bin/ruby1\.8 -w@#! /usr/bin/ruby -w@' rubypure/estcall.rb - export RUBY=/usr/bin/ruby1.8 && cd rubynative && $(MAKE) && $(MAKE) check - export RUBY=/usr/bin/ruby1.9.1 && cd rubynative19 && $(MAKE) && $(MAKE) check - perl -p -i -e 's@^#! /usr/bin/ruby1\.8 -w@#! /usr/bin/ruby1.9.1 -w@' rubynative19/estcmd.rb + perl -p -i -e 's@^#! /usr/bin/ruby1\.8 -w@#! /usr/bin/ruby -w@' rubynative/estcmd.rb ifeq "$(BUILD_JAVA)" "true" cd javapure && $(MAKE) cd javanative && $(MAKE) && $(MAKE) check @@ -118,7 +109,7 @@ dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp binary-arch-stamp binary-indep-stamp - rm -rf config.sub config.guess rubypure19 rubynative19 rubypure/pure rubynative/native + rm -rf config.sub config.guess rubypure/pure rubynative/native # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean -cd rubypure && $(MAKE) distclean @@ -145,19 +136,14 @@ cp -Rf rubypure/estraierpure.rb $(CURDIR)/debian/ruby-hyperestraier/$(RUBYLIBDIR) install -m 644 rubynative/estraier-doc.rb $(CURDIR)/debian/ruby-hyperestraier/$(RUBYLIBDIR) - mkdir -p $(CURDIR)/debian/ruby-hyperestraier/$(RUBY18ARCHDIR) - cp -Rf rubynative/src/estraier.so $(CURDIR)/debian/ruby-hyperestraier/$(RUBY18ARCHDIR) - - mkdir -p $(CURDIR)/debian/ruby-hyperestraier/$(RUBY19ARCHDIR) - cp -Rf rubynative19/src/estraier.so $(CURDIR)/debian/ruby-hyperestraier/$(RUBY19ARCHDIR) + # build Ruby with gem2deb + dh_ruby --install # create example directory tree cp -pR rubypure/example rubypure/pure cp -Rf rubypure/estcall.rb rubypure/pure cp -pR rubynative/example rubynative/native cp -Rf rubynative/estcmd.rb rubynative/native - cp -pR rubynative19/example rubynative19/native - cp -Rf rubynative19/estcmd.rb rubynative19/native ifeq "$(BUILD_JAVA)" "true" cd javapure && $(MAKE) install DESTDIR=$(CURDIR)/debian/libestraier-java