Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents 29fe4e9 + 1c46d7f commit 690c6623ec1d040d08d9addf1832f67648582eb8 Ken Moore committed Sep 5, 2013
Showing with 192 additions and 400 deletions.
  1. +0 −22 build-files/ports-overlay/misc/pcbsd-meta-enlightenment-modules/Makefile
  2. +0 −3 build-files/ports-overlay/misc/pcbsd-meta-enlightenment-modules/pkg-descr
  3. +0 −22 build-files/ports-overlay/misc/pcbsd-meta-enlightenment/Makefile
  4. +0 −3 build-files/ports-overlay/misc/pcbsd-meta-enlightenment/pkg-descr
  5. +0 −3 build-files/ports-overlay/misc/pcbsd-meta-evilwm/pkg-descr
  6. +4 −5 build-files/ports-overlay/misc/{pcbsd-meta-evilwm → pcbsd-meta-windowlab}/Makefile
  7. +3 −0 build-files/ports-overlay/misc/pcbsd-meta-windowlab/pkg-descr
  8. +1 −1 src-qt4/pc-bugreport/maillist.ui
  9. +17 −17 src-qt4/pc-bugreport/mainwindow.ui
  10. +146 −114 src-qt4/pc-installgui/installer.ui
  11. +4 −8 src-sh/lpreserver/lpreserver
  12. +0 −174 src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/.i3/config
  13. +8 −2 src-sh/pc-extractoverlay/ports-overlay/usr/local/bin/crashuploader
  14. BIN src-sh/pc-extractoverlay/ports-overlay/usr/local/share/awesome/themes/default/background.png
  15. +0 −1 src-sh/pc-metapkgmanager/metaset/pcbsd/Enlightenment-Modules/pkg-desc
  16. BIN src-sh/pc-metapkgmanager/metaset/pcbsd/Enlightenment-Modules/pkg-icon.png
  17. +0 −1 src-sh/pc-metapkgmanager/metaset/pcbsd/Enlightenment-Modules/pkg-parent
  18. +0 −1 src-sh/pc-metapkgmanager/metaset/pcbsd/Enlightenment-Modules/ports-list
  19. +0 −2 src-sh/pc-metapkgmanager/metaset/pcbsd/Enlightenment/pkg-desc
  20. BIN src-sh/pc-metapkgmanager/metaset/pcbsd/Enlightenment/pkg-icon.png
  21. +0 −1 src-sh/pc-metapkgmanager/metaset/pcbsd/Enlightenment/ports-list
  22. 0 src-sh/pc-metapkgmanager/metaset/pcbsd/EvilWM/desktop
  23. +0 −1 src-sh/pc-metapkgmanager/metaset/pcbsd/EvilWM/pkg-desc
  24. BIN src-sh/pc-metapkgmanager/metaset/pcbsd/EvilWM/pkg-icon.png
  25. +0 −1 src-sh/pc-metapkgmanager/metaset/pcbsd/EvilWM/pkg-parent
  26. +0 −1 src-sh/pc-metapkgmanager/metaset/pcbsd/EvilWM/ports-list
  27. 0 src-sh/pc-metapkgmanager/metaset/pcbsd/{Enlightenment → WindowLab}/desktop
  28. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/WindowLab/pkg-desc
  29. BIN src-sh/pc-metapkgmanager/metaset/pcbsd/WindowLab/pkg-icon.png
  30. 0 src-sh/pc-metapkgmanager/metaset/pcbsd/{Enlightenment → WindowLab}/pkg-parent
  31. +1 −0 src-sh/pc-metapkgmanager/metaset/pcbsd/WindowLab/ports-list
  32. +1 −0 src-sh/port-files/Makefile
  33. +6 −17 src-sh/port-files/pkg-plist
@@ -1,22 +0,0 @@
-# New ports collection makefile for: pcbsd-meta-enlightenment-modules
-#
-# $FreeBSD$
-#
-
-PORTNAME= pcbsd-meta-enlightenment-modules
-PORTVERSION= CHGVERSION
-CATEGORIES= misc
-MASTER_SITES= # empty
-DISTFILES= # none
-
-MAINTAINER= kris@pcbsd.org
-COMMENT= The meta-port pcbsd-meta-enlightenment-modules
-
-RUN_DEPENDS= e17-modules>=0:${PORTSDIR}/x11-wm/e17-modules
-
-NO_BUILD= yes
-
-do-install:
- ${DO_NADA}
-
-.include <bsd.port.mk>
@@ -1,3 +0,0 @@
-The meta-port for PC-BSD meta-pkg enlightenment-modules
-
-WWW: http://www.pcbsd.org
@@ -1,22 +0,0 @@
-# New ports collection makefile for: pcbsd-meta-enlightenment
-#
-# $FreeBSD$
-#
-
-PORTNAME= pcbsd-meta-enlightenment
-PORTVERSION= CHGVERSION
-CATEGORIES= misc
-MASTER_SITES= # empty
-DISTFILES= # none
-
-MAINTAINER= kris@pcbsd.org
-COMMENT= The meta-port pcbsd-meta-enlightenment
-
-RUN_DEPENDS= enlightenment>=0:${PORTSDIR}/x11-wm/enlightenment
-
-NO_BUILD= yes
-
-do-install:
- ${DO_NADA}
-
-.include <bsd.port.mk>
@@ -1,3 +0,0 @@
-The meta-port for PC-BSD meta-pkg enlightenment
-
-WWW: http://www.pcbsd.org
@@ -1,3 +0,0 @@
-The meta-port for PC-BSD meta-pkg evilwm
-
-WWW: http://www.pcbsd.org
@@ -1,19 +1,18 @@
-# New ports collection makefile for: pcbsd-meta-evilwm
+# New ports collection makefile for: pcbsd-meta-windowlab
#
# $FreeBSD$
#
-PORTNAME= pcbsd-meta-evilwm
+PORTNAME= pcbsd-meta-windowlab
PORTVERSION= CHGVERSION
CATEGORIES= misc
MASTER_SITES= # empty
DISTFILES= # none
MAINTAINER= kris@pcbsd.org
-COMMENT= The meta-port pcbsd-meta-evilwm
-
-RUN_DEPENDS= evilwm>=0:${PORTSDIR}/x11-wm/evilwm
+COMMENT= The meta-port pcbsd-meta-windowlab
+RUN_DEPENDS= windowlab>=0:${PORTSDIR}/x11-wm/windowlab
NO_BUILD= yes
do-install:
@@ -0,0 +1,3 @@
+The meta-port for PC-BSD meta-pkg windowlab
+
+WWW: http://www.pcbsd.org
@@ -105,7 +105,7 @@
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Visit to following web page to subscribe or see achives</string>
+ <string>Visit the following web page to subscribe or view archives.</string>
</property>
</widget>
</item>
@@ -31,7 +31,7 @@
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_9">
<property name="text">
- <string>Please select component which occures problem</string>
+ <string>Please select the component where the error occurs.</string>
</property>
</widget>
</item>
@@ -297,8 +297,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>602</width>
- <height>334</height>
+ <width>589</width>
+ <height>205</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -436,8 +436,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>602</width>
- <height>334</height>
+ <width>343</width>
+ <height>104</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -512,8 +512,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>587</width>
- <height>358</height>
+ <width>96</width>
+ <height>628</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -614,8 +614,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>587</width>
- <height>358</height>
+ <width>302</width>
+ <height>388</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
@@ -713,8 +713,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>587</width>
- <height>342</height>
+ <width>96</width>
+ <height>537</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -795,8 +795,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>602</width>
- <height>334</height>
+ <width>569</width>
+ <height>79</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_19">
@@ -861,8 +861,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>602</width>
- <height>334</height>
+ <width>395</width>
+ <height>58</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
@@ -953,8 +953,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>587</width>
- <height>336</height>
+ <width>309</width>
+ <height>351</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">
Oops, something went wrong.

0 comments on commit 690c662

Please sign in to comment.