Rename emacsXY to emacsXY-gtk

diff --git a/debian/control b/debian/control
index a7ab7c4ca5f664cc50e8c0eaedc2468462ac034b..fd36fd4a87606c758cf43401607bb1348fe91ae0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,13 +27,13 @@ Architecture: any
 Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: emacs25, emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs25-common-non-dfsg
-Conflicts: emacs25, emacs25-nox
-Replaces: emacs25, emacs25-nox
+Conflicts: emacs25-gtk, emacs25-nox
+Replaces: emacs25-gtk, emacs25-nox
 Description: GNU Emacs editor (with Lucid GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with support for a graphical user
  interface based on the Lucid toolkit (instead of the GTK+ interface
- provided by the emacs25 package).  Until some known GTK+
+ provided by the emacs25-gtk package).  Until some known GTK+
  problems are fixed, this version may help avoid crashing Emacs during
  an emacsclient disconnect.  See
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567934 and
@@ -55,8 +55,8 @@ Architecture: any
 Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: emacs25, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs25-common-non-dfsg
-Conflicts: emacs25, emacs25-lucid
-Replaces: emacs25, emacs25-lucid
+Conflicts: emacs25-gtk, emacs25-lucid
+Replaces: emacs25-gtk, emacs25-lucid
 Description: GNU Emacs editor (without GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs compiled without support for X,
@@ -72,10 +72,10 @@ Description: Debugging symbols for emacs25-nox
  package contains the debugging symbols for the emacs25-nox
  package.
 
-Package: emacs25
+Package: emacs25-gtk
 Architecture: any
 Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: editor, emacsen, info-browser, mail-reader, news-reader
+Provides: emacs25, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs25-common-non-dfsg
 Conflicts: emacs25-lucid, emacs25-nox
 Replaces: emacs25-lucid, emacs25-nox
@@ -85,14 +85,14 @@ Description: GNU Emacs editor (with GTK+ GUI support)
  based on GTK+ (instead of the Lucid toolkit provided by the
  emacs25-lucid package).
 
-Package: emacs25-dbg
+Package: emacs25-gtk-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: emacs25-dbg (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for emacs25
+Depends: emacs25-gtk-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for emacs25-gtk
  GNU Emacs is the extensible self-documenting text editor.  This
- package contains the debugging symbols for the emacs25 package.
+ package contains the debugging symbols for the emacs25-gtk package.
 
 Package: emacs25-bin-common
 Architecture: any
@@ -100,7 +100,7 @@ Depends: emacs25-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends
 Description: GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
- that's shared by emacs25, emacs25-lucid, and emacs25-nox.
+ that's shared by emacs25-gtk, emacs25-lucid, and emacs25-nox.
 
 Package: emacs25-common
 Architecture: all
@@ -112,7 +112,7 @@ Breaks: apel (<< 10.8+0.20120427-4)
 Description: GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure
- that's shared by emacs25, emacs25-lucid, and emacs25-nox.
+ that's shared by emacs25-gtk, emacs25-lucid, and emacs25-nox.
 
 Package: emacs25-el
 Architecture: all

diff --git a/debian/control.in b/debian/control.in
index cbba36fd6fe32c2db1451cde87da4cc44275466a..fb9f6bae215b15acc07f2e3e4a4a86d19677c6f7 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,13 +27,13 @@ Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
-Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
+Conflicts: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-nox
+Replaces: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-nox
 Description: GNU Emacs editor (with Lucid GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with support for a graphical user
  interface based on the Lucid toolkit (instead of the GTK+ interface
- provided by the @DEB_FLAVOR@ package).  Until some known GTK+
+ provided by the @DEB_FLAVOR@-gtk package).  Until some known GTK+
  problems are fixed, this version may help avoid crashing Emacs during
  an emacsclient disconnect.  See
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567934 and
@@ -55,8 +55,8 @@ Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid
-Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid
+Conflicts: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid
+Replaces: @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid
 Description: GNU Emacs editor (without GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs compiled without support for X,
@@ -72,7 +72,7 @@ Description: Debugging symbols for @DEB_FLAVOR@-nox
  package contains the debugging symbols for the @DEB_FLAVOR@-nox
  package.
 
-Package: @DEB_FLAVOR@
+Package: @DEB_FLAVOR@-gtk
 Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: editor, emacsen, info-browser, mail-reader, news-reader
@@ -85,14 +85,14 @@ Description: GNU Emacs editor (with GTK+ GUI support)
  based on GTK+ (instead of the Lucid toolkit provided by the
  @DEB_FLAVOR@-lucid package).
 
-Package: @DEB_FLAVOR@-dbg
+Package: @DEB_FLAVOR@-gtk-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: @DEB_FLAVOR@-dbg (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for @DEB_FLAVOR@
+Depends: @DEB_FLAVOR@-gtk-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for @DEB_FLAVOR@-gtk
  GNU Emacs is the extensible self-documenting text editor.  This
- package contains the debugging symbols for the @DEB_FLAVOR@ package.
+ package contains the debugging symbols for the @DEB_FLAVOR@-gtk package.
 
 Package: @DEB_FLAVOR@-bin-common
 Architecture: any
@@ -100,7 +100,7 @@ Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}, ${misc:De
 Description: GNU Emacs editor's shared, architecture dependent files
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture dependent infrastructure
- that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
+ that's shared by @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
 
 Package: @DEB_FLAVOR@-common
 Architecture: all
@@ -112,7 +112,7 @@ Breaks: apel (<< 10.8+0.20120427-4)
 Description: GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure
- that's shared by @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
+ that's shared by @DEB_FLAVOR@-gtk, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
 
 Package: @DEB_FLAVOR@-el
 Architecture: all

diff --git a/debian/rules b/debian/rules
index fd6f3a7891dfb52778844f22574eb4bf5660a72b..cf0bbb9b5f8f467ac1135c81c0834fbd1638c917 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -149,11 +149,11 @@ nonpersistent_autogen_install_files := \
   debian/$(flavor)-lucid.lintian-overrides \
   debian/$(flavor)-lucid.postinst \
   debian/$(flavor)-lucid.prerm \
-  debian/$(flavor).README.Debian \
-  debian/$(flavor).desktop \
-  debian/$(flavor).lintian-overrides \
-  debian/$(flavor).postinst \
-  debian/$(flavor).prerm
+  debian/$(flavor)-gtk.README.Debian \
+  debian/$(flavor)-gtk.desktop \
+  debian/$(flavor)-gtk.lintian-overrides \
+  debian/$(flavor)-gtk.postinst \
+  debian/$(flavor)-gtk.prerm
 
 autogen_build_files := \
   $(nonpersistent_autogen_build_files) $(persistent_autogen_build_files)
@@ -171,12 +171,12 @@ nonpersistent_autogen_files := \
 # Build directories
 pkgdir_common := $(CURDIR)/debian/$(flavor)-common
 pkgdir_bin_common := $(CURDIR)/debian/$(flavor)-bin-common
-pkgdir_x := $(CURDIR)/debian/$(flavor)
+pkgdir_gtk := $(CURDIR)/debian/$(flavor)-gtk
 pkgdir_nox := $(CURDIR)/debian/$(flavor)-nox
 pkgdir_lucid := $(CURDIR)/debian/$(flavor)-lucid
 pkgdir_el := $(CURDIR)/debian/$(flavor)-el
 
-install_dir_x := $(CURDIR)/debian/install-x
+install_dir_gtk := $(CURDIR)/debian/install-gtk
 install_dir_nox := $(CURDIR)/debian/install-nox
 install_dir_lucid := $(CURDIR)/debian/install-lucid
 
@@ -243,8 +243,8 @@ debian-sync: $(persistent_autogen_files)
         # so dh pattern rule doesn't try to handle this target
        true
 
-debian/$(flavor).%: xsupport := "x"
-debian/$(flavor).%: pkg_name := $(flavor)
+debian/$(flavor)-gtk.%: xsupport := "gtk"
+debian/$(flavor)-gtk.%: pkg_name := $(flavor)-gtk
 
 debian/$(flavor)-nox.%: xsupport := "nox"
 debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox
@@ -267,7 +267,7 @@ debian/$(flavor)-common.%: debian/emacsVER-common.% debian/changelog
 debian/$(flavor)-el.%: debian/emacsVER-el.% debian/changelog
        $(call deb_sub,$<,$@)
 
-debian/$(flavor).%: debian/emacsVER.% debian/changelog
+debian/$(flavor)-gtk.%: debian/emacsVER.% debian/changelog
        $(call deb_sub,$<,$@)
 
 debian/$(flavor)-nox.%: debian/emacsVER.% debian/changelog
@@ -308,13 +308,13 @@ confflags += --with-sound=alsa
 confflags += --without-gconf
 
 # x configure flags
-confflags_x := $(confflags) 
-confflags_x += --with-x=yes
-confflags_x += --with-x-toolkit=gtk3
+confflags_gtk := $(confflags)
+confflags_gtk += --with-x=yes
+confflags_gtk += --with-x-toolkit=gtk3
 # For those who prefer the old-style non-toolkit scrollbars, just
 # change the assignment below to --without-toolkit-scroll-bars.  The
 # resulting emacsXY package will have the old scrollbars.
-confflags_x += --with-toolkit-scroll-bars
+confflags_gtk += --with-toolkit-scroll-bars
 
 # nox configure flags
 confflags_nox := $(confflags) 
@@ -350,15 +350,15 @@ override_dh_auto_configure:
 
 debian/stamp-configured: $(autogen_build_files)
         # If the deps for this target change, start over
-       rm -rf debian/build-src debian/build-x debian/build-lucid debian/build-nox
+       rm -rf debian/build-src debian/build-gtk debian/build-lucid debian/build-nox
        mkdir debian/build-src
        cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') debian/build-src
        cp -a /usr/share/misc/config.guess /usr/share/misc/config.sub \
          debian/build-src
        cd debian/build-src && ./autogen.sh
-       mkdir debian/build-lucid debian/build-nox debian/build-x
+       mkdir debian/build-lucid debian/build-nox debian/build-gtk
         # Create one VPATH build per-flavor
-       $(call cfg_tree,debian/build-x,$(confflags_x))
+       $(call cfg_tree,debian/build-gtk,$(confflags_gtk))
        $(call cfg_tree,debian/build-nox,$(confflags_nox))
        $(call cfg_tree,debian/build-lucid,$(confflags_lucid))
        touch $@
@@ -366,7 +366,7 @@ debian/stamp-configured: $(autogen_build_files)
 override_dh_auto_build: debian/stamp-configured
         # The first build will bootstrap build-src, which will speed
         # the remaining builds.
-       $(call build_cmd,debian/build-x)
+       $(call build_cmd,debian/build-gtk)
        $(call build_cmd,debian/build-nox)
        $(call build_cmd,debian/build-lucid)
 
@@ -374,7 +374,7 @@ override_dh_auto_test:
   ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        $(MAKE) -C debian/build-lucid check
        $(MAKE) -C debian/build-nox check
-       $(MAKE) -C debian/build-x check
+       $(MAKE) -C debian/build-gtk check
   endif
 
 define install_common_binpkg_bits
@@ -400,21 +400,21 @@ endef
 
 override_dh_auto_install: $(autogen_install_files)
        rm -rf \
-         $(install_dir_x) $(install_dir_nox) $(install_dir_lucid) \
+         $(install_dir_gtk) $(install_dir_nox) $(install_dir_lucid) \
          $(pkgdir_common)/* \
          $(pkgdir_bin_common)/* \
-         $(pkgdir_x)/* \
+         $(pkgdir_gtk)/* \
          $(pkgdir_nox)/* \
          $(pkgdir_lucid)/* \
          $(pkgdir_el)/*
 
-       $(call emacs_inst,build-x,$(install_dir_x))
+       $(call emacs_inst,build-gtk,$(install_dir_gtk))
 
         ##################################################
         # emacsXY-common
         ifneq (,$(findstring $(flavor)-common, $(shell dh_listpackages)))
          install -d $(pkgdir_common)
-         cp -a $(install_dir_x)/* $(pkgdir_common)
+         cp -a $(install_dir_gtk)/* $(pkgdir_common)
 
          rm -r $(pkgdir_common)/usr/bin
          rm -r $(pkgdir_common)/usr/lib
@@ -515,8 +515,8 @@ override_dh_auto_install: $(autogen_install_files)
         ifneq (,$(findstring $(flavor)-bin-common, $(shell dh_listpackages)))
          # Move common binaries to emacs-bin-common.
          install -d $(pkgdir_bin_common)/usr
-         cp -a $(install_dir_x)/usr/bin $(pkgdir_bin_common)/usr
-         cp -a $(install_dir_x)/usr/lib $(pkgdir_bin_common)/usr
+         cp -a $(install_dir_gtk)/usr/bin $(pkgdir_bin_common)/usr
+         cp -a $(install_dir_gtk)/usr/lib $(pkgdir_bin_common)/usr
 
          # Make sure there's just one.
          test -f $(pkgdir_bin_common)/usr/bin/emacs-*
@@ -545,14 +545,14 @@ override_dh_auto_install: $(autogen_install_files)
         # emacsXY
         ifneq (,$(findstring $(flavor), $(shell dh_listpackages)))
          $(call install_common_binpkg_bits,\
-           $(install_dir_x),$(pkgdir_x),$(flavor),x)
+           $(install_dir_gtk),$(pkgdir_gtk),$(flavor)-gtk,gtk)
 
           # install desktop entries
-         install -d $(pkgdir_x)/usr/share/applications
+         install -d $(pkgdir_gtk)/usr/share/applications
          install -m 0644 \
            debian/$(flavor).desktop \
            debian/$(flavor)-term.desktop \
-           $(pkgdir_x)/usr/share/applications/
+           $(pkgdir_gtk)/usr/share/applications/
         endif
 
         ##################################################
@@ -562,9 +562,9 @@ override_dh_auto_install: $(autogen_install_files)
          $(call install_common_binpkg_bits,\
            $(install_dir_nox),$(pkgdir_nox),$(flavor)-nox,nox)
           # install desktop entry
-         install -d $(pkgdir_x)/usr/share/applications
+         install -d $(pkgdir_gtk)/usr/share/applications
          install -m 0644 \
-           debian/$(flavor)-term.desktop $(pkgdir_x)/usr/share/applications/
+           debian/$(flavor)-term.desktop $(pkgdir_gtk)/usr/share/applications/
          rm -rf $(install_dir_nox)
         endif
 
@@ -589,20 +589,20 @@ override_dh_auto_install: $(autogen_install_files)
         ifneq (,$(findstring $(flavor)-el, $(shell dh_listpackages)))
          install -d $(pkgdir_el)
          $(pf); \
-         (cd $(install_dir_x) && find -name "*.el" -o -name "*.el.gz" -print0 \
+         (cd $(install_dir_gtk) && find -name "*.el" -o -name "*.el.gz" -print0 \
           | tar cpf - --null --files-from -) \
             | (cd $(pkgdir_el) && tar xpf -)
         endif
 
         ##################################################
         # final cleanup
-       rm -rf $(install_dir_x)
+       rm -rf $(install_dir_gtk)
        rm -rf $(install_dir_nox)
        rm -rf $(install_dir_lucid)
 
 .PHONY: override_dh_strip
 override_dh_strip:
-       dh_strip -p$(flavor) --dbg-package=$(flavor)-dbg
+       dh_strip -p$(flavor)-gtk --dbg-package=$(flavor)-gtk-dbg
        dh_strip -p$(flavor)-lucid --dbg-package=$(flavor)-lucid-dbg
        dh_strip -p$(flavor)-nox --dbg-package=$(flavor)-nox-dbg
        dh_strip
@@ -649,12 +649,12 @@ override_dh_clean: $(persistent_autogen_files)
          debian/build-lucid \
          debian/build-nox \
          debian/build-src \
-         debian/build-x \
+         debian/build-gtk \
          debian/elgz-canary \
          debian/elgz-info \
          debian/emacsVER-common.README.00 \
          debian/emacsVER-common.README.01 \
          debian/install-lucid \
          debian/install-nox \
-         debian/install-x
+         debian/install-gtk
        rm -f $(nonpersistent_autogen_files)