diff -u jove-4.16.0.72/debian/changelog jove-4.16.0.72/debian/changelog --- jove-4.16.0.72/debian/changelog +++ jove-4.16.0.72/debian/changelog @@ -1,3 +1,11 @@ +jove (4.16.0.72-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Drop xjove binary removal, xview is being removed from the archive + (Closes: #596569, #478558) + + -- Moritz Muehlenhoff Tue, 24 May 2011 23:07:41 +0200 + jove (4.16.0.72-2.1) unstable; urgency=low * Non-maintainer upload. diff -u jove-4.16.0.72/debian/control jove-4.16.0.72/debian/control --- jove-4.16.0.72/debian/control +++ jove-4.16.0.72/debian/control @@ -1,6 +1,6 @@ Source: jove Section: editors -Build-Depends: debhelper (>= 7), po-debconf, libncurses-dev, groff, xviewg-dev [alpha armel hppa i386 mips mipsel powerpc s390 sh4 sparc] +Build-Depends: debhelper (>= 7), po-debconf, libncurses-dev, groff Priority: optional Maintainer: Cord Beermann Standards-Version: 3.8.4 @@ -18,12 +18 @@ - requirements comparable to vi(1). - -Package: xjove -Architecture: alpha armel hppa i386 mips mipsel powerpc s390 sh4 sparc -Depends: ${shlibs:Depends}, ${misc:Depends}, jove -Provides: editor -Description: X11-Frontend for jove - a compact, powerful editor - This is the X11-Frontend for jove. Jove is a compact, powerful Emacs-style - text-editor. It provides the common emacs keyboard bindings, together with a - reasonable assortment of the most popular advanced features (e.g. interactive - shell windows, compile-it, language specific modes) while weighing in with - CPU, memory, and disk requirements comparable to vi(1). + requirements comparable to vi(1). \ No newline at end of file reverted: --- jove-4.16.0.72/debian/xjove.menu +++ jove-4.16.0.72.orig/debian/xjove.menu @@ -1,7 +0,0 @@ -?package(xjove):\ - needs="X11"\ - hints="small, useful, featureful"\ - section="Applications/Editors"\ - title="Xjove"\ - longtitle="XJove, X-Frontend for Jonathan's Own Version of EMACS"\ - command="/usr/bin/xjove" diff -u jove-4.16.0.72/debian/rules jove-4.16.0.72/debian/rules --- jove-4.16.0.72/debian/rules +++ jove-4.16.0.72/debian/rules @@ -6,9 +6,6 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -# Testing for xviewg-dev -export XVIEW := $(shell test -f /usr/include/xview/xview.h && echo yes) - build: # does nothing. @@ -17,18 +14,9 @@ # $(MAKE) $(MAKE) SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" -build-xjove: -ifeq ($(XVIEW), yes) - dh_testdir - $(MAKE) makexjove -endif - binary: binary-arch binary-indep binary-arch: build install -ifneq ($(XVIEW), yes) - export DH_OPTIONS=-pjove -endif dh_testdir dh_testroot dh_installdebconf @@ -47,16 +35,11 @@ dh_md5sums -pjove dh_builddeb -pjove # dh_gencontrol or something seem to not honour DH_OPTIONS -ifeq ($(XVIEW), yes) - dh_gencontrol -pxjove - dh_md5sums -pxjove - dh_builddeb -pxjove -endif binary-indep: build install # does nothing. -install: build install-jove install-xjove +install: build install-jove install-jove: build-jove export DH_OPTIONS=-pjove @@ -68,20 +51,13 @@ -install-xjove: build-xjove -ifeq ($(XVIEW), yes) - export DH_OPTIONS=-pxjove - dh_testdir - dh_testroot - dh_installdirs - $(MAKE) installxjove DESTDIR=`pwd`/debian/xjove -endif - clean: dh_testdir dh_testroot $(MAKE) clean - $(MAKE) cleanxjove debconf-updatepo dh_clean # Local Variables: # mode: makefile # End variables + + +