From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
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 [thread overview]
Message-ID: <20190118135727.22833-1-mosipov@ilbers.de> (raw)
Suggested-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
Makefile.am | 4 ++--
Makefile.in | 28 ++++++++++++++--------------
README | 2 +-
configure | 28 ++++++++++++++--------------
configure.ac | 2 +-
debian/changelog | 6 ++++++
debian/control | 4 ++--
debian/copyright | 4 ++--
| 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 <mosipov@ilbers.de> 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 <ibr@radix50.net>
@@ -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
--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 @@
<surname>Ismagulov</surname>
</author>
<copyright>
- <year>2016</year>
+ <year>2016-2019</year>
<holder>ilbers GmbH</holder>
</copyright>
<date>March 25, 2016</date>
</refentryinfo>
<refmeta>
- <refentrytitle>HELLO</refentrytitle>
+ <refentrytitle>HELLO-ISAR</refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
- <refname>hello</refname>
+ <refname>hello-isar</refname>
<refpurpose>Sample application</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>hello</command>
+ <command>hello-isar</command>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
- <para><application>hello</application> is a sample application that can be
+ <para><application>hello-isar</application> is a sample application that can be
used as a skeleton.</para>
</refsect1>
<refsect1>
<title>EXIT STATUS</title>
- <para><application>hello</application> always returns zero.</para>
+ <para><application>hello-isar</application> always returns zero.</para>
</refsect1>
<refsect1>
--
2.11.0
next reply other threads:[~2019-01-18 13:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 13:57 Maxim Yu. Osipov [this message]
2019-01-23 13:40 ` Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190118135727.22833-1-mosipov@ilbers.de \
--to=mosipov@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox