Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2d6d0c60ec3992f83ced9b4b04501ca0d585f004)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2d6d0c60ec3992f83ced9b4b04501ca0d585f004)
  • Date: Mon, 16 Nov 2009 10:13:54 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

disk/partimage-ng/DEPENDS | 4 ++
disk/partimage-ng/HISTORY | 6 ++++
disk/partimage-ng/PRE_BUILD | 4 ++
disk/partimage-ng/hal.diff | 52
++++++++++++++++++++++++++++++++++++++
http/cherokee/DEPENDS | 2 -
http/cherokee/DETAILS | 4 +-
http/cherokee/HISTORY | 5 +++
libs/libdaemon/DETAILS | 4 +-
libs/libdaemon/HISTORY | 3 ++
printer/cups/70-cups-libusb.rules | 2 -
printer/cups/HISTORY | 3 ++
11 files changed, 82 insertions(+), 7 deletions(-)

New commits:
commit f812df13614f9df6f57140f5b3605c8b32e59cf3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdaemon: => 0.14

commit e669ba8225521230b1eda51aa6c837fa4f57de8c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cups - fix syntax error in udev rules

commit 2bf69b3c02338ad2d3dd5023a752432a42493f73
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

partimage-ng: make hal optional
fix build with latest ntfs-3g

commit e2871145a960bcb44b5a4fac82ac85533e93b041
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cherokee: => 0.99.27

diff --git a/disk/partimage-ng/DEPENDS b/disk/partimage-ng/DEPENDS
index d010a32..a312d33 100755
--- a/disk/partimage-ng/DEPENDS
+++ b/disk/partimage-ng/DEPENDS
@@ -1,7 +1,9 @@
if [[ $PART_VCS == y ]];then
depends bzr &&
depends boost &&
- depends $PART_NTFS
+ depends $PART_NTFS &&
+ depends pkgconfig &&
+ optional_depends hal '' '-DNO_HAL=1' 'CD detection'
else
depends ntfsprogs
fi &&
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 3291889..1e8241b 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,9 @@
+2009-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add pkgconfig. optional hal
+ * PRE_BUILD: fix for latest ntfs-3g
+ make hal optional
+ * hal.diff: added
+
2009-07-03 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: only apply e2fs patch to release tarball

diff --git a/disk/partimage-ng/PRE_BUILD b/disk/partimage-ng/PRE_BUILD
index cdbeaa5..50bab0a 100755
--- a/disk/partimage-ng/PRE_BUILD
+++ b/disk/partimage-ng/PRE_BUILD
@@ -2,6 +2,10 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
if [[ $PART_VCS == y ]];then
if spell_ok ntfs-3g;then
+# make hal optional
+ patch -p1 -i $SPELL_DIRECTORY/hal.diff &&
+# fix nr of parameters used for ntfs-3g-2009.11.14
+ sed -i '/ntfs_get_size_for_mapping_pairs/s/0/0,0/' src/ntfspartition_c.c
&&
sed -i '/set(NTFS3G_PREFERRED/s/0/1/' src/CMakeLists.txt
fi
else
diff --git a/disk/partimage-ng/hal.diff b/disk/partimage-ng/hal.diff
new file mode 100644
index 0000000..504e856
--- /dev/null
+++ b/disk/partimage-ng/hal.diff
@@ -0,0 +1,52 @@
+diff -uNr partimage-ng/doc/CMakeLists.txt partimage-ng.cp/doc/CMakeLists.txt
+--- partimage-ng/doc/CMakeLists.txt 2009-01-23 14:44:55.000000000 +0100
++++ partimage-ng.cp/doc/CMakeLists.txt 2009-11-16 16:58:11.000000000 +0100
+@@ -1,3 +1,6 @@
+ # install man pages
+ INSTALL(FILES partimage-ng.8 DESTINATION share/man/man8/)
++if (NOT NO_HAL)
+ INSTALL(FILES ping-cdcat.8 DESTINATION share/man/man8/)
++endif (NOT NO_HAL)
++
+diff -uNr partimage-ng/src/CMakeLists.txt partimage-ng.cp/src/CMakeLists.txt
+--- partimage-ng/src/CMakeLists.txt 2009-01-23 14:44:55.000000000 +0100
++++ partimage-ng.cp/src/CMakeLists.txt 2009-11-16 16:57:32.000000000 +0100
+@@ -51,7 +51,6 @@
+ FIND_PACKAGE(Ntfs)
+ FIND_PACKAGE(Ntfs3g)
+ FIND_PACKAGE(Parted REQUIRED)
+-FIND_PACKAGE(Hal REQUIRED)
+
+ # OK, figure out which ntfs library to use
+ IF(NTFS3G_PREFERRED)
+@@ -101,20 +100,26 @@
+ ENDIF (NTFS3G_PREFERRED AND NTFS3G_FOUND)
+
+ # Directories
+-INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR} ${NTFS3G_INCLUDE_DIR})
+-LINK_DIRECTORIES(${HAL_LIBRARY_DIR} ${NTFS3G_LIBRARY_DIR})
++INCLUDE_DIRECTORIES(${NTFS3G_INCLUDE_DIR})
++LINK_DIRECTORIES(${NTFS3G_LIBRARY_DIR})
+
+ # add the main target
+ ADD_EXECUTABLE(partimage-ng ${partimage_ng_src})
+-ADD_EXECUTABLE(ping-cdcat ${ping-cdcat_src})
+
+
+ # link target libraries
+ TARGET_LINK_LIBRARIES(partimage-ng parted ext2fs ${NTFS_LIBRARIES})
+-TARGET_LINK_LIBRARIES(ping-cdcat ${HAL_LIBRARIES})
+
+
+ # install application and scripts
+ INSTALL(TARGETS partimage-ng DESTINATION "sbin")
++
++if (NOT NO_HAL)
++FIND_PACKAGE(Hal REQUIRED)
++INCLUDE_DIRECTORIES(${HAL_INCLUDE_DIR} )
++LINK_DIRECTORIES(${HAL_LIBRARY_DIR} )
++TARGET_LINK_LIBRARIES(ping-cdcat ${HAL_LIBRARIES})
++ADD_EXECUTABLE(ping-cdcat ${ping-cdcat_src})
+ INSTALL(TARGETS ping-cdcat DESTINATION "sbin")
++endif (NOT NO_HAL)
+
diff --git a/http/cherokee/DEPENDS b/http/cherokee/DEPENDS
index 59dbeb6..6379a8a 100755
--- a/http/cherokee/DEPENDS
+++ b/http/cherokee/DEPENDS
@@ -1,4 +1,4 @@
-depends daemon &&
+optional_depends LIBAVCODEC '' '' 'video codec' &&
optional_depends pcre "" "" "regular expression support" &&
optional_depends openssl \
"--disable-tls" \
diff --git a/http/cherokee/DETAILS b/http/cherokee/DETAILS
index 7f8395b..784085d 100755
--- a/http/cherokee/DETAILS
+++ b/http/cherokee/DETAILS
@@ -3,8 +3,8 @@
# VERSION=0.11.6
# SOURCE_HASH=sha512:
#else
- VERSION=0.99.26
-
SOURCE_HASH=sha512:f3be9afa1dc1f54b7f920ea24c5fed4d4bd0932d32e84fdcb43cc10aeb150a2901ec43c524c411fa3134842234bf4942a4dde38f0a6d91b2d15e9ec54e4611ff
+ VERSION=0.99.27
+
SOURCE_HASH=sha512:a2e9cab3adbc9c9c0bdbb7a13d4572cd953edddff10de20b0c56c2756d254ffcb38f5cdea97ea70af6c4b6ee0ff3fe3d39e3660efa2897bd63cb7491e2ab8945
#fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/http/cherokee/HISTORY b/http/cherokee/HISTORY
index b2a6760..61615c2 100644
--- a/http/cherokee/HISTORY
+++ b/http/cherokee/HISTORY
@@ -1,3 +1,8 @@
+2009-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.99.27
+ * DEPENDS: remove daemon
+ add optional LIBAVCODEC
+
2009-11-01 Bor Kraljič <pyrobor AT ver.si>
* PREPARE: commented query for dev version because
dev version is allready commented in DETAILS
diff --git a/libs/libdaemon/DETAILS b/libs/libdaemon/DETAILS
index 68f3280..c0829cb 100755
--- a/libs/libdaemon/DETAILS
+++ b/libs/libdaemon/DETAILS
@@ -1,6 +1,6 @@
SPELL=libdaemon
- VERSION=0.13
-
SOURCE_HASH=sha512:eca6f99c87f33a48c097a9d3f1aac80b16951b3460fc6258cd26044bbd1c87973397eda27ef70c77ce3b48ccfaaf459cf1e770f782d7cdbd31e5fa206b502bea
+ VERSION=0.14
+
SOURCE_HASH=sha512:a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://0pointer.de/lennart/projects/libdaemon/
diff --git a/libs/libdaemon/HISTORY b/libs/libdaemon/HISTORY
index 867b45e..bdacdfd 100644
--- a/libs/libdaemon/HISTORY
+++ b/libs/libdaemon/HISTORY
@@ -1,3 +1,6 @@
+2008-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.14
+
2008-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.13

diff --git a/printer/cups/70-cups-libusb.rules
b/printer/cups/70-cups-libusb.rules
index 43f17ef..867b9a0 100644
--- a/printer/cups/70-cups-libusb.rules
+++ b/printer/cups/70-cups-libusb.rules
@@ -3,7 +3,7 @@
# support.
ACTION=="add", SUBSYSTEM=="usb", \
ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", \
- DEVTYPE="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"
+ ENV{DEVTYPE}="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"



diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index abdc12d..6cccf1f 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2009-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * 70-cups-libusb.rules: fix syntax error
+
2009-11-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (2d6d0c60ec3992f83ced9b4b04501ca0d585f004), Treeve Jelbert, 11/16/2009

Archive powered by MHonArc 2.6.24.

Top of Page