Skip to content

Commit

Permalink
rename mate to cafe
Browse files Browse the repository at this point in the history
  • Loading branch information
sc0w committed Aug 19, 2020
1 parent 506ec49 commit 33739e6
Show file tree
Hide file tree
Showing 23 changed files with 115 additions and 115 deletions.
12 changes: 6 additions & 6 deletions .build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
##########################################################
requires:
archlinux:
# Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-common
# Useful URL: https://git.archlinux.org/svntogit/community.git/tree/cafe-common
- autoconf
- automake
- gcc
- git
- make

debian:
# Useful URL: https://github.com/mate-desktop/debian-packages
# Useful URL: https://salsa.debian.org/debian-mate-team/mate-common
# Useful URL: https://github.com/cafe-desktop/debian-packages
# Useful URL: https://salsa.debian.org/debian-cafe-team/cafe-common
- autoconf
- git
- make
- xz-utils

fedora:
# Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-common.git
# Useful URL: https://src.fedoraproject.org/cgit/rpms/cafe-common.git
- autoconf
- automake
- gcc
Expand All @@ -45,11 +45,11 @@ releases:
prerelease: false
checksum: true
file_glob: true
files: mate-common-*.tar.xz
files: cafe-common-*.tar.xz
github_release:
tags: true
overwrite: true
base_version: 1.20.0
notify_servers:
- https://release.mate-desktop.org/release
- https://release.cafe-desktop.org/release

2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
custom: https://mate-desktop.org/donate/
custom: https://cafe-desktop.org/donate/
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ addons:
- python3-setuptools

before_install:
- curl -Ls -o docker-build https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/docker-build
- curl -Ls -o docker-build https://github.com/cafe-desktop/cafe-dev-scripts/raw/master/travis/docker-build
- chmod +x docker-build

install:
Expand All @@ -24,9 +24,9 @@ script:
notifications:
irc:
if: (tag OR branch = "1.24") AND
repo = "mate-desktop/mate-common"
repo = "cafe-desktop/cafe-common"
channels:
- "irc.freenode.org#mate-dev"
- "irc.freenode.org#cafe-dev"
template:
- "[%{repository_name}] %{author}: %{commit_subject}"
- "[%{branch}] %{commit} %{message} %{build_url}"
Expand Down
30 changes: 15 additions & 15 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
such as by inticafe data communication or control flow between those
subprograms and other parts of the work.

The Corresponding Source need not include anything that users
Expand All @@ -166,11 +166,11 @@ convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
the terms of this License in conveying all caferial for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
your copyrighted caferial outside their relationship with you.

Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
Expand Down Expand Up @@ -330,7 +330,7 @@ been installed in ROM).
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
network may be denied when the modification itself caferially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.

Expand All @@ -355,32 +355,32 @@ this License without regard to the additional permissions.
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
additional permissions on caferial, added by you to a covered work,
for which you have or can give appropriate copyright permission.

Notwithstanding any other provision of this License, for material you
Notwithstanding any other provision of this License, for caferial you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
that caferial) supplement the terms of this License with terms:

a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or

b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
author attributions in that caferial or in the Appropriate Legal
Notices displayed by works containing it; or

c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
c) Prohibiting misrepresentation of the origin of that caferial, or
requiring that modified versions of such caferial be marked in
reasonable ways as different from the original version; or

d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
authors of the caferial; or

e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or

f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
caferial by anyone who conveys the caferial (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
Expand All @@ -391,7 +391,7 @@ received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
License, you may add to a covered work caferial governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.

Expand Down Expand Up @@ -430,7 +430,7 @@ your receipt of the notice.
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
caferial under section 10.

9. Acceptance Not Required for Having Copies.

Expand Down Expand Up @@ -613,7 +613,7 @@ SUCH DAMAGES.

If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
reviewing courts shall apply local law that most closely approxicafes
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
Expand Down
44 changes: 22 additions & 22 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
### mate-common 1.24.2
### cafe-common 1.24.2

* mate-compiler-flags: add -Wno-unused-parameter to maximum c++ warnings
* mate-compiler-flags: disable '-Wno-unused' and '-Wno-sign-compare'
* cafe-compiler-flags: add -Wno-unused-parameter to maximum c++ warnings
* cafe-compiler-flags: disable '-Wno-unused' and '-Wno-sign-compare'

### mate-common 1.24.1
### cafe-common 1.24.1

* silent -Wunused-parameter for maximum warning level

### mate-common 1.24.0
### cafe-common 1.24.0

* bump version

### mate-common 1.23.3
### cafe-common 1.23.3

* update CAFE_CXX_WARNINGS macro

### mate-common 1.23.2
### cafe-common 1.23.2

* Set compiler debug flags in CAFE_DEBUG_CHECK

### mate-common 1.23.1
### cafe-common 1.23.1

* Check if AX_APPEND_FLAG and AX_CHECK_COMPILE_FLAG are available

### mate-common 1.23.0
### cafe-common 1.23.0

* update mate-compiler-flags macro
* update cafe-compiler-flags macro

### mate-common 1.22.0
### cafe-common 1.22.0

* initial Travis-CI

### mate-common 1.21.0
### cafe-common 1.21.0

* bump version

### mate-common 1.20.0
### cafe-common 1.20.0

* bump version

### mate-common 1.19.0
### cafe-common 1.19.0

* bump version

### mate-common 1.18.0
### cafe-common 1.18.0

* NEWS: use consistent, project wide, markdown-like formatting
to make generating release announcements easier

### mate-common 1.16.0
### cafe-common 1.16.0

* Check only for autoreconf in mate-autogen as autoconf, automake,
* Check only for autoreconf in cafe-autogen as autoconf, automake,
libtool, gettext are already checked by autoreconf

### mate-common 1.14.0
### cafe-common 1.14.0

* Remove references to obsolete CAFE components

### mate-common 1.12.0
### cafe-common 1.12.0

* Support lcov 1.12
* Update docs and example script

### mate-common 1.10.0
### cafe-common 1.10.0

* Add support for automake 1.15
* Support lcov 1.11
* Check for appdata-xml.m4 with APPDATA_XML
* Run glib-gettexize if using GLib gettext

### mate-common 1.8.0
### cafe-common 1.8.0

* Replace mate-doc-utils with yelp-tools
* Replace cafe-doc-utils with yelp-tools
* Cherry pick many improvements from gnome-common
* Use autoreconf
10 changes: 5 additions & 5 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ CAFE repository tree I did the following:

- macros/aclocal-includes.m4 defines this to always be false.

- mate-common/configure.in does not include anything from macros and
- cafe-common/configure.in does not include anything from macros and
defines this to be true.

* We use this automake conditional in the macros/Makefile.am to install
$(MACROS), autogen.sh, mate-common.m4 and a newly created mate-macros.dep
in `$(datadir)/aclocal/mate'.
$(MACROS), autogen.sh, cafe-common.m4 and a newly created cafe-macros.dep
in `$(datadir)/aclocal/cafe'.

Since aclocal doesn't look in subdirectories we can safely install them
there even when compiling from the repository.
Expand All @@ -25,10 +25,10 @@ CAFE repository tree I did the following:
in the CAFE repository tree - really fine...

* When we're outside the CAFE repository tree, we simply need to tell aclocal
that it should also look in `$(datadir)/aclocal/mate' and it will find all
that it should also look in `$(datadir)/aclocal/cafe' and it will find all
the macros.

There is a `mate-skel' module in the repository that can be used as a
There is a `cafe-skel' module in the repository that can be used as a
starting point when writing a new CAFE application that should be used
outside the repository.

Expand Down
4 changes: 2 additions & 2 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ test -z "$srcdir" && srcdir=.

REQUIRED_AUTOMAKE_VERSION=1.9

PKG_NAME="mate-common"
PKG_NAME="cafe-common"

(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
}

. $srcdir/macros/mate-autogen
. $srcdir/macros/cafe-autogen

6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AC_PREREQ(2.54)
AC_INIT([mate-common], [1.24.2], [https://github.com/mate-desktop/mate-common])
AC_INIT([cafe-common], [1.24.2], [https://github.com/cafe-desktop/cafe-common])

AC_CONFIG_SRCDIR([macros/mate-autogen])
AC_CONFIG_SRCDIR([macros/cafe-autogen])

AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news])

Expand All @@ -17,7 +17,7 @@ AC_CONFIG_FILES([
Makefile
macros/Makefile
doc-build/Makefile
doc-build/mate-doc-common
doc-build/cafe-doc-common
doc/Makefile
])

Expand Down
6 changes: 3 additions & 3 deletions doc-build/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
bin_SCRIPTS = mate-doc-common
bin_SCRIPTS = cafe-doc-common

pkgdatadir = $(datadir)/mate-common/data
pkgdatadir = $(datadir)/cafe-common/data
pkgdata_DATA = \
omf.make \
xmldocs.make

EXTRA_DIST = \
omf.make \
xmldocs.make \
mate-doc-common.in \
cafe-doc-common.in \
README
2 changes: 1 addition & 1 deletion doc-build/mate-doc-common.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

progname=`echo "$0" | sed 's%^.*/%%'`

PROGRAM=mate-doc-common
PROGRAM=cafe-doc-common
PACKAGE=@PACKAGE@
VERSION=@VERSION@

Expand Down
2 changes: 1 addition & 1 deletion doc-build/xmldocs.make
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# ********** Begin of section some packagers may need to modify **********
# This variable (docdir) specifies where the documents should be installed.
# This default value should work for most packages.
docdir = $(datadir)/mate/help/$(docname)/$(lang)
docdir = $(datadir)/cafe/help/$(docname)/$(lang)

# ********** You should not have to edit below this line **********
xml_files = $(entities) $(docname).xml
Expand Down
4 changes: 2 additions & 2 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
man_MANS = mate-autogen.1 \
mate-doc-common.1
man_MANS = cafe-autogen.1 \
cafe-doc-common.1

EXTRA_DIST = $(man_MANS) \
autogen.sh.example
Expand Down
8 changes: 4 additions & 4 deletions doc/autogen.sh.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
srcdir=`dirname $0`
[ -z "$srcdir" ] && srcdir=.

PKG_NAME=mate-package
PKG_NAME=cafe-package

if [ ! -f "$srcdir/configure.ac" ]; then
echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2
exit 1
fi

which mate-autogen.sh || {
echo "You need to install mate-common"
which cafe-autogen.sh || {
echo "You need to install cafe-common"
exit 1
}

. mate-autogen
. cafe-autogen

Loading

0 comments on commit 33739e6

Please sign in to comment.