[Glibc-bsd-commits] r3343 - in trunk: freebsd-buildutils/debian freebsd-libs/debian freebsd-moused/debian freebsd-sendpr/debian freebsd-utils/debian libmd/debian zfsutils/debian

Guillem Jover guillem at alioth.debian.org
Sun May 29 18:47:51 UTC 2011 

Author: guillem
Date: 2011-05-29 18:47:51 +0000 (Sun, 29 May 2011)
New Revision: 3343

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/rules
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-moused/debian/changelog
   trunk/freebsd-moused/debian/rules
   trunk/freebsd-sendpr/debian/changelog
   trunk/freebsd-sendpr/debian/rules
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/rules
   trunk/libmd/debian/rules
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/rules
Log:
Refactor source and tar name into SOURCE and TARNAME in debian/rules


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-buildutils/debian/changelog	2011-05-29 18:47:51 UTC (rev 3343)
@@ -21,6 +21,7 @@
     - Do not switch LIBDIR yet, the dynamic linker does not have the
       correct paths for i386 based architectures.
     - Add builtin MACHINE_MULTIARCH make variable.
+  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
 
  -- Robert Millan <rmh at debian.org>  Thu, 13 Jan 2011 18:29:12 +0100
 

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-buildutils/debian/rules	2011-05-29 18:47:51 UTC (rev 3343)
@@ -16,6 +16,7 @@
     export STRIPFLAG=
 endif
 
+SOURCE = freebsd-buildutils
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN = http://svn.freebsd.org/base/release/$(VERSION).0
 
@@ -23,7 +24,9 @@
 PCVS = anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
 PTAG = RELEASE_$(PVERSION)_0
 
-ORIGDIR = freebsd-buildutils-$(VERSION)
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
+
 CFLAGS = -O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -DMACHINE_MULTIARCH='"$(DEB_HOST_MULTIARCH)"' -D_GNU_SOURCE -D'__FBSDID(string)=' -I$(CURDIR)/build-tree/src/sys
 MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 
@@ -31,7 +34,7 @@
 PMAKE = $(CURDIR)/build-tree/src/usr.bin/make/make
 YACC = $(CURDIR)/build-tree/src/usr.bin/yacc/yacc
 
-package = freebsd-buildutils
+package = $(SOURCE)
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
@@ -55,7 +58,7 @@
 		svn export $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
 	done
 	cd $(ORIGDIR); cvs -d $(PCVS) export -r $(PTAG) ports/Mk ; cd ..
-	tar --numeric-owner --owner 0 --group 0 -czf ../freebsd-buildutils_$(VERSION).orig.tar.gz $(ORIGDIR)
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
 unpack: unpack-stamp

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-libs/debian/changelog	2011-05-29 18:47:51 UTC (rev 3343)
@@ -14,6 +14,7 @@
     - Remove now unneeded README.source.
     - Refresh all patches.
   * Add myself to Uploaders.
+  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
 
  -- Robert Millan <rmh at debian.org>  Mon, 10 Jan 2011 16:01:31 +0100
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-libs/debian/rules	2011-05-29 18:47:51 UTC (rev 3343)
@@ -18,10 +18,13 @@
 	CFLAGS += -O2
 endif
 
+SOURCE = freebsd-libs
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN = http://svn.freebsd.org/base/release/$(VERSION).0
 #SVN = http://svn.freebsd.org/base/releng/8.1
-ORIGDIR = freebsd-libs-$(VERSION)
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
+
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
@@ -45,7 +48,7 @@
 	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*
 	rm -f $(ORIGDIR)/lib/libkvm/kvm_ia64.c
 	rm -f $(ORIGDIR)/lib/libkvm/kvm_powerpc.c
-	tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz $(ORIGDIR)
+	tar -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
 ifeq ($(kernel), kfreebsd)

Modified: trunk/freebsd-moused/debian/changelog
===================================================================
--- trunk/freebsd-moused/debian/changelog	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-moused/debian/changelog	2011-05-29 18:47:51 UTC (rev 3343)
@@ -5,6 +5,7 @@
   * Switch from CDBS to debhelper 7 and source format “3.0 (quilt)”.
     - Add missing Build-Depends on freebsd-buildutils.
   * Now using Standards-Version 3.9.2 (no changes needed).
+  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
 
  -- Guillem Jover <guillem at debian.org>  Thu, 30 Apr 2009 20:57:46 +0200
 

Modified: trunk/freebsd-moused/debian/rules
===================================================================
--- trunk/freebsd-moused/debian/rules	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-moused/debian/rules	2011-05-29 18:47:51 UTC (rev 3343)
@@ -14,9 +14,11 @@
 	CXXFLAGS += -O2
 endif
 
+SOURCE = freebsd-moused
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN = http://svn.freebsd.org/base/release/$(VERSION).0
-ORIGDIR = freebsd-moused-$(VERSION)
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME =$(SOURCE)_$(VERSION).orig.tar.gz
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
@@ -24,7 +26,7 @@
 	for i in usr.sbin/moused ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
-	tar --numeric-owner --owner 0 --group 0 -czf ../freebsd-moused_$(VERSION).orig.tar.gz $(ORIGDIR)
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
 PATH := /usr/lib/freebsd:$(PATH)

Modified: trunk/freebsd-sendpr/debian/changelog
===================================================================
--- trunk/freebsd-sendpr/debian/changelog	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-sendpr/debian/changelog	2011-05-29 18:47:51 UTC (rev 3343)
@@ -1,3 +1,9 @@
+freebsd-sendpr (3.113+8.2-2) UNRELEASED; urgency=low
+
+  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
+
+ -- Guillem Jover <guillem at debian.org>  Sun, 29 May 2011 20:44:02 +0200
+
 freebsd-sendpr (3.113+8.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/freebsd-sendpr/debian/rules
===================================================================
--- trunk/freebsd-sendpr/debian/rules	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-sendpr/debian/rules	2011-05-29 18:47:51 UTC (rev 3343)
@@ -5,12 +5,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PKG := freebsd-sendpr
-
+SOURCE := freebsd-sendpr
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 FREEBSD_VERSION = $(shell echo $(VERSION) | sed -e 's/^[^+]\++//g')
 SVN = http://svn.freebsd.org/base/release/$(FREEBSD_VERSION).0
-ORIGDIR = $(PKG)-$(VERSION)
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
@@ -18,10 +18,10 @@
 	for i in gnu/usr.bin/send-pr ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
-	tar --numeric-owner --owner 0 --group 0 -czf ../$(PKG)_$(VERSION).orig.tar.gz $(ORIGDIR)
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
-pkgdir := $(CURDIR)/debian/$(PKG)
+pkgdir := $(CURDIR)/debian/$(SOURCE)
 
 PMAKE := freebsd-make DESTDIR=$(pkgdir) BINDIR=/usr/bin
 

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-utils/debian/changelog	2011-05-29 18:47:51 UTC (rev 3343)
@@ -27,6 +27,7 @@
     - Remove now unneeded README.source.
     - Refresh all patches.
   * Link camcontrol, mdconfig and dmesg directly to libbsd. Closes: #627129
+  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
 
  -- Robert Millan <rmh at debian.org>  Wed, 09 Feb 2011 17:42:15 +0100
 

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/freebsd-utils/debian/rules	2011-05-29 18:47:51 UTC (rev 3343)
@@ -16,10 +16,13 @@
 	CXXFLAGS += -O2
 endif
 
+SOURCE = freebsd-utils
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN = http://svn.freebsd.org/base/release/$(VERSION).0
 #SVN = http://svn.freebsd.org/base/releng/8.1
-ORIGDIR = freebsd-utils-$(VERSION)
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
+
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
@@ -47,7 +50,7 @@
 		 sys/kern/syscalls.c etc/pf.os ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
-	tar --numeric-owner --owner 0 --group 0 -czf ../freebsd-utils_$(VERSION).orig.tar.gz $(ORIGDIR)
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
 lib: lib-stamp

Modified: trunk/libmd/debian/rules
===================================================================
--- trunk/libmd/debian/rules	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/libmd/debian/rules	2011-05-29 18:47:51 UTC (rev 3343)
@@ -11,11 +11,13 @@
 	CFLAGS += -O2
 endif
 
-PKG = libmd
 DBG = libmd0-dbg
+
+SOURCE = libmd
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN = http://svn.freebsd.org/base/release/$(VERSION).0
-ORIGDIR = $(PKG)-$(VERSION)
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
@@ -28,7 +30,7 @@
 	for i in lib/libmd ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
-	tar -czf ../$(PKG)_$(VERSION).orig.tar.gz $(ORIGDIR)
+	tar -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
 build-indep:

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/zfsutils/debian/changelog	2011-05-29 18:47:51 UTC (rev 3343)
@@ -17,6 +17,7 @@
     - Remove quilt from Build-Depends.
     - Remove patch target in debian/rules.
     - Remove now unneeded README.source.
+  * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 22 Apr 2011 17:29:09 +0200
 

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2011-05-29 18:07:23 UTC (rev 3342)
+++ trunk/zfsutils/debian/rules	2011-05-29 18:47:51 UTC (rev 3343)
@@ -17,9 +17,12 @@
 	CFLAGS += -O2
 endif
 
+SOURCE = zfsutils
 VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
 SVN = http://svn.freebsd.org/base/release/$(VERSION).0
-ORIGDIR = zfsutils-$(VERSION)
+ORIGDIR = $(SOURCE)-$(VERSION)
+TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
+
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
@@ -59,7 +62,7 @@
 	rm -f $(ORIGDIR)/cddl/compat/opensolaris/include/alloca.h
 	rm -f $(ORIGDIR)/cddl/compat/opensolaris/include/stdlib.h
 	rm -rf $(ORIGDIR)/sys/cddl/contrib/opensolaris/uts/common/zmod
-	tar -czf ../zfsutils_$(VERSION).orig.tar.gz $(ORIGDIR)
+	tar -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
 build: build-libuutil build-libnvpair build-libzfs build-libumem build-libzpool build-zfsutils build-libavl

More information about the Glibc-bsd-commits mailing list