summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-02-23 23:11:53 +0100
committerStefano Karapetsas <[email protected]>2012-02-23 23:11:53 +0100
commitd63ce8c839a80d2a6f5de9785ae50f494fa3de97 (patch)
treed9c9e0477d801787531777efd1be9a2a92b6afd0
parentc8a25c592c70d4443485b2030f6ce3ff42252acc (diff)
downloadmate-menus-1.2.0.tar.bz2
mate-menus-1.2.0.tar.xz
update for 1.2 releasemate-menus-1.2.0
-rw-r--r--AUTHORS2
-rw-r--r--HACKING31
-rw-r--r--MAINTAINERS12
-rw-r--r--README21
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac2
-rwxr-xr-xdistro/ubuntu/build27
7 files changed, 10 insertions, 89 deletions
diff --git a/AUTHORS b/AUTHORS
index 65f4a38..0f74c65 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,3 +2,5 @@ Mark McLoughlin <[email protected]>
Havoc Pennington <[email protected]>
Vincent Untz <[email protected]>
Perberos <[email protected]>
+Steve Zesch <[email protected]>
+Stefano Karapetsas <[email protected]>
diff --git a/HACKING b/HACKING
deleted file mode 100644
index 5a7b611..0000000
--- a/HACKING
+++ /dev/null
@@ -1,31 +0,0 @@
-Hacking on mate-menus
-======================
-
- + The development occurs in git:
-
- http://git.gnome.org/browse/mate-menus
-
- For information on how to access MATE git please read:
-
- http://live.gnome.org/Git
-
- + Please send patches as bug reports in MATE Bugzilla:
-
- https://bugzilla.gnome.org/ (product mate-menus)
-
- Your patch should be in unified diff form (the -u option to GNU
- diff). See also:
-
- http://live.gnome.org/MateLove/SubmittingPatches
-
- + Please try and send a patch against a recent version of this package.
- Patches against git master are most preferable.
-
- + Don't commit any but the most trivial patches without approval.
-
- + Exceptions to this are:
-
- - Translators may commit basic i18n related patches to the build
- setup.
- - Build sheriff are welcome - in accordance with the relevant build
- sheriff constraints.
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index cc6c441..0000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,12 +0,0 @@
-Currently active maintainers
-----------------------------
-
-Vincent Untz
-Userid: vuntz
-
-Non-active maintainers, who have a good understanding of the code
------------------------------------------------------------------
-
-#Mark McLoughlin
diff --git a/README b/README
index 332e2c6..05d704e 100644
--- a/README
+++ b/README
@@ -12,19 +12,15 @@ from freedesktop.org:
You may download updates to the package from:
- http://download.gnome.org/sources/mate-menus/
-
-To discuss mate-menus, you may use the desktop-devel-list mailing list:
-
- http://mail.gnome.org/mailman/listinfo/desktop-devel-list
+ http://pub.mate-desktop.org/
+mate-menus is a fork of gnome-menus.
Installation
============
-See the file 'INSTALL'. If you are not using a released version of
-mate-menus (for example, if you checked out the code from git), you
-first need to run './autogen.sh'.
+If you are not using a released version of mate-menus (for example, if
+you checked out the code from git), you first need to run './autogen.sh'.
How to report bugs
@@ -32,13 +28,6 @@ How to report bugs
Bugs should be reported to the MATE bug tracking system:
- https://bugzilla.gnome.org/ (product mate-menus)
+ https://github.com/mate-desktop/mate-menus/issues
You will need to create an account for yourself.
-
-Please read the following page on how to prepare a useful bug report:
-
- https://bugzilla.gnome.org/page.cgi?id=bug-writing.html
-
-Please read the HACKING file for information on where to send changes or
-bugfixes for this package.
diff --git a/autogen.sh b/autogen.sh
index 688ffa7..fdfcdfa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,7 +12,7 @@ PKG_NAME="mate-menus"
exit 1
}
-which mate-autogen.sh || {
+which mate-autogen || {
echo "You need to install mate-common from the MATE Git"
exit 1
}
@@ -21,5 +21,5 @@ REQUIRED_AUTOMAKE_VERSION=1.9
USE_MATE2_MACROS=1
USE_COMMON_DOC_BUILD=yes
-. mate-autogen.sh
+. mate-autogen
diff --git a/configure.ac b/configure.ac
index dd4d358..3edaef9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.62)
-AC_INIT([mate-menus], [1.1.1], [http://www.mate-desktop.org])
+AC_INIT([mate-menus], [1.2.0], [http://www.mate-desktop.org])
AC_CONFIG_SRCDIR(libmenu/matemenu-tree.h)
AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
diff --git a/distro/ubuntu/build b/distro/ubuntu/build
deleted file mode 100755
index 53aac7e..0000000
--- a/distro/ubuntu/build
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# fill it
-pkgname=mate-menus
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="MATE menu specifications"
-#depends="glib2, python2"
-# editar esta funcion!
-build() {
- cd $pkgsrc
- # descomprimir
- tar xvzf download
- # entramos a la carpeta
- cd ${pkgname}
-
- #patch -Np0 -i "$srcdir/menus.patch"
-
- ./configure \
- --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
- make DESTDIR="${pkgdir}" install
-}
-
-# esto incluye la parte que se repite en la mayoria de los builds
-. /usr/share/mate-doc-utils/mate-debian.sh