From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6647835684080975872 X-Received: by 2002:a50:86d3:: with SMTP id 19mr2675092edu.5.1547819861384; Fri, 18 Jan 2019 05:57:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:ad59:: with SMTP id z25ls3102298edc.4.gmail; Fri, 18 Jan 2019 05:57:41 -0800 (PST) X-Google-Smtp-Source: ALg8bN5DzxuNWBKNJyWQkxstaRMmDNk0L6e2UEFxDPPgv+ejmHEkc9L+lH7wWlU5ezjuu7QAbAE3 X-Received: by 2002:a50:b4a1:: with SMTP id w30mr2681586edd.2.1547819860981; Fri, 18 Jan 2019 05:57:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547819860; cv=none; d=google.com; s=arc-20160816; b=mHpRbkxC0Eu0Fb8ci0e40TfIjdml9xnYpiI94PTxhtPxp1pM+/8EPPARShuKIfLFrK 66B3CyPbSS2qDAI5zDypRyT5Doo5MVLZrXY/hrnFL9CR3l9IHxpEWK77SQkKzs31hiQ4 FcHoEXzG4uk+pbi/XkQIR8iStQzoKyiW7fVKyHltzgjeYjWWf10JYWYu7AtEvPoFkKJ4 4XPb3/2xNi2aRHVRKlSALFi5OVXya1wIlQ7cxvq2DCyRCgn40qTlK1TK8DRTsc69kGZo F1TEa4bR/lorU3wG5JIdS0lmy8ZOg/SCVvuyraRZez2wnBNnoqyswLjDNBjEU0v0iRDA NrfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=L3WYOMbMb7/2MjuPCGV2zP1qoO3ZbGqpi7j1IbC6t/I=; b=C0QGgPvgCn7cxV8DgxAAAdcIuELR4J/nS2pOLr1HFrCqpJNQGt2egrAmvLNqG/53RZ lE9ZCzlV3fvftzGmHO7XWubhl6G4Uxt4YA18sr/P9A3BxVfUWfrtTY1vuQ049uw2lFoQ IQ9y7JLLLaIsbTV885pSosvnQfhdUqGNMDavdwcdobKKlqV8xUtsv7DImYSPgn8aGiby leBVgFSzDAuxPL6ouJ9IPGp+4Z6SKuoHXRAJi1swjMbSwzLiNOmKzxk0JkREwp1jvGUj fAy3kD1v/1bEAaA446Jes3qi77W1yrm1pPm63hCxSEERjCtA8geJghDo6/JpZa8Z52HG 92Hg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id a3si998433eda.0.2019.01.18.05.57.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 05:57:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x0IDvRr6010932 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Fri, 18 Jan 2019 14:57:40 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [ilbers/hello][PATCH] Rename to hello-isar to avoid collisions with Debian Hello Date: Fri, 18 Jan 2019 14:57:27 +0100 Message-Id: <20190118135727.22833-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: Hf1tRUIqcUY+ Suggested-by: Henning Schild Signed-off-by: Maxim Yu. Osipov --- Makefile.am | 4 ++-- Makefile.in | 28 ++++++++++++++-------------- README | 2 +- configure | 28 ++++++++++++++-------------- configure.ac | 2 +- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/copyright | 4 ++-- debian/menu | 4 ++-- hello.sgml | 12 ++++++------ 10 files changed, 50 insertions(+), 44 deletions(-) diff --git a/Makefile.am b/Makefile.am index 153d1cd..c7fc7e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ DB2MAN = docbook-to-man RM = rm -bin_PROGRAMS = hello +bin_PROGRAMS = hello-isar hello_SOURCES = hello.c hello_LDADD = -lhello -man1_MANS = hello.1 +man1_MANS = hello-isar.1 hello.1: hello.sgml $(DB2MAN) $< >$@ diff --git a/Makefile.in b/Makefile.in index 642aa34..459d394 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,7 +76,7 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -bin_PROGRAMS = hello$(EXEEXT) +bin_PROGRAMS = hello-isar$(EXEEXT) subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -94,9 +94,9 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -am_hello_OBJECTS = hello.$(OBJEXT) -hello_OBJECTS = $(am_hello_OBJECTS) -hello_DEPENDENCIES = +am_hello-isar_OBJECTS = hello.$(OBJEXT) +hello-isar_OBJECTS = $(am_hello-isar_OBJECTS) +hello-isar_DEPENDENCIES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -125,8 +125,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(hello_SOURCES) -DIST_SOURCES = $(hello_SOURCES) +SOURCES = $(hello-isar_SOURCES) +DIST_SOURCES = $(hello-isar_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -288,9 +288,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ DB2MAN = docbook-to-man RM = rm -hello_SOURCES = hello.c -hello_LDADD = -lhello -man1_MANS = hello.1 +hello-isar_SOURCES = hello.c +hello-isar_LDADD = -lhello +man1_MANS = hello-isar.1 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -388,9 +388,9 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -hello$(EXEEXT): $(hello_OBJECTS) $(hello_DEPENDENCIES) $(EXTRA_hello_DEPENDENCIES) - @rm -f hello$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(hello_OBJECTS) $(hello_LDADD) $(LIBS) +hello-isar$(EXEEXT): $(hello-isar_OBJECTS) $(hello-isar_DEPENDENCIES) $(EXTRA_hello-isar_DEPENDENCIES) + @rm -f hello-isar$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(hello-isar_OBJECTS) $(hello-isar_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -398,7 +398,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hello.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hello-isar.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -809,7 +809,7 @@ uninstall-man: uninstall-man1 uninstall-man1 -hello.1: hello.sgml +hello-isar.1: hello.sgml $(DB2MAN) $< >$@ clean-local: diff --git a/README b/README index 288864d..dfab8c9 100644 --- a/README +++ b/README @@ -1 +1 @@ -Hello is a sample application that can be used as a skeleton. +hello-isar is a sample application that can be used as a skeleton. diff --git a/configure b/configure index 08eb676..c0e7997 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for hello 0.1. +# Generated by GNU Autoconf 2.69 for hello-isar 0.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -574,10 +574,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='hello' -PACKAGE_TARNAME='hello' -PACKAGE_VERSION='0.1' -PACKAGE_STRING='hello 0.1' +PACKAGE_NAME='hello-isar' +PACKAGE_TARNAME='hello-isar' +PACKAGE_VERSION='0.3' +PACKAGE_STRING='hello-isar 0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1225,7 +1225,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hello 0.1 to adapt to many kinds of systems. +\`configure' configures hello-isar 0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1273,7 +1273,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/hello] + --docdir=DIR documentation root [DATAROOTDIR/doc/hello-isar] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1291,7 +1291,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hello 0.1:";; + short | recursive ) echo "Configuration of hello-isar 0.3:";; esac cat <<\_ACEOF @@ -1384,7 +1384,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hello configure 0.1 +hello-isar configure 0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1439,7 +1439,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hello $as_me 0.1, which was +It was created by hello-isar $as_me 0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2301,8 +2301,8 @@ fi # Define the identity of the package. - PACKAGE='hello' - VERSION='0.1' + PACKAGE='hello-isar' + VERSION='0.3' cat >>confdefs.h <<_ACEOF @@ -4042,7 +4042,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hello $as_me 0.1, which was +This file was extended by hello-isar $as_me 0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4108,7 +4108,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -hello config.status 0.1 +hello-isar config.status 0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e115fad..310ba80 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([hello],[0.1]) +AC_INIT([hello-isar],[0.3]) AM_INIT_AUTOMAKE(1.10 nostdinc foreign) AC_CONFIG_HEADERS([config.h]) diff --git a/debian/changelog b/debian/changelog index abf142b..a961341 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hello-isar (0.3) unstable; urgency=low + + * Rename to hello-isar to avoid collisions with Debian Hello. + + -- Maxim Yu. Osipov Fri, 18 Jan 2019 12:00:00 +0100 + hello (0.2) unstable; urgency=low * Add libhello dependency. diff --git a/debian/control b/debian/control index da1de8a..8c475bf 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: hello +Source: hello-isar Section: misc Priority: extra Maintainer: Baurzhan Ismagulov @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), libhello-dev, docbook-to-man Standards-Version: 3.9.5 Homepage: https://github.com/ilbers/hello -Package: example-hello +Package: hello-isar Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Sample application diff --git a/debian/copyright b/debian/copyright index e091b63..3ab05a4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: hello +Upstream-Name: hello-isar Source: https://github.com/ilbers/hello Files: * -Copyright: 2016 ilbers GmbH +Copyright: 2016-2019 ilbers GmbH License: GPL-2 diff --git a/debian/menu b/debian/menu index 4e5a69d..738ed77 100644 --- a/debian/menu +++ b/debian/menu @@ -1,2 +1,2 @@ -?package(hello):needs="X11|text|vc|wm" section="Applications/text"\ - title="hello" command="/usr/bin/hello" +?package(hello-isar):needs="X11|text|vc|wm" section="Applications/text"\ + title="hello-isar" command="/usr/bin/hello-isar" diff --git a/hello.sgml b/hello.sgml index f1dbfea..aae0d10 100644 --- a/hello.sgml +++ b/hello.sgml @@ -10,39 +10,39 @@ Ismagulov - 2016 + 2016-2019 ilbers GmbH March 25, 2016 - HELLO + HELLO-ISAR 1 - hello + hello-isar Sample application - hello + hello-isar DESCRIPTION - hello is a sample application that can be + hello-isar is a sample application that can be used as a skeleton. EXIT STATUS - hello always returns zero. + hello-isar always returns zero. -- 2.11.0