[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 91d4c3f389a100c2089fdc5c40f6605d0e033bb4

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 91d4c3f389a100c2089fdc5c40f6605d0e033bb4

[git]

[-- Attachment #1: Type: text/plain, Size: 5128 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  91d4c3f389a100c2089fdc5c40f6605d0e033bb4 (commit)
       via  20d4a89f358a499b2294e5dbb3d30d1fd25a0937 (commit)
       via  ea2fec1919ee1e04c391f8b8c5822d1e37830ad4 (commit)
      from  6bb58a239137257ef3eaaf6d1efc0f0b1d34d143 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91d4c3f389a100c2089fdc5c40f6605d0e033bb4
Merge: 20d4a89 ea2fec1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Feb 10 20:24:40 2014 +0100

    Merge remote-tracking branch 'stevee/dosfsutils-update'

commit 20d4a89f358a499b2294e5dbb3d30d1fd25a0937
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Feb 10 18:56:25 2014 +0100

    libusb: libusbx has been merged into libusb 1.0.18 again.

commit ea2fec1919ee1e04c391f8b8c5822d1e37830ad4
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Feb 9 21:53:09 2014 +0100

    dosfstools: Update to 3.0.25.
    
    Cleanup install process, with the following benefits:
    * Now symlinks for fsck.msdos and fsck.vfat will be created.
    * Manpages are shipped.

-----------------------------------------------------------------------

Summary of changes:
 dosfstools/dosfstools.nm               |  8 +++-----
 libusbx/libusbx.nm => libusb/libusb.nm | 16 ++++++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)
 rename libusbx/libusbx.nm => libusb/libusb.nm (74%)

Difference in files:
diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm
index 72727f5..2d62205 100644
--- a/dosfstools/dosfstools.nm
+++ b/dosfstools/dosfstools.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = dosfstools
-version    = 3.0.24
+version    = 3.0.25
 release    = 1
 
 groups     = System/Filesystems
@@ -21,10 +21,8 @@ end
 source_dl  = http://www.daniel-baumann.ch/files/software/dosfstools/
 
 build
-	install
-		make install-bin DESTDIR=%{BUILDROOT} \
-			PREFIX=/usr SBINDIR=/sbin
-	end
+	make_install_targets += \
+		PREFIX=%{prefix}
 end
 
 packages
diff --git a/libusb/libusb.nm b/libusb/libusb.nm
new file mode 100644
index 0000000..8c9129d
--- /dev/null
+++ b/libusb/libusb.nm
@@ -0,0 +1,45 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = libusb
+version    = 1.0.18
+release    = 1
+
+groups     = System/Libraries
+url        = http://sourceforge.net/apps/mediawiki/libusb/
+license    = LGPLv2+
+summary    = A library which allows userspace access to USB devices.
+
+description
+	This package provides a way for applications to access USB devices.
+end
+
+source_dl  = http://downloads.sourceforge.net/libusb/libusb-1.0/
+sources    = %{thisapp}.tar.bz2
+
+build
+	requires
+		libudev-devel
+	end
+
+	configure_options += \
+		--disable-static \
+		--enable-examples-build
+end
+
+packages
+	package %{name}
+		provides  = libusbx = %{thisver}
+		obsoletes = libusbx < %{thisver}
+	end
+
+	package %{name}-devel
+		template DEVEL
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/libusbx/libusbx.nm b/libusbx/libusbx.nm
deleted file mode 100644
index 6394d04..0000000
--- a/libusbx/libusbx.nm
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
-###############################################################################
-
-name       = libusbx
-version    = 1.0.11
-release    = 1
-
-groups     = System/Libraries
-url        = http://sourceforge.net/apps/mediawiki/libusbx/
-license    = LGPLv2+
-summary    = A library which allows userspace access to USB devices.
-
-description
-	This package provides a way for applications to access USB devices.
-end
-
-source_dl  = http://downloads.sourceforge.net/libusbx/
-sources    = %{thisapp}.tar.bz2
-
-build
-	configure_options += \
-		--disable-static \
-		--enable-examples-build
-end
-
-packages
-	package %{name}
-		provides  = libusb = %{thisver}
-		obsoletes = libusb < %{thisver}
-	end
-
-	package %{name}-devel
-		template DEVEL
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end


hooks/post-receive
--
IPFire 3.x development tree