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

Bug#776372: unblock: xemacs21/21.4.22-11



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

Please unblock package xemacs21 to allow a fix for #775733
(xemacs21-gnome-*: hangs during upgrade from squeeze -> wheezy ->
jessie) into testing; the hang was triggered in some transitional
packages which have been present for more than one release (and we
managed to miss xemacs21 entirely in wheezy) so I've just dropped those
packages.

diff -Nru xemacs21-21.4.22/debian/changelog xemacs21-21.4.22/debian/changelog
--- xemacs21-21.4.22/debian/changelog	2014-10-16 12:59:17.000000000 +0100
+++ xemacs21-21.4.22/debian/changelog	2015-01-19 12:23:54.000000000 +0000
@@ -1,3 +1,10 @@
+xemacs21 (21.4.22-11) unstable; urgency=low
+
+  * Remove GNOME transitional packages which have been present for more
+    than one release already to avoid hang (closes: #775733).
+
+ -- Mark Brown <broonie@debian.org>  Mon, 19 Jan 2015 12:23:03 +0000
+
 xemacs21 (21.4.22-10) unstable; urgency=medium
 
   * Only create symlinks for old etc and lisp directories in the support
diff -Nru xemacs21-21.4.22/debian/control xemacs21-21.4.22/debian/control
--- xemacs21-21.4.22/debian/control	2014-10-15 10:14:35.000000000 +0100
+++ xemacs21-21.4.22/debian/control	2015-01-19 12:23:01.000000000 +0000
@@ -138,42 +138,3 @@
  .
  The major reason to install this package is if you want to learn
  elisp or modify the libraries for your specific installation.
-
-Package: xemacs21-gnome-mule
-Section: gnome
-Architecture: any
-Depends: xemacs21-mule, ${misc:Depends}
-Description: highly customizable text editor -- transitional package
- XEmacs is a full fledged programming language with a mail reader,
- news reader, info browser, web browser, calendar, specialized editor
- for more programming languages and other formats than most people
- encounter in a lifetime, and much more.
- .
- This is a transitional package.  Please use xemacs21-mule
- instead.  It can be safely removed.
-
-Package: xemacs21-gnome-nomule
-Section: gnome
-Architecture: any
-Depends: xemacs21-nomule, ${misc:Depends}
-Description: highly customizable text editor -- transitional package
- XEmacs is a full fledged programming language with a mail reader,
- news reader, info browser, web browser, calendar, specialized editor
- for more programming languages and other formats than most people
- encounter in a lifetime, and much more.
- .
- This is a transitional package.  Please use xemacs21-nomule
- instead.  It can be safely removed.
-
-Package: xemacs21-gnome-mule-canna-wnn
-Section: gnome
-Architecture: any
-Depends: xemacs21-mule-canna-wnn, ${misc:Depends}
-Description: highly customizable text editor -- transitional package
- XEmacs is a full fledged programming language with a mail reader,
- news reader, info browser, web browser, calendar, specialized editor
- for more programming languages and other formats than most people
- encounter in a lifetime, and much more.
- .
- This is a transitional package.  Please use xemacs21-mule-canna-wnn
- instead.  It can be safely removed.
diff -Nru xemacs21-21.4.22/debian/PackagesMakefile.in xemacs21-21.4.22/debian/PackagesMakefile.in
--- xemacs21-21.4.22/debian/PackagesMakefile.in	2014-01-23 10:42:49.000000000 +0000
+++ xemacs21-21.4.22/debian/PackagesMakefile.in	2015-01-19 13:02:30.000000000 +0000
@@ -15,20 +15,19 @@
 
 binary-indep: xemacs@MAJVERSION@@SUBNAME@ xemacs@MAJVERSION@@SUBNAME@-supportel xemacs@MAJVERSION@@SUBNAME@-support #xemacs@MAJVERSION@@SUBNAME@-dochtml
 
-binary-arch: xemacs@MAJVERSION@@SUBNAME@-nomule xemacs@MAJVERSION@@SUBNAME@-mule xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn xemacs@MAJVERSION@@SUBNAME@-gnome-nomule xemacs@MAJVERSION@@SUBNAME@-gnome-mule xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn xemacs@MAJVERSION@@SUBNAME@-bin
+binary-arch: xemacs@MAJVERSION@@SUBNAME@-nomule xemacs@MAJVERSION@@SUBNAME@-mule xemacs@MAJVERSION@@SUBNAME@-mule-canna-wnn xemacs@MAJVERSION@@SUBNAME@-bin
 
 clean:
 	-rm -rf @TOPDIR@/debian/build
 	-rm -f html-build-stamp
 	-rm -f canna-wnn-build-stamp mule-build-stamp nomule-build-stamp
-	-rm -f gnome-canna-wnn-build-stamp gnome-mule-build-stamp gnome-nomule-build-stamp
 	-rm -f general-build-stamp
 	-rm -f debian/xemacs@MAJVERSION@.info.gz
 	# this makes sure we don't get a HUGE (meg size) .diff.gz and
 	# causes no harm since we have to run autoconf at the begining
 	#-rm -f configure
 	rm -f config.sub config.guess
-	for i in mule nomule mule-canna-wnn gnome-mule gnome-nomule gnome-mule-canna-wnn ; do \
+	for i in mule nomule mule-canna-wnn ; do \
 	  rm -f lib-src/DOC-@VERSION@-$$i ; \
 	  rm -f src/xemacs-@VERSION@-$$i ; \
 	  rm -f src/xemacs-@VERSION@-dmp-$$i ; \
@@ -294,133 +293,6 @@
 	dh_builddeb -p$@ -P$(b)/$@
 
 ######################################################################
-# Gnome section
-xemacs@MAJVERSION@@SUBNAME@-gnome-nomule:
-	dh_testroot
-	dh_installdirs -p$@ -P$(b)/$@
-	dh_movefiles -p$@ -P$(b)/$@
-
-#	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-nomule
-#	cp lib-src/DOC-@VERSION@-gnome-nomule $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-nomule/DOC
-#	-mkdir -p $(b)/$@/@PREFIX@/bin
-#	V=gnome-nomule ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
-#	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
-#	fi
-#	V=gnome-nomule ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
-#	cp src/xemacs-@VERSION@-gnome-nomule $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-gnome-nomule
-#	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-gnome-nomule xemacs@MAJVERSION@-gnome-nomule )
-
-#	dh_testversion
-	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-nomule $@ )
-#	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
-#	cp debian/xemacs-@VERSION@-nomule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs-@VERSION@-gnome-nomule.1
-#	cp debian/xemacs@MAJVERSION@-nomule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs@MAJVERSION@-gnome-nomule.1
-#	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
-#	dh_installdocs -p$@ -P$(b)/$@
-#	dh_installexamples  -p$@ -P$(b)/$@
-	dh_installmenu  -p$@ -P$(b)/$@
-#	dh_installemacsen  -p$@ -P$(b)/$@
-#	dh_installinit  -p$@ -P$(b)/$@
-#	dh_installcron  -p$@ -P$(b)/$@
-#	dh_installmanpages  -p$@ -P$(b)/$@
-#	dh_undocumented -p$@ -P$(b)/$@
-#	dh_undocumented -p$@ -P$(b)/$@
-#	dh_installchangelogs -p$@ -P$(b)/$@
-	dh_strip -p$@ -P$(b)/$@
-#	dh_compress -p$@ -P$(b)/$@
-	dh_fixperms -p$@ -P$(b)/$@
-	dh_installdeb -p$@ -P$(b)/$@
-	dh_shlibdeps -p$@ -P$(b)/$@
-	dh_gencontrol -p$@ -P$(b)/$@
-	dh_makeshlibs -p$@ -P$(b)/$@
-	dh_md5sums -p$@ -P$(b)/$@
-	dh_builddeb -p$@ -P$(b)/$@
-
-
-xemacs@MAJVERSION@@SUBNAME@-gnome-mule:
-	dh_testroot
-	dh_installdirs -p$@ -P$(b)/$@
-	dh_movefiles -p$@ -P$(b)/$@
-
-#	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule
-#	cp lib-src/DOC-@VERSION@-gnome-mule $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule/DOC
-#	-mkdir -p $(b)/$@/@PREFIX@/bin
-#	V=gnome-mule ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
-#	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
-#	fi
-#	V=gnome-mule ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
-#	cp src/xemacs-@VERSION@-gnome-mule $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-gnome-mule
-#	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-gnome-mule xemacs@MAJVERSION@-gnome-mule )
-
-#	dh_testversion
-	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-mule $@ )
-#	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
-#	cp debian/xemacs-@VERSION@-mule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs-@VERSION@-gnome-mule.1
-#	cp debian/xemacs@MAJVERSION@-mule.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs@MAJVERSION@-gnome-mule.1
-#	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
-#	dh_installdocs -p$@ -P$(b)/$@
-#	dh_installexamples  -p$@ -P$(b)/$@
-	dh_installmenu  -p$@ -P$(b)/$@
-#	dh_installemacsen  -p$@ -P$(b)/$@
-#	dh_installinit  -p$@ -P$(b)/$@
-#	dh_installcron  -p$@ -P$(b)/$@
-#	dh_installmanpages  -p$@ -P$(b)/$@
-#	dh_undocumented -p$@ -P$(b)/$@
-#	dh_undocumented -p$@ -P$(b)/$@
-#	dh_installchangelogs -p$@ -P$(b)/$@
-	dh_strip -p$@ -P$(b)/$@
-#	dh_compress -p$@ -P$(b)/$@
-	dh_fixperms -p$@ -P$(b)/$@
-	dh_installdeb -p$@ -P$(b)/$@
-	dh_shlibdeps -p$@ -P$(b)/$@
-	dh_gencontrol -p$@ -P$(b)/$@
-	dh_makeshlibs -p$@ -P$(b)/$@
-	dh_md5sums -p$@ -P$(b)/$@
-	dh_builddeb -p$@ -P$(b)/$@
-
-
-xemacs@MAJVERSION@@SUBNAME@-gnome-mule-canna-wnn:
-	dh_testroot
-	dh_installdirs -p$@ -P$(b)/$@
-	dh_movefiles -p$@ -P$(b)/$@
-
-#	-mkdir -p $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule-canna-wnn
-#	cp lib-src/DOC-@VERSION@-gnome-mule-canna-wnn $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/gnome-mule-canna-wnn/DOC
-#	-mkdir -p $(b)/$@/@PREFIX@/bin
-#	V=gnome-mule-canna-wnn ; if [ -e src/xemacs-@VERSION@-dmp-$$V ] ; then \
-#	  cp src/xemacs-@VERSION@-dmp-$$V $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/DUMP ; \
-#	fi
-#	V=gnome-mule-canna-wnn ; cp src/xemacs-@VERSION@-$$V-config.values $(b)/$@/@PREFIX@/lib/xemacs-@VERSION@/@CONF_NAME@/$$V/config.values
-#	cp src/xemacs-@VERSION@-gnome-mule-canna-wnn $(b)/$@/@PREFIX@/bin/xemacs-@VERSION@-gnome-mule-canna-wnn
-#	( cd $(b)/$@/@PREFIX@/bin ; ln -sf xemacs-@VERSION@-gnome-mule-canna-wnn xemacs@MAJVERSION@-gnome-mule-canna-wnn )
-
-#	dh_testversion
-	( mkdir -p $(b)/$@/@PREFIX@/share/doc ; cd $(b)/$@/@PREFIX@/share/doc ; ln -sf xemacs@MAJVERSION@-mule-canna-wnn $@ )
-#	mkdir -p $(b)/$@/@PREFIX@/share/man/man1
-#	cp debian/xemacs-@VERSION@-mule-canna-wnn.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs-@VERSION@-gnome-mule-canna-wnn.1
-#	cp debian/xemacs@MAJVERSION@-mule-canna-wnn.1 $(b)/$@/@PREFIX@/share/man/man1/xemacs@MAJVERSION@-gnome-mule-canna-wnn.1
-#	gzip -9f $(b)/$@/@PREFIX@/share/man/man1/*
-#	dh_installdocs -p$@ -P$(b)/$@
-#	dh_installexamples  -p$@ -P$(b)/$@
-	dh_installmenu  -p$@ -P$(b)/$@
-#	dh_installemacsen  -p$@ -P$(b)/$@
-#	dh_installinit  -p$@ -P$(b)/$@
-#	dh_installcron  -p$@ -P$(b)/$@
-#	dh_installmanpages  -p$@ -P$(b)/$@
-#	dh_undocumented -p$@ -P$(b)/$@
-#	dh_undocumented -p$@ -P$(b)/$@
-#	dh_installchangelogs -p$@ -P$(b)/$@
-	dh_strip -p$@ -P$(b)/$@
-#	dh_compress -p$@ -P$(b)/$@
-	dh_fixperms -p$@ -P$(b)/$@
-	dh_installdeb -p$@ -P$(b)/$@
-	dh_shlibdeps -p$@ -P$(b)/$@
-	dh_gencontrol -p$@ -P$(b)/$@
-	dh_makeshlibs -p$@ -P$(b)/$@
-	dh_md5sums -p$@ -P$(b)/$@
-	dh_builddeb -p$@ -P$(b)/$@
-
-######################################################################
 
 xemacs@MAJVERSION@@SUBNAME@-htmldoc:
 	dh_testroot
@@ -495,11 +367,6 @@
 	--with_scrollbars=lucid \
 	--with_dialogs=athena
 
-gnome_opts = \
-	--with-gtk #--with-gnome
-
-
-
 #	--package-path="~/.xemacs::/@PREFIX@/share/xemacs@MAJVERSION@/packages:/@PREFIX@/share/xemacs@MAJVERSION@/mule-packages:/@PREFIX@/share/xemacs@MAJVERSION@/site-packages"
 
 ######################################################################
@@ -559,53 +426,6 @@
 	touch nomule-build-stamp
 
 ######################################################################
-## Gnome Section
-gnome-canna-wnn-build: gnome-canna-wnn-build-stamp
-gnome-canna-wnn-build-stamp:
-	$(CONFIGURE) ${non_ver_specific_opts} ${gnome_opts} \
-	  --docdir="$(docdir_start)/gnome-mule-canna-wnn/" \
-	  --with-mule --with-canna --with-wnn6 --with-xim=xlib --with-xfs \
-	  --package-path="$(MULE_PACKAGES_DIRS)" \
-	  @CONF_NAME@
-	$(MAKE) all-elc
-	mv src/xemacs src/xemacs-@VERSION@-gnome-mule-canna-wnn
-	mv lib-src/config.values src/xemacs-@VERSION@-gnome-mule-canna-wnn-config.values
-	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-gnome-mule-canna-wnn ; fi
-	mv lib-src/DOC lib-src/DOC-@VERSION@-gnome-mule-canna-wnn
-	touch gnome-canna-wnn-build-stamp
-
-gnome-mule-build: gnome-mule-build-stamp
-gnome-mule-build-stamp:
-	# mule only
-	rm -f src/xemacs src/temacs
-	$(CONFIGURE) ${non_ver_specific_opts} ${gnome_opts} \
-	  --docdir="$(docdir_start)/gnome-mule/" \
-	  --with-mule --with-canna=no --with-wnn=no \
-	  --with-xim=xlib --with-xfs \
-	  --package-path="$(MULE_PACKAGES_DIRS)" \
-	  @CONF_NAME@
-	$(MAKE) all-elc
-	mv src/xemacs src/xemacs-@VERSION@-gnome-mule
-	mv lib-src/config.values src/xemacs-@VERSION@-gnome-mule-config.values
-	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-gnome-mule ; fi
-	mv lib-src/DOC lib-src/DOC-@VERSION@-gnome-mule
-	touch gnome-mule-build-stamp
-
-gnome-nomule-build: gnome-nomule-build-stamp
-gnome-nomule-build-stamp:
-	# no mule
-	rm -f src/xemacs src/temacs
-	$(CONFIGURE) ${non_ver_specific_opts} ${gnome_opts} \
-	  --docdir="$(docdir_start)/gnome-nomule/" --with-mule=no \
-	  --package-path="$(NOMULE_PACKAGES_DIRS)" \
-	  @CONF_NAME@
-	$(MAKE) all-elc
-	mv src/xemacs src/xemacs-@VERSION@-gnome-nomule
-	mv lib-src/config.values src/xemacs-@VERSION@-gnome-nomule-config.values
-	if [ -e src/xemacs.dmp ] ; then mv src/xemacs.dmp src/xemacs-@VERSION@-dmp-gnome-nomule ; fi
-	mv lib-src/DOC lib-src/DOC-@VERSION@-gnome-nomule
-	touch gnome-nomule-build-stamp
-######################################################################
 
 html-build: html-build-stamp
 html-build-stamp:
diff -Nru xemacs21-21.4.22/debian/rules xemacs21-21.4.22/debian/rules
--- xemacs21-21.4.22/debian/rules	2014-04-08 14:15:55.000000000 +0100
+++ xemacs21-21.4.22/debian/rules	2015-01-19 12:55:14.000000000 +0000
@@ -31,7 +31,7 @@
 debian_config_scripts = debian/makevarfile
 topdir = $(shell pwd)
 
-XEMACS_TYPES = nomule mule mule-canna-wnn #gnome-nomule gnome-mule gnome-mule-canna-wnn
+XEMACS_TYPES = nomule mule mule-canna-wnn
 
 # these things should really not be here if this is to become a more
 # general packaging method.

unblock xemacs21/21.4.22-11

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)


Reply to: