diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-16 13:33:08 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-16 13:33:08 -0800 |
| commit | f5f0a53c036e9c7fc2d3bff0882068ee00005677 (patch) | |
| tree | 3bd33c84b9a756dc2f4ca0c79dec5616b58c1bb8 | |
| parent | 72a91275bf0303882aea39a4a999357e47d23bb7 (diff) | |
| parent | 461b4b0d488e4ef80c7a6841da88fd271e9526c4 (diff) | |
| download | mate-backgrounds-f5f0a53c036e9c7fc2d3bff0882068ee00005677.tar.bz2 mate-backgrounds-f5f0a53c036e9c7fc2d3bff0882068ee00005677.tar.xz | |
Merge pull request #13 from infirit/1.6
Cherrypick usefull commits from master
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | distro/archlinux/PKGBUILD | 29 |
3 files changed, 2 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am index 6eba55f..7ea78da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ dist-hook: ( cd "$(top_srcdir)" && \ echo '# Generated by Makefile. Do not edit.'; echo; \ $(top_srcdir)/missing --run git log --stat -M -C \ - --name-status --date=short MATE_BACKGROUNDS_2_30_0.. ) \ + --name-status --date=short ) \ > ChangeLog.tmp \ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ || ( rm -f ChangeLog.tmp ; \ diff --git a/configure.ac b/configure.ac index e4b8f5d..90cb9e4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,7 @@ AC_INIT([mate-backgrounds], [1.6.0], [http://www.mate-desktop.org]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_INIT_AUTOMAKE -AM_INIT_AUTOMAKE([1.9]) +AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar]) # Internationalization: GETTEXT_PACKAGE=mate-backgrounds diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD deleted file mode 100644 index 35cf667..0000000 --- a/distro/archlinux/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -pkgname=mate-backgrounds -pkgver=1.1.0 -pkgrel=1 -pkgdesc="Background images and data for MATE" -arch=('any') -license=('GPL') -url="http://matsusoft.com.ar/projects/mate/" -makedepends=('intltool' 'mate-common') -groups=('mate') -source=() -sha256sums=() - - -build() { - cd "${srcdir}/../../../" - - ./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var || return 1 - - make || return 1 -} - -package() { - cd "${srcdir}/../../../" - - make DESTDIR="$pkgdir" install || return 1 -} |