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

xbitmaps: Changes to 'debian-unstable'



 debian/changelog |    8 ++++++++
 debian/control   |    2 +-
 debian/rules     |    4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 785244fc198ed04e523a63e66908da6cbeb12b55
Author: Branden Robinson <branden@debian.org>
Date:   Tue Aug 1 15:29:08 2006 +0000

    Use only the major version, minor version, and major patch number
    components of the Policy Manual revision in Standards-Version, because "the
    minor patch level will be changed when only cosmetic, typographical or
    other edits are made which neither change the meaning of the document nor
    affect the contents of packages".  See Policy Manual §5.6.11.
    
    (The real reason for this commit, as with r2615, is to test tweaks to the
    repository's commit-email.pl script.)

diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..c27de6a
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,17 @@
+Source: xbitmaps
+Section: x11
+Priority: optional
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.1
+
+Package: xbitmaps
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: xlibs-data (<< 6.8.2-35)
+Replaces: xlibs-data (<< 6.8.2-35)
+Pre-Depends: x11-common (>= 1:1.0.0-1)
+Description: Base X bitmaps
+ This package contains the base X bitmaps, which are used in many legacy X
+ clients.

commit 908c70b03c4df6e778681132178647d6a4df30e9
Author: Branden Robinson <branden@debian.org>
Date:   Tue Aug 1 14:10:51 2006 +0000

    Whitespace police.
    
    (The real reason for this commit is to test tweaks to the repository's
    commit-email.pl script.)

diff --git a/debian/changelog b/debian/changelog
index e9ac449..49335cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xbitmaps (1.0.1-3) UNRELEASED; urgency=low
 
   * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
     idempotency fix.
-  * Run dh_install w/ --list-missing. 
+  * Run dh_install w/ --list-missing.
 
  -- Andres Salomon <dilinger@debian.org>  Mon, 17 Jul 2006 00:59:25 -0400
 

commit d183b5ae269c0805f26e6542e944d71959cec42c
Author: Andres Salomon <dilinger@debian.org>
Date:   Mon Jul 17 05:29:25 2006 +0000

    When building arch-dependent stuff, run dh_install w/ --list-missing.

diff --git a/debian/changelog b/debian/changelog
index 006567d..e9ac449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 xbitmaps (1.0.1-3) UNRELEASED; urgency=low
 
   * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
-    idempotency fix. 
+    idempotency fix.
+  * Run dh_install w/ --list-missing. 
 
- -- Andres Salomon <dilinger@debian.org>  Mon, 17 Jul 2006 00:41:25 -0400
+ -- Andres Salomon <dilinger@debian.org>  Mon, 17 Jul 2006 00:59:25 -0400
 
 xbitmaps (1.0.1-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index ec0ac4a..bc9bfbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ binary-arch: build install
 	dh_testroot
 
 	dh_installdocs
-	dh_install --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp --list-missing
 	dh_installchangelogs
 	dh_installman
 	dh_link

commit d7a876440c90b2239b9e479c96e9cd48ef02a660
Author: Andres Salomon <dilinger@debian.org>
Date:   Mon Jul 17 04:44:49 2006 +0000

    Idempotency fixes; everywhere where we're using a separate build directory,
    we tend to create it via "mkdir obj-$(foo)".  This doesn't work if rebuilding,
    because the directory already exists.  Instead, only create it if there's
    no directory there already.

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..006567d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,42 @@
+xbitmaps (1.0.1-3) UNRELEASED; urgency=low
+
+  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+    idempotency fix. 
+
+ -- Andres Salomon <dilinger@debian.org>  Mon, 17 Jul 2006 00:41:25 -0400
+
+xbitmaps (1.0.1-2) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Tue,  4 Apr 2006 18:33:41 -0400
+
+xbitmaps (1.0.1-1) experimental; urgency=low
+
+  * First upload to Debian
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 26 Jan 2006 21:48:49 -0500
+
+xbitmaps (1.0.1-0ubuntu2) dapper; urgency=low
+
+  * Change dependency on x-common to x11-common.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Thu, 19 Jan 2006 18:38:13 +1100
+
+xbitmaps (1.0.1-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Fri,  6 Jan 2006 07:47:41 +1100
+
+xbitmaps (1.0.0-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 19 Dec 2005 09:29:29 +1100
+
+xbitmaps (0.99.0-1) breezy; urgency=low
+
+  * First xbitmaps release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 11 Jul 2005 15:07:19 +1000
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..ec0ac4a
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,91 @@
+#!/usr/bin/make -f
+# debian/rules for the Debian xbitmaps package.
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
+# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
+# Copyright © 2005 David Nusinow <dnusinow@debian.org>
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+include debian/xsfbs/xsfbs.mk
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+	cd obj-$(DEB_BUILD_GNU_TYPE) && CFLAGS="$(CFLAGS)" \
+	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+	             --infodir=\$${prefix}/share/info --sysconfdir=/etc \
+		     $(confflags)
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	rm -f config.cache config.log config.status
+	rm -f */config.cache */config.log */config.status
+	rm -f conftest* */conftest*
+	rm -rf autom4te.cache */autom4te.cache
+	rm -rf obj-*
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/xbitmaps install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+
+	dh_installdocs
+	dh_install --sourcedir=debian/tmp
+	dh_installchangelogs
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-independent files here.
+binary-indep: build install
+# Nothing to do
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


Reply to: