Date: Saturday, April 18, 2015 @ 13:33:40
Author: heftig
Revision: 237400
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
network-manager-applet/repos/extra-i686/PKGBUILD
(from rev 237399, network-manager-applet/trunk/PKGBUILD)
network-manager-applet/repos/extra-i686/network-manager-applet.install
(from rev 237399,
network-manager-applet/trunk/network-manager-applet.install)
network-manager-applet/repos/extra-i686/nm-connection-editor.install
(from rev 237399, network-manager-applet/trunk/nm-connection-editor.install)
network-manager-applet/repos/extra-x86_64/PKGBUILD
(from rev 237399, network-manager-applet/trunk/PKGBUILD)
network-manager-applet/repos/extra-x86_64/network-manager-applet.install
(from rev 237399,
network-manager-applet/trunk/network-manager-applet.install)
network-manager-applet/repos/extra-x86_64/nm-connection-editor.install
(from rev 237399, network-manager-applet/trunk/nm-connection-editor.install)
Deleted:
network-manager-applet/repos/extra-i686/PKGBUILD
network-manager-applet/repos/extra-i686/network-manager-applet.install
network-manager-applet/repos/extra-x86_64/PKGBUILD
network-manager-applet/repos/extra-x86_64/network-manager-applet.install
---------------------------------------------+
/PKGBUILD | 168 ++++++++++++++++++++++++++
/network-manager-applet.install | 34 +++++
extra-i686/PKGBUILD | 62 ---------
extra-i686/network-manager-applet.install | 18 --
extra-i686/nm-connection-editor.install | 12 +
extra-x86_64/PKGBUILD | 62 ---------
extra-x86_64/network-manager-applet.install | 18 --
extra-x86_64/nm-connection-editor.install | 12 +
8 files changed, 226 insertions(+), 160 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-18 11:32:14 UTC (rev 237399)
+++ extra-i686/PKGBUILD 2015-04-18 11:33:40 UTC (rev 237400)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Contributor: Arjan Timmerman <ar...@archlinux.org>
-# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
-# Contributor: Tor Krill <t...@krill.nu>
-# Contributor: Will Rea <sillywi...@gmail.com>
-
-pkgbase=network-manager-applet
-pkgname=(network-manager-applet libnm-gtk)
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Applet for managing network connections"
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-url="http://www.gnome.org/projects/NetworkManager/";
-makedepends=(libnm-glib libsecret gtk3 gnome-icon-theme
mobile-broadband-provider-info iso-codes
- libnotify libmm-glib intltool gobject-introspection)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5fede8d2060002c695fbba07e59cbc7db90a39a3378bb9690274c205d2503152')
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-build() {
- cd $pkgbase-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --disable-static \
- --disable-maintainer-mode \
- --disable-migration \
- --with-modem-manager-1
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-check() {
- cd $pkgbase-$pkgver
- make -k check
-}
-
-package_network-manager-applet() {
- depends=(libnm-gtk libmm-glib libnotify libsecret)
- install=network-manager-applet.install
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" -C src/libnm-gtk uninstall
-}
-
-package_libnm-gtk() {
- pkgdesc="NetworkManager GUI library"
- depends=(libnm-glib gtk3 mobile-broadband-provider-info iso-codes)
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" -C src/libnm-gtk install
-}
Copied: network-manager-applet/repos/extra-i686/PKGBUILD (from rev 237399,
network-manager-applet/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-18 11:33:40 UTC (rev 237400)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Arjan Timmerman <ar...@archlinux.org>
+# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
+# Contributor: Tor Krill <t...@krill.nu>
+# Contributor: Will Rea <sillywi...@gmail.com>
+
+pkgbase=network-manager-applet
+pkgname=(nm-connection-editor network-manager-applet)
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="Applet for managing network connections"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/";
+makedepends=(libnm-glib libsecret gtk3 gnome-icon-theme
mobile-broadband-provider-info iso-codes
+ libnotify libmm-glib intltool gobject-introspection)
+options=('!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('5fede8d2060002c695fbba07e59cbc7db90a39a3378bb9690274c205d2503152')
+
+prepare() {
+ mkdir -p nma/etc/xdg nma/usr/bin \
+ nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
+ cd $pkgbase-$pkgver
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/networkmanager \
+ --disable-static \
+ --disable-maintainer-mode \
+ --disable-migration \
+ --with-modem-manager-1
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+check() {
+ cd $pkgbase-$pkgver
+ make -k check
+}
+
+package_nm-connection-editor() {
+ pkgdesc="NetworkManager GUI connection editor"
+ depends=(libnm-glib gtk3 mobile-broadband-provider-info iso-codes)
+ provides=("libnm-gtk=$pkgver-$pkgrel")
+ conflicts=(libnm-gtk)
+ replaces=(libnm-gtk)
+ install=nm-connection-editor.install
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+### Split network-manager-applet
+ cd ../nma
+ mv "$pkgdir"/etc/xdg/autostart etc/xdg/
+ mv "$pkgdir"/usr/bin/nm-applet usr/bin/
+ mv "$pkgdir"/usr/share/GConf usr/share/
+
+ cd usr/share
+ mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
+ mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
+ mv "$pkgdir"/usr/share/nm-applet/{{8021x,gsm-unlock,info}.ui,keyring.png}
nm-applet/
+
+ cd icons/hicolor/22x22
+ mv
"$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png
apps/
+ mv
"$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png
apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
+}
+
+package_network-manager-applet() {
+ depends=(nm-connection-editor libmm-glib libnotify libsecret)
+ install=network-manager-applet.install
+
+ mv nma/* "$pkgdir"
+}
Property changes on: network-manager-applet/repos/extra-i686/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:mergeinfo
Deleted: extra-i686/network-manager-applet.install
===================================================================
--- extra-i686/network-manager-applet.install 2015-04-18 11:32:14 UTC (rev
237399)
+++ extra-i686/network-manager-applet.install 2015-04-18 11:33:40 UTC (rev
237400)
@@ -1,18 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 0.9.6.0) < 0 )); then
- gconfpkg --uninstall network-manager-applet
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: network-manager-applet/repos/extra-i686/network-manager-applet.install
(from rev 237399, network-manager-applet/trunk/network-manager-applet.install)
===================================================================
--- extra-i686/network-manager-applet.install (rev 0)
+++ extra-i686/network-manager-applet.install 2015-04-18 11:33:40 UTC (rev
237400)
@@ -0,0 +1,17 @@
+post_install() {
+ gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 0.9.6.0) < 0 )); then
+ gconfpkg --uninstall network-manager-applet
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: network-manager-applet/repos/extra-i686/nm-connection-editor.install
(from rev 237399, network-manager-applet/trunk/nm-connection-editor.install)
===================================================================
--- extra-i686/nm-connection-editor.install (rev 0)
+++ extra-i686/nm-connection-editor.install 2015-04-18 11:33:40 UTC (rev
237400)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Property changes on:
network-manager-applet/repos/extra-i686/nm-connection-editor.install
___________________________________________________________________
Added: svn:mergeinfo
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-18 11:32:14 UTC (rev 237399)
+++ extra-x86_64/PKGBUILD 2015-04-18 11:33:40 UTC (rev 237400)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-# Contributor: Arjan Timmerman <ar...@archlinux.org>
-# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
-# Contributor: Tor Krill <t...@krill.nu>
-# Contributor: Will Rea <sillywi...@gmail.com>
-
-pkgbase=network-manager-applet
-pkgname=(network-manager-applet libnm-gtk)
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Applet for managing network connections"
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-url="http://www.gnome.org/projects/NetworkManager/";
-makedepends=(libnm-glib libsecret gtk3 gnome-icon-theme
mobile-broadband-provider-info iso-codes
- libnotify libmm-glib intltool gobject-introspection)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5fede8d2060002c695fbba07e59cbc7db90a39a3378bb9690274c205d2503152')
-
-prepare() {
- cd $pkgbase-$pkgver
-}
-
-build() {
- cd $pkgbase-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib/networkmanager \
- --disable-static \
- --disable-maintainer-mode \
- --disable-migration \
- --with-modem-manager-1
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-check() {
- cd $pkgbase-$pkgver
- make -k check
-}
-
-package_network-manager-applet() {
- depends=(libnm-gtk libmm-glib libnotify libsecret)
- install=network-manager-applet.install
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" -C src/libnm-gtk uninstall
-}
-
-package_libnm-gtk() {
- pkgdesc="NetworkManager GUI library"
- depends=(libnm-glib gtk3 mobile-broadband-provider-info iso-codes)
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" -C src/libnm-gtk install
-}
Copied: network-manager-applet/repos/extra-x86_64/PKGBUILD (from rev 237399,
network-manager-applet/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-18 11:33:40 UTC (rev 237400)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+# Contributor: Arjan Timmerman <ar...@archlinux.org>
+# Contributor: Wael Nasreddine <gand...@siemens-mobiles.org>
+# Contributor: Tor Krill <t...@krill.nu>
+# Contributor: Will Rea <sillywi...@gmail.com>
+
+pkgbase=network-manager-applet
+pkgname=(nm-connection-editor network-manager-applet)
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="Applet for managing network connections"
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+url="http://www.gnome.org/projects/NetworkManager/";
+makedepends=(libnm-glib libsecret gtk3 gnome-icon-theme
mobile-broadband-provider-info iso-codes
+ libnotify libmm-glib intltool gobject-introspection)
+options=('!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
+sha256sums=('5fede8d2060002c695fbba07e59cbc7db90a39a3378bb9690274c205d2503152')
+
+prepare() {
+ mkdir -p nma/etc/xdg nma/usr/bin \
+ nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
+ cd $pkgbase-$pkgver
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/lib/networkmanager \
+ --disable-static \
+ --disable-maintainer-mode \
+ --disable-migration \
+ --with-modem-manager-1
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+check() {
+ cd $pkgbase-$pkgver
+ make -k check
+}
+
+package_nm-connection-editor() {
+ pkgdesc="NetworkManager GUI connection editor"
+ depends=(libnm-glib gtk3 mobile-broadband-provider-info iso-codes)
+ provides=("libnm-gtk=$pkgver-$pkgrel")
+ conflicts=(libnm-gtk)
+ replaces=(libnm-gtk)
+ install=nm-connection-editor.install
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+### Split network-manager-applet
+ cd ../nma
+ mv "$pkgdir"/etc/xdg/autostart etc/xdg/
+ mv "$pkgdir"/usr/bin/nm-applet usr/bin/
+ mv "$pkgdir"/usr/share/GConf usr/share/
+
+ cd usr/share
+ mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
+ mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
+ mv "$pkgdir"/usr/share/nm-applet/{{8021x,gsm-unlock,info}.ui,keyring.png}
nm-applet/
+
+ cd icons/hicolor/22x22
+ mv
"$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png
apps/
+ mv
"$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png
apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
+}
+
+package_network-manager-applet() {
+ depends=(nm-connection-editor libmm-glib libnotify libsecret)
+ install=network-manager-applet.install
+
+ mv nma/* "$pkgdir"
+}
Property changes on: network-manager-applet/repos/extra-x86_64/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:mergeinfo
Deleted: extra-x86_64/network-manager-applet.install
===================================================================
--- extra-x86_64/network-manager-applet.install 2015-04-18 11:32:14 UTC (rev
237399)
+++ extra-x86_64/network-manager-applet.install 2015-04-18 11:33:40 UTC (rev
237400)
@@ -1,18 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 0.9.6.0) < 0 )); then
- gconfpkg --uninstall network-manager-applet
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied:
network-manager-applet/repos/extra-x86_64/network-manager-applet.install (from
rev 237399, network-manager-applet/trunk/network-manager-applet.install)
===================================================================
--- extra-x86_64/network-manager-applet.install (rev 0)
+++ extra-x86_64/network-manager-applet.install 2015-04-18 11:33:40 UTC (rev
237400)
@@ -0,0 +1,17 @@
+post_install() {
+ gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 0.9.6.0) < 0 )); then
+ gconfpkg --uninstall network-manager-applet
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: network-manager-applet/repos/extra-x86_64/nm-connection-editor.install
(from rev 237399, network-manager-applet/trunk/nm-connection-editor.install)
===================================================================
--- extra-x86_64/nm-connection-editor.install (rev 0)
+++ extra-x86_64/nm-connection-editor.install 2015-04-18 11:33:40 UTC (rev
237400)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Property changes on:
network-manager-applet/repos/extra-x86_64/nm-connection-editor.install
___________________________________________________________________
Added: svn:mergeinfo
