summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-17 15:42:33 -0700
committerStefano Karapetsas <[email protected]>2013-10-17 15:42:33 -0700
commit46ba8ca5fc9665c1a4758e56fda6761ac993c62e (patch)
tree629d62fcf9778c6735bf410782de69cbbf58f56a
parente677d1440f6f5a3b51a35dea8bc09a99d442bbf5 (diff)
parent59e877def6c3736c1fb17a301c44c6f054414155 (diff)
downloadmarco-46ba8ca5fc9665c1a4758e56fda6761ac993c62e.tar.bz2
marco-46ba8ca5fc9665c1a4758e56fda6761ac993c62e.tar.xz
Merge pull request #64 from NiceandGently/master
rename to marco and remove distro folder
-rw-r--r--HACKING4
-rw-r--r--README2
-rwxr-xr-xautogen.sh2
-rw-r--r--distro/archlinux/PKGBUILD37
-rw-r--r--distro/archlinux/mate-window-manager.install17
5 files changed, 4 insertions, 58 deletions
diff --git a/HACKING b/HACKING
index 533631fc..171ef007 100644
--- a/HACKING
+++ b/HACKING
@@ -52,8 +52,8 @@ Minimal Building/Testing Environment
pkg-config, intltool, and libtool) and be ready to build and test
Marco. Steps to do so:
- $ git clone https://github.com/mate-desktop/mate-window-manager.git
- $ cd mate-window-manager
+ $ git clone https://github.com/mate-desktop/marco.git
+ $ cd marco
$ ./autogen.sh --prefix /usr
$ make
$ ./src/marco --replace
diff --git a/README b/README
index 5680a888..fd819344 100644
--- a/README
+++ b/README
@@ -218,7 +218,7 @@ EWMH-compliant WMs).
MARCO BUGS, NON-FEATURES, AND CAVEATS
===
-See github: https://github.com/mate-desktop/mate-window-manager/issues
+See github: https://github.com/mate-desktop/marco/issues
FAQ
===
diff --git a/autogen.sh b/autogen.sh
index d79eaca6..bf519642 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-PKG_NAME="mate-window-manager"
+PKG_NAME="marco"
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index ec097428..00000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-pkgname=mate-window-manager
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="A window manager for MATE"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('mate-conf' 'mate-dialogs' 'libgtop' 'libwnck') # 'libcanberra' 'startup-notification'
-makedepends=('intltool' 'pkgconfig' 'mate-doc-utils')
-options=('!emptydirs' '!libtool')
-install=mate-window-manager.install
-url="http://matsusoft.com.ar/projects/mate/"
-groups=('mate')
-source=(metacity-restartstyle.patch)
-sha256sums=('ea2450ca3e4fb59166ec18ff4844cc61cb16865880dc6b125078a3ab47bf2caf')
-
-build() {
- cd "${srcdir}/../../../"
- ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/mate-window-manager \
- --disable-static \
- --disable-startup-notification \
- --disable-scrollkeeper || return 1
- make || return 1
-}
-
-package() {
- cd "${srcdir}/../../../"
-
- make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
- install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
- mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
-}
diff --git a/distro/archlinux/mate-window-manager.install b/distro/archlinux/mate-window-manager.install
deleted file mode 100644
index 7bdd0c02..00000000
--- a/distro/archlinux/mate-window-manager.install
+++ /dev/null
@@ -1,17 +0,0 @@
- pkgname=mate-window-manager
-
-post_install() {
- usr/sbin/mateconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/mateconfpkg --uninstall ${pkgname}
-}