From a83fc8b3eb6daad43f4bb460d13f83dc70c31db9 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 21 Apr 2009 11:38:28 +0000 Subject: [PATCH] introduce a new logic to handle release numbers when a significant change is made on a package: - release packages get a "patch level" added to their release number, this last one being incremented on every change ; - trunk packages should always get their release number incremented. SVN-Revision: 15321 --- Xorg/driver/xf86-input-tslib/Makefile | 2 +- Xorg/xorg/xserver/xorg-kdrive/Makefile | 2 +- Xorg/xorg/xserver/xorg-server/Makefile | 2 +- ipv6/radvd/Makefile | 4 ++-- libs/freetype/Makefile | 2 +- libs/glib2/Makefile | 2 +- libs/net-snmp/Makefile | 4 ++-- libs/zaptel-1.4.x/Makefile | 2 +- multimedia/qc-usb/Makefile | 4 ++-- net/asterisk-1.4.x/Makefile | 4 ++-- net/asterisk-1.6.x/Makefile | 4 ++-- net/asterisk-addons-1.4.x/Makefile | 4 ++-- net/bind/Makefile | 4 ++-- net/chrony/Makefile | 4 ++-- net/cups/Makefile | 2 +- net/mini_snmpd/Makefile | 5 ++++- net/openvpn/Makefile | 4 ++-- net/stun/Makefile | 3 ++- sound/mpd/Makefile | 2 +- 19 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Xorg/driver/xf86-input-tslib/Makefile b/Xorg/driver/xf86-input-tslib/Makefile index d7a8e4b3b..3e544d91e 100644 --- a/Xorg/driver/xf86-input-tslib/Makefile +++ b/Xorg/driver/xf86-input-tslib/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xf86-input-tslib -PKG_RELEASE:=1 +PKG_RELEASE:=1.1 PKG_VERSION:=0.0.5 PKG_SOURCE_URL:=http://www.pengutronix.de/software/xf86-input-tslib/download/ diff --git a/Xorg/xorg/xserver/xorg-kdrive/Makefile b/Xorg/xorg/xserver/xorg-kdrive/Makefile index 6c23468b9..b90729a2b 100644 --- a/Xorg/xorg/xserver/xorg-kdrive/Makefile +++ b/Xorg/xorg/xserver/xorg-kdrive/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xserver-kdrive -PKG_RELEASE:=1 +PKG_RELEASE:=1.1 PKG_VERSION:=1.5.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/ PKG_SOURCE:=xorg-server-$(PKG_VERSION).tar.bz2 diff --git a/Xorg/xorg/xserver/xorg-server/Makefile b/Xorg/xorg/xserver/xorg-server/Makefile index bca8c440b..38b1cb330 100644 --- a/Xorg/xorg/xserver/xorg-server/Makefile +++ b/Xorg/xorg/xserver/xorg-server/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xorg-server -PKG_RELEASE:=1 +PKG_RELEASE:=1.1 PKG_VERSION:=1.5.1 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile index fe7e72e06..d1937c652 100644 --- a/ipv6/radvd/Makefile +++ b/ipv6/radvd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radvd PKG_VERSION:=1.2 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/libs/freetype/Makefile b/libs/freetype/Makefile index b590d8401..ab7a35c3e 100644 --- a/libs/freetype/Makefile +++ b/libs/freetype/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freetype PKG_VERSION:=2.3.7 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/freetype diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 0b7971b7e..832f83448 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 PKG_VERSION:=2.18.1 -PKG_RELEASE:=5 +PKG_RELEASE:=4.1 PKG_SOURCE:=glib-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile index 340dc1a25..226fe1615 100644 --- a/libs/net-snmp/Makefile +++ b/libs/net-snmp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=net-snmp PKG_VERSION:=5.1.2 -PKG_RELEASE:=2.4 +PKG_RELEASE:=3.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/net-snmp diff --git a/libs/zaptel-1.4.x/Makefile b/libs/zaptel-1.4.x/Makefile index bd920e0e5..87dfcb836 100644 --- a/libs/zaptel-1.4.x/Makefile +++ b/libs/zaptel-1.4.x/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=zaptel PKG_VERSION:=1.4.9.2 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://ftp.digium.com/pub/zaptel/releases/ diff --git a/multimedia/qc-usb/Makefile b/multimedia/qc-usb/Makefile index 4b967d06f..7641834f5 100644 --- a/multimedia/qc-usb/Makefile +++ b/multimedia/qc-usb/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=qc-usb PKG_VERSION:=0.6.6 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/qce-ga diff --git a/net/asterisk-1.4.x/Makefile b/net/asterisk-1.4.x/Makefile index 65d21eff9..023eaa555 100644 --- a/net/asterisk-1.4.x/Makefile +++ b/net/asterisk-1.4.x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk PKG_VERSION:=1.4.23.1 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/ diff --git a/net/asterisk-1.6.x/Makefile b/net/asterisk-1.6.x/Makefile index 9adf71661..776e6a7eb 100644 --- a/net/asterisk-1.6.x/Makefile +++ b/net/asterisk-1.6.x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -31,7 +31,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk PKG_VERSION:=1.6.1-rc1 -PKG_RELEASE:=1 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/ diff --git a/net/asterisk-addons-1.4.x/Makefile b/net/asterisk-addons-1.4.x/Makefile index 72a84cc79..b5c487102 100644 --- a/net/asterisk-addons-1.4.x/Makefile +++ b/net/asterisk-addons-1.4.x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk-addons PKG_VERSION:=1.4.7 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/ diff --git a/net/bind/Makefile b/net/bind/Makefile index c3d5065cf..f8be97b90 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bind PKG_VERSION:=9.5.0-P1 -PKG_RELEASE:=1 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/net/chrony/Makefile b/net/chrony/Makefile index e07c1377b..b4c19b445 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chrony PKG_VERSION:=1.23 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= ftp://chrony.sunsite.dk/projects/chrony/ \ diff --git a/net/cups/Makefile b/net/cups/Makefile index cdc32a3d1..366c257d9 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cups PKG_VERSION:=1.3.7 -PKG_RELEASE:=5 +PKG_RELEASE:=4.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 PKG_SOURCE_URL:= \ diff --git a/net/mini_snmpd/Makefile b/net/mini_snmpd/Makefile index a2679bd28..0ed7dcb20 100644 --- a/net/mini_snmpd/Makefile +++ b/net/mini_snmpd/Makefile @@ -9,12 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mini_snmpd -PKG_RELEASE:=1 +PKG_VERSION:=1.0 +PKG_RELEASE:=1.1 PKG_SOURCE:=mini_snmpd.tar.gz PKG_SOURCE_URL:=http://members.aon.at/linuxfreak/linux/ PKG_MD5SUM:=13f2202ff01ff6b6463989f34f453063 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + include $(INCLUDE_DIR)/package.mk define Package/mini-snmpd diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 55bf4f56a..92457f817 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.0.9 -PKG_RELEASE:=6 +PKG_RELEASE:=5.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn diff --git a/net/stun/Makefile b/net/stun/Makefile index 86f94bbfe..d033efa8a 100644 --- a/net/stun/Makefile +++ b/net/stun/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stund PKG_VERSION:=0.96 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_Aug13.tgz PKG_SOURCE_URL:=@SF/stun diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index fcc7d6ef8..e3a506050 100644 --- a/sound/mpd/Makefile +++ b/sound/mpd/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpd PKG_VERSION:=0.14 -PKG_RELEASE:=2 +PKG_RELEASE:=1.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/musicpd -- 2.30.2