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

X Strike Force Xft2 SVN commit: rev 59 - trunk/debian



Author: branden
Date: 2003-10-05 22:35:29 -0500 (Sun, 05 Oct 2003)
New Revision: 59

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

- debian/control: add build-dependency on cdbs (>= 0.4.11) (thanks to
  Colin Walters for adding debugging package support I can use with a
  clear conscience :) )

- debian/rules: renamed from debian/rocks and translated to CDBS-speak
  + Set svn:keywords property to "Id".
  + Set svn:executable property.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-10-06 03:21:14 UTC (rev 58)
+++ trunk/debian/changelog	2003-10-06 03:35:29 UTC (rev 59)
@@ -25,8 +25,14 @@
     where the debugging library is installed.
     - debian/control
 
- -- Branden Robinson <branden@debian.org>  Sun,  5 Oct 2003 01:44:14 -0500
+  * Migrate from CBS to CDBS.
+    - debian/control: add build-dependency on cdbs (>= 0.4.11) (thanks to
+      Colin Walters for adding debugging package support I can use with a
+      clear conscience :) )
+    - debian/rules: renamed from debian/rocks and translated to CDBS-speak
 
+ -- Branden Robinson <branden@debian.org>  Sun,  5 Oct 2003 22:33:03 -0500
+
 xft2 (2.1.1-3) unstable; urgency=low
 
   * configure: re-run autoconf to expose the fix to configure.ac from 2.1.1-1

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2003-10-06 03:21:14 UTC (rev 58)
+++ trunk/debian/control	2003-10-06 03:35:29 UTC (rev 59)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, libxrender-dev (>> 0.8.1), xlibs-dev (>> 4.2.1), zlib1g-dev | libz-dev
+Build-Depends: cdbs (>= 0.4.11), debhelper (>= 4.0.0), libfontconfig1-dev, libfreetype6-dev, libxrender-dev (>> 0.8.1), xlibs-dev (>> 4.2.1), zlib1g-dev | libz-dev
 Standards-Version: 3.6.1
 
 Package: libxft2

Deleted: trunk/debian/rocks
===================================================================
--- trunk/debian/rocks	2003-10-06 03:21:14 UTC (rev 58)
+++ trunk/debian/rocks	2003-10-06 03:35:29 UTC (rev 59)
@@ -1,14 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002 Colin Walters <walters@gnu.org>
-
-# AC_PATH_X can guess wrong.
-DEB_CONFIGURE_EXTRA_FLAGS := --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
-
-deb-makeshlibs-libxft2:
-	dh_makeshlibs -p$(DEB_CURPACKAGE) -V "libxft2 (>> 2.1.1)"
-
-deb-makeshlibs-libxft2-dbg:
-	# libxft2-dbg should not run dh_makeshlibs
-
-deb-strip-libxft2-dbg:
-	# libxft2-dbg is not stripped

Copied: trunk/debian/rules (from rev 46, trunk/debian/rocks)
===================================================================
--- trunk/debian/rocks	2003-10-05 03:59:09 UTC (rev 46)
+++ trunk/debian/rules	2003-10-06 03:35:29 UTC (rev 59)
@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+# $Id$
+
+# Import Common Debian Build System (CDBS).
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+# 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
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libxft2 (>> 2.1.1)"


Property changes on: trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Id



Reply to: