[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 73b9877382bf0afb0e3bf677a08a95370fbb308b

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 73b9877382bf0afb0e3bf677a08a95370fbb308b

[git]

[-- Attachment #1: Type: text/plain, Size: 4693 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  73b9877382bf0afb0e3bf677a08a95370fbb308b (commit)
       via  cfd2af522e49e8bcd3dab515606caa873bf29407 (commit)
       via  6fa0087657c0ef303094b12a0f02d2638b595517 (commit)
      from  23a87d829e017536c58cff0b9bc8962fb730df40 (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 73b9877382bf0afb0e3bf677a08a95370fbb308b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 30 11:57:22 2012 +0200

    iptables: Update to 1.4.14.
    
    References #10140.

commit cfd2af522e49e8bcd3dab515606caa873bf29407
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 30 11:53:04 2012 +0200

    libusb: The package is removed in favor to libusbx.

commit 6fa0087657c0ef303094b12a0f02d2638b595517
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 30 11:51:39 2012 +0200

    libusbx: New package.
    
    libusbx is a fork of libusb which is hardly maintained at the moment.
    Because the maintainer did not accept patches, the fork was created
    and set as a new goal to support more platforms.
    
    On IPFire, libusbx will replace libusb.

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

Summary of changes:
 iptables/iptables.nm                   |    2 +-
 libusb/libusb.nm => libusbx/libusbx.nm |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)
 rename libusb/libusb.nm => libusbx/libusbx.nm (73%)

Difference in files:
diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index b809b20..a0a1a50 100644
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = iptables
-version    = 1.4.13
+version    = 1.4.14
 release    = 1
 
 groups     = Networking/Tools
diff --git a/libusb/libusb.nm b/libusb/libusb.nm
deleted file mode 100644
index 5be7758..0000000
--- a/libusb/libusb.nm
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
-###############################################################################
-
-name       = libusb
-version    = 1.0.8
-release    = 1
-
-maintainer =
-groups     = System/Libraries
-url        = http://sourceforge.net/projects/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
-
-sources    = %{thisapp}.tar.bz2
-
-build
-	configure_options += \
-		--disable-static
-end
-
-packages
-	package %{name}
-	end
-
-	package %{name}-devel
-		template DEVEL
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/libusbx/libusbx.nm b/libusbx/libusbx.nm
new file mode 100644
index 0000000..6394d04
--- /dev/null
+++ b/libusbx/libusbx.nm
@@ -0,0 +1,41 @@
+###############################################################################
+# 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