[Glibc-bsd-commits] r3309 - in trunk/freebsd-moused/debian: . patches source

Guillem Jover guillem at alioth.debian.org
Wed May 25 08:46:51 UTC 2011 

Author: guillem
Date: 2011-05-25 08:46:51 +0000 (Wed, 25 May 2011)
New Revision: 3309

Added:
   trunk/freebsd-moused/debian/patches/series
   trunk/freebsd-moused/debian/source/
   trunk/freebsd-moused/debian/source/format
Modified:
   trunk/freebsd-moused/debian/changelog
   trunk/freebsd-moused/debian/compat
   trunk/freebsd-moused/debian/control
   trunk/freebsd-moused/debian/patches/001_glibc.diff
   trunk/freebsd-moused/debian/patches/002_retry.diff
   trunk/freebsd-moused/debian/rules
Log:
Switch from CDBS to debhelper 7 and source format ?\226?\128?\1563.0 (quilt)?\226?\128?\157

Add missing Build-Depends on freebsd-buildutils.


Modified: trunk/freebsd-moused/debian/changelog
===================================================================
--- trunk/freebsd-moused/debian/changelog	2011-05-25 08:06:53 UTC (rev 3308)
+++ trunk/freebsd-moused/debian/changelog	2011-05-25 08:46:51 UTC (rev 3309)
@@ -2,6 +2,8 @@
 
   * Rename debian/init.d to debian/init.
   * Do not auto-generate the debian/control file.
+  * Switch from CDBS to debhelper 7 and source format “3.0 (quilt)”.
+    - Add missing Build-Depends on freebsd-buildutils.
 
  -- Guillem Jover <guillem at debian.org>  Thu, 30 Apr 2009 20:57:46 +0200
 

Modified: trunk/freebsd-moused/debian/compat
===================================================================
--- trunk/freebsd-moused/debian/compat	2011-05-25 08:06:53 UTC (rev 3308)
+++ trunk/freebsd-moused/debian/compat	2011-05-25 08:46:51 UTC (rev 3309)
@@ -1 +1 @@
-4
+7

Modified: trunk/freebsd-moused/debian/control
===================================================================
--- trunk/freebsd-moused/debian/control	2011-05-25 08:06:53 UTC (rev 3308)
+++ trunk/freebsd-moused/debian/control	2011-05-25 08:46:51 UTC (rev 3309)
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Robert Millan <rmh at debian.org>
-Build-Depends: cdbs (>= 0.4.26-2), debhelper (>= 4.1.0), patchutils
+Build-Depends: debhelper (>= 7), freebsd-buildutils
 Standards-Version: 3.6.0
 
 Package: moused

Modified: trunk/freebsd-moused/debian/patches/001_glibc.diff
===================================================================
--- trunk/freebsd-moused/debian/patches/001_glibc.diff	2011-05-25 08:06:53 UTC (rev 3308)
+++ trunk/freebsd-moused/debian/patches/001_glibc.diff	2011-05-25 08:46:51 UTC (rev 3309)
@@ -1,15 +1,19 @@
-diff -Nur src/usr.sbin/moused.old/moused.c src/usr.sbin/moused/moused.c
---- src/usr.sbin/moused.old/moused.c	2005-01-06 09:38:29.000000000 +0100
-+++ src/usr.sbin/moused/moused.c	2005-02-20 15:44:10.000000000 +0100
+---
+ usr.sbin/moused/moused.c  |    7 ++--
+ usr.sbin/moused/strlcat.c |   70 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 74 insertions(+), 3 deletions(-)
+
+--- a/usr.sbin/moused/moused.c
++++ b/usr.sbin/moused/moused.c
 @@ -45,7 +45,6 @@
   **/
  
  #include <sys/cdefs.h>
--__FBSDID("$FreeBSD: src/usr.sbin/moused/moused.c,v 1.69 2005/01/06 08:38:29 philip Exp $");
+-__FBSDID("$FreeBSD$");
  
  #include <sys/param.h>
  #include <sys/consio.h>
-@@ -71,6 +70,9 @@
+@@ -71,6 +70,9 @@ __FBSDID("$FreeBSD$");
  #include <syslog.h>
  #include <termios.h>
  #include <unistd.h>
@@ -19,7 +23,7 @@
  
  #define MAX_CLICKTHRESHOLD	2000	/* 2 seconds */
  #define MAX_BUTTON2TIMEOUT	2000	/* 2 seconds */
-@@ -476,8 +478,7 @@
+@@ -465,8 +467,7 @@ static void	moused(void);
  static void	hup(int sig);
  static void	cleanup(int sig);
  static void	usage(void);
@@ -29,9 +33,8 @@
  
  static int	r_identify(void);
  static char	*r_if(int type);
-diff -Nur src/usr.sbin/moused.old/strlcat.c src/usr.sbin/moused/strlcat.c
---- src/usr.sbin/moused.old/strlcat.c	1970-01-01 01:00:00.000000000 +0100
-+++ src/usr.sbin/moused/strlcat.c	2005-02-20 15:44:00.000000000 +0100
+--- /dev/null
++++ b/usr.sbin/moused/strlcat.c
 @@ -0,0 +1,70 @@
 +/*	$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $	*/
 +

Modified: trunk/freebsd-moused/debian/patches/002_retry.diff
===================================================================
--- trunk/freebsd-moused/debian/patches/002_retry.diff	2011-05-25 08:06:53 UTC (rev 3308)
+++ trunk/freebsd-moused/debian/patches/002_retry.diff	2011-05-25 08:46:51 UTC (rev 3309)
@@ -3,9 +3,13 @@
  when it can be attached back.
 Status: sent upstream
 
---- src.old/usr.sbin/moused/moused.c	2005-02-20 16:47:05.000000000 +0100
-+++ src/usr.sbin/moused/moused.c	2005-02-20 16:46:25.000000000 +0100
-@@ -778,9 +778,9 @@
+---
+ usr.sbin/moused/moused.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/usr.sbin/moused/moused.c
++++ b/usr.sbin/moused/moused.c
+@@ -756,9 +756,9 @@ main(int argc, char *argv[])
  	usage();
      }
  
@@ -17,7 +21,7 @@
  	    retry = 5;
      }
  
-@@ -790,7 +790,7 @@
+@@ -768,7 +768,7 @@ main(int argc, char *argv[])
  	    signal(SIGINT , cleanup);
  	    signal(SIGQUIT, cleanup);
  	    signal(SIGTERM, cleanup);

Added: trunk/freebsd-moused/debian/patches/series
===================================================================
--- trunk/freebsd-moused/debian/patches/series	                        (rev 0)
+++ trunk/freebsd-moused/debian/patches/series	2011-05-25 08:46:51 UTC (rev 3309)
@@ -0,0 +1,2 @@
+001_glibc.diff
+002_retry.diff

Modified: trunk/freebsd-moused/debian/rules
===================================================================
--- trunk/freebsd-moused/debian/rules	2011-05-25 08:06:53 UTC (rev 3308)
+++ trunk/freebsd-moused/debian/rules	2011-05-25 08:46:51 UTC (rev 3309)
@@ -1,20 +1,88 @@
 #!/usr/bin/make -f
 
-SHELL=bash
-DEB_TAR_SRCDIR			:= src
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-PATH:=/usr/lib/freebsd:$(PATH)
-DESTDIR=$(CURDIR)/debian/moused
-PMAKE=make DESTDIR=$(DESTDIR)
+CFLAGS = -Wall -g -pipe
+CXXFLAGS = -Wall -g -pipe
 
-build/moused:: apply-patches
-	cd $(DEB_SRCDIR)/usr.sbin/moused && $(PMAKE)
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+	CXXFLAGS += -O0
+else
+	CFLAGS += -O2
+	CXXFLAGS += -O2
+endif
 
-binary/moused:: common-install-prehook-arch
-	cd $(DEB_SRCDIR)/usr.sbin/moused && $(PMAKE) install
-	# geez
-	mv $(DESTDIR)/{moused,usr/sbin/}
+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)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+get-orig-source:
+	rm -rf $(ORIGDIR)
+	mkdir -p $(ORIGDIR)
+	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)
+	rm -rf $(ORIGDIR)
+
+PATH := /usr/lib/freebsd:$(PATH)
+DESTDIR = $(CURDIR)/debian/moused
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
+
+build-arch:
+	$(PMAKE) -C usr.sbin/moused
+
+build-indep:
+
+build: build-arch build-indep
+
+clean:
+	dh_testdir
+	dh_testroot
+	
+	$(PMAKE) -C usr.sbin/moused clean
+	
+	dh_clean
+
+install-indep: build-indep
+
+install-arch: build-arch
+	dh_testdir
+	dh_testroot
+	dh_prep -a
+	dh_installdirs -a
+	
+	$(PMAKE) -C usr.sbin/moused install
+	# Geez
+	mv $(DESTDIR)/moused $(DESTDIR)/usr/sbin/
+	
+	dh_install -a
+
+install: install-indep install-arch
+
+binary-indep: install-indep
+# We have nothing to do by default.
+
+binary-arch: install-arch
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installinit
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-arch binary-indep
+
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch

Added: trunk/freebsd-moused/debian/source/format
===================================================================
--- trunk/freebsd-moused/debian/source/format	                        (rev 0)
+++ trunk/freebsd-moused/debian/source/format	2011-05-25 08:46:51 UTC (rev 3309)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the Glibc-bsd-commits mailing list