[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force Xrender SVN commit: rev 54 - trunk/debian



Author: branden
Date: 2003-10-06 22:56:23 -0500 (Mon, 06 Oct 2003)
New Revision: 54

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
Migrate from CBS to CDBS.

- debian/control: add build-dependency on cdbs (>= 0.4.12)
- debian/rules: translated to CDBS-speak


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-10-07 03:42:15 UTC (rev 53)
+++ trunk/debian/changelog	2003-10-07 03:56:23 UTC (rev 54)
@@ -2,8 +2,12 @@
 
   * new upstream release
 
- -- Branden Robinson <branden@debian.org>  Mon,  6 Oct 2003 22:41:03 -0500
+  * Migrate from CBS to CDBS.
+    - debian/control: add build-dependency on cdbs (>= 0.4.12)
+    - debian/rules: translated to CDBS-speak
 
+ -- Branden Robinson <branden@debian.org>  Mon,  6 Oct 2003 22:54:15 -0500
+
 xrender (0.8.2-2) unstable; urgency=low
 
   * debian/control: sync with overrides file; libxrender1-dbg is priority

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2003-10-07 03:42:15 UTC (rev 53)
+++ trunk/debian/control	2003-10-07 03:56:23 UTC (rev 54)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 4.0.0), xlibs-dev (>> 4.2.1), render-dev
+Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.0.0), xlibs-dev (>> 4.2.1), render-dev
 Standards-Version: 3.5.9
 
 Package: libxrender1

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2003-10-07 03:42:15 UTC (rev 53)
+++ trunk/debian/rules	2003-10-07 03:56:23 UTC (rev 54)
@@ -2,45 +2,15 @@
 
 # $Id$
 
-configure: configure-stamp
-configure-stamp:
-	./configure --prefix=/usr --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --includedir=/usr/X11R6/include --libdir=/usr/X11R6/lib
-	touch $@
+# Import Common Debian Build System (CDBS).
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-clean: configure-stamp
-	dh_testdir
-	dh_testroot
-	$(MAKE) distclean
-	dh_clean build-stamp configure-stamp
+# Don't trust AC_PATH_X; tell upstream configure script where to find X
+# libraries and headers on a Debian system.
+DEB_CONFIGURE_EXTRA_FLAGS := --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --includedir=/usr/X11R6/include --libdir=/usr/X11R6/lib
 
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch $@
+# Library interface did not change in Xrender 0.8.2 or 0.8.3.
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libxrender1 (>= 0.8.1)"
 
-binary: binary-arch
-
-binary-arch: build-stamp
-	dh_testdir
-	dh_testroot
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install --sourcedir=debian/tmp
-	dh_installdocs
-	dh_installdebconf
-	dh_installmenu
-	dh_installmanpages
-	dh_installchangelogs ChangeLog
-	dh_strip --exclude=libxrender1-dbg
-	dh_makeshlibs --package=libxrender1 -V "libxrender1 (>= 0.8.1)"
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: configure clean build binary binary-arch
-
 # vim:set ai tw=0 sw=2 sts=2:



Reply to: