diff options
author | Arjan Bouter | 2009-09-01 01:57:55 +0200 |
---|---|---|
committer | Arjan Bouter | 2009-09-01 01:57:55 +0200 |
commit | eb26d7e0e990372973bf59c496fdf1b2083515c1 (patch) | |
tree | 3bee42bb968b84cce615f260117b8360416e6601 | |
parent | 524f010708b2afb2575a6cb0cbca0759b14b1593 (diff) | |
parent | 3ebc42bc709f275626fd6be6bf3f52aba4fccfb4 (diff) |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r-- | ChangeLog | 3 | ||||
-rwxr-xr-x | accounts | 1 | ||||
-rwxr-xr-x | graphics/libgphoto2/DEPENDS | 6 | ||||
-rwxr-xr-x | graphics/libgphoto2/DETAILS | 4 | ||||
-rw-r--r-- | graphics/libgphoto2/HISTORY | 5 | ||||
-rw-r--r-- | graphics/libgphoto2/drivers | 2 | ||||
-rwxr-xr-x | groups | 1 | ||||
-rwxr-xr-x | http/arora/DETAILS | 4 | ||||
-rw-r--r-- | http/arora/HISTORY | 3 | ||||
-rwxr-xr-x | kde4-apps/digikam4/DETAILS | 4 | ||||
-rw-r--r-- | kde4-apps/digikam4/HISTORY | 4 | ||||
-rwxr-xr-x | kde4-apps/digikam4/PRE_BUILD | 3 | ||||
-rwxr-xr-x | kde4-apps/kmldonkey4/DETAILS | 10 | ||||
-rw-r--r-- | kde4-apps/kmldonkey4/HISTORY | 3 | ||||
-rwxr-xr-x | kde4-support/akonadi/DETAILS | 8 | ||||
-rw-r--r-- | kde4-support/akonadi/HISTORY | 3 | ||||
-rwxr-xr-x | utils/htop/DEPENDS | 1 | ||||
-rw-r--r-- | utils/htop/HISTORY | 3 |
18 files changed, 50 insertions, 18 deletions
@@ -1,3 +1,6 @@ +2009-08-31 Treeve Jelbert <treeve@sourcemage.org> + * accounts, group: add camera + 2009-08-30 Donald Johnson <ltdonny@gmail.com> * x11/tint2: New spell, custom taskbar app @@ -80,4 +80,5 @@ oprofile:166:173 flowd:167:174 tss:175:175 memcached:176:177 +camera:177:178 nobody:65534:65534 diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS index a453337205..470e1e6c6d 100755 --- a/graphics/libgphoto2/DEPENDS +++ b/graphics/libgphoto2/DEPENDS @@ -18,10 +18,8 @@ optional_depends libexif "--with-exif" "--without-exif" \ optional_depends libtool "--with-ltdl" "--without-ltdl" \ "an alternative way of opening shared libraries" && -# With 2.1.99, --with-libusb makes configure crash, let nothing as libusb -# is enabled by default -optional_depends libusb "--with-libusb" \ - "--without-libusb" \ +optional_depends libusb "" \ + "" \ "enable use of cameras connected though the USB port" && optional_depends dbus "" "" "for dbus support" && diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS index bf2f724d6a..4630e72749 100755 --- a/graphics/libgphoto2/DETAILS +++ b/graphics/libgphoto2/DETAILS @@ -1,6 +1,6 @@ SPELL=libgphoto2 - VERSION=2.4.6 - SOURCE_HASH=sha512:1b99a28eb5c497e7015e108a7bd4dc58529b69da2a13e17aff5be4aaeac7807d1c5b2baff7e8f7c9a088734cf3ce52b1b990b1e489c6903fc55a7e5f5ab3320e + VERSION=2.4.7 + SOURCE_HASH=sha512:8a2471eb5d8989af9fa9930905911fadc8d1d58668f1ab0c0f729dbb2c93818f1ac2a2a56dcd655afe8184bb680d0ef35cd10db45d6f3094787519c918aba2a2 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY index 9556c09992..67a58d22ad 100644 --- a/graphics/libgphoto2/HISTORY +++ b/graphics/libgphoto2/HISTORY @@ -1,3 +1,8 @@ +2009-08-31 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.4.7 + * DEPENDS: fix libusb flags + * drivers: add extra models: jl2005a, topfield + 2009-05-18 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.4.6 diff --git a/graphics/libgphoto2/drivers b/graphics/libgphoto2/drivers index b64d33a754..19eb912150 100644 --- a/graphics/libgphoto2/drivers +++ b/graphics/libgphoto2/drivers @@ -16,6 +16,7 @@ hp215 iclick jamcam jd11 +jl2005a kodak_dc120 kodak_dc210 kodak_dc240 @@ -54,4 +55,5 @@ sq905 stv0674 stv0680 sx330z +topfield toshiba_pdrm11 @@ -99,5 +99,6 @@ flowd:174: tss:175: pkcs11:176: memcached:177: +camera:178: users:1000: nogroup:65534: diff --git a/http/arora/DETAILS b/http/arora/DETAILS index 9fc816b8dd..f3061a79c3 100755 --- a/http/arora/DETAILS +++ b/http/arora/DETAILS @@ -13,10 +13,10 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" SOURCE_IGNORE=volatile FORCE_DOWNLOAD=1 else - VERSION=0.8.0 + VERSION=0.9.0 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL=http://arora.googlecode.com/files/$SOURCE - SOURCE_HASH=sha512:9bc629b0eb8bbca4e3c02f25641d2d93aeca4f77cbfad70e2e0ce7ce7abf3202f9614561c97db89882f3ed2095a0a7caa43d88d9e29b79776a910fb6bfb69979 + SOURCE_HASH=sha512:3542b38931038c47759c9d3a886adcfa008d097a3439f0dd0f4ab5801993455fc2a1643c2ba1d52360366b6f09a86597c3b447c0b05e4214178ede3931f07bbd SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} fi WEB_SITE=http://code.google.com/p/arora/ diff --git a/http/arora/HISTORY b/http/arora/HISTORY index e90d458d5d..11bb69f655 100644 --- a/http/arora/HISTORY +++ b/http/arora/HISTORY @@ -1,3 +1,6 @@ +2009-08-31 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 0.9.0 + 2009-07-21 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.8.0 diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS index 6e91eba395..4a52f4dec9 100755 --- a/kde4-apps/digikam4/DETAILS +++ b/kde4-apps/digikam4/DETAILS @@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then SOURCE=${SPELLX}-$VERSION.tar.bz2 SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX else - VERSION=1.0.0-beta3 - SOURCE_HASH=sha512:32a131cdc614fe64e4de92df0e9ea4d9687536ff3506b224690e694123d2b14c69d2be9b96feddb70e76668baa0dacd0bb75083b198aa58df730249240ebcf75 + VERSION=1.0.0-beta4 + SOURCE_HASH=sha512:6de23e46b8fb9788dc746eeab96492e1b6326efd43eef6e88470b9d39c110126316e2846791eac2ae06275d0b7d51a9c8131c16498b1082bccd0d9d7a702da98 SOURCE=${SPELLX}-$VERSION.tar.bz2 SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE fi diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY index 6674afd8ee..8b99a5f6e1 100644 --- a/kde4-apps/digikam4/HISTORY +++ b/kde4-apps/digikam4/HISTORY @@ -1,3 +1,7 @@ +2009-08-31 Treeve Jelbert <treevesourcemage.org> + * DETAILS: version 1.0.0-beta4 + * PRE_BUILD: added, fix CMakeLists.txt + 2009-08-12 Treeve Jelbert <treevesourcemage.org> * DEPENDS: add jpeg * TRIGGERS: add kdegraphics4 diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD new file mode 100755 index 0000000000..762c89fdad --- /dev/null +++ b/kde4-apps/digikam4/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +sed -i '/tests/D' CMakeLists.txt diff --git a/kde4-apps/kmldonkey4/DETAILS b/kde4-apps/kmldonkey4/DETAILS index 9226616556..476795fe82 100755 --- a/kde4-apps/kmldonkey4/DETAILS +++ b/kde4-apps/kmldonkey4/DETAILS @@ -1,9 +1,11 @@ SPELL=kmldonkey4 VERSION=2.0.2 - SOURCE_HASH=sha512:d6c6cab194f7c61576e7013dcc7f54cfb4d26500803b7baa593f721637feaf2ea2e0b57cf05fe51893e27a5052e23aa8e62927cfef6b2684232a988683742497 - SOURCE=${SPELL//4}-$VERSION.tar.bz2 -SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION - SOURCE_URL[0]=$KDE_URL/stable/4.0.1/src/extragear/$SOURCE + KVER=4.3.0 + SOURCE_HASH=sha512:01992ba197a91d2a95c632991dd1a26502a43ab2740a5bd8462b6300e83ca3b10e632efce5e51189b45aee29e6a1630cc607e92c43f4cad69ad0c959a748b987 + SX=${SPELL//4}-$VERSION-kde${KVER} + SOURCE=$SX.tar.bz2 +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SX + SOURCE_URL[0]=$KDE_URL/stable/$KVER/src/extragear/$SOURCE WEB_SITE=http://www.kmldonkey.org ENTERED=20071213 LICENSE[0]=GPL diff --git a/kde4-apps/kmldonkey4/HISTORY b/kde4-apps/kmldonkey4/HISTORY index 51c2804f05..322cc23801 100644 --- a/kde4-apps/kmldonkey4/HISTORY +++ b/kde4-apps/kmldonkey4/HISTORY @@ -1,3 +1,6 @@ +2008-08-30 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: new tarball at current stable kde extragear + 2008-02-05 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.0.2 diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS index 697ca06087..bacef7173a 100755 --- a/kde4-support/akonadi/DETAILS +++ b/kde4-support/akonadi/DETAILS @@ -12,11 +12,11 @@ if [[ $AK_VER == devel ]]; then SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn" else if [[ $AK_VER == unstable ]]; then - VERSION=1.1.95 - SOURCE_HASH=sha512:efade1cb86908b25f4168e0429de58d2556025020dd3bdb3ca13107dcaa00cd396f6b5f2d2c3ced34b527800de1e20cbda77caedd21cea7e3259ba3422213644 + VERSION=1.2.1 + SOURCE_HASH=sha512:213aba927f690b6f812d7de4800e24fe3e8931aa5e67c632f8b6af378ce71a8b59302d06047b8297336ea07242c093337c70bda12ac3ca4ed6fa3d27b17b5a89 else - VERSION=1.2.0 - SOURCE_HASH=sha512:691a3d776495b37ad2645645728908e4487590086d56f3d784f6accc6e67f160913c2f56230059b8898a57a658cbcd70f2c5a6475dbd38c154beff1c6b5c163c + VERSION=1.2.1 + SOURCE_HASH=sha512:213aba927f690b6f812d7de4800e24fe3e8931aa5e67c632f8b6af378ce71a8b59302d06047b8297336ea07242c093337c70bda12ac3ca4ed6fa3d27b17b5a89 fi SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_URL[0]=http://download.akonadi-project.org/$SOURCE diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY index aaee5b32cb..70267221d6 100644 --- a/kde4-support/akonadi/HISTORY +++ b/kde4-support/akonadi/HISTORY @@ -1,3 +1,6 @@ +2009-08-30 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.2.1 (stable + devel) + 2009-08-27 Treeve Jelbert <treeve@sourcemage.org> * TRIGGERS: added diff --git a/utils/htop/DEPENDS b/utils/htop/DEPENDS index 0c6b6ed8cd..863def7fec 100755 --- a/utils/htop/DEPENDS +++ b/utils/htop/DEPENDS @@ -1,2 +1,3 @@ depends ncurses && +depends python && suggest_depends lsof "" "" "to display open files for a process (runtime)" diff --git a/utils/htop/HISTORY b/utils/htop/HISTORY index ae30686139..c5b9d817fb 100644 --- a/utils/htop/HISTORY +++ b/utils/htop/HISTORY @@ -1,3 +1,6 @@ +2009-08-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DEPENDS: added missing dependency on python + 2009-06-23 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.8.3 |