ChangeLog | 16 ++++++++++++++++ configure.ac | 13 +++++-------- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/xsfbs/xsfbs.mk | 17 ++--------------- debian/xsfbs/xsfbs.sh | 4 +--- 6 files changed, 33 insertions(+), 27 deletions(-)
New commits: commit 164d20ebed99b1aadd6f533810f76f58f31c70a2 Author: Julien Cristau <[email protected]> Date: Sat Nov 28 16:08:13 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 08eb9d4..403e6e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -libdmx (1:1.1.0-1) UNRELEASED; urgency=low +libdmx (1:1.1.0-1) experimental; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump the build-dep on xutils-dev (>= 1:7.5~1). - -- Timo Aaltonen <[email protected]> Mon, 23 Nov 2009 11:04:09 +0200 + -- Julien Cristau <[email protected]> Sat, 28 Nov 2009 16:07:39 +0100 libdmx (1:1.0.99.1-1) experimental; urgency=low commit b7d463c2b1349f0bdf524268def0ea8d5c61478b Author: Julien Cristau <[email protected]> Date: Mon Nov 23 12:20:08 2009 +0100 Fix upstream version number diff --git a/debian/changelog b/debian/changelog index ea7aca1..08eb9d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdmx (1:1.1-1) UNRELEASED; urgency=low +libdmx (1:1.1.0-1) UNRELEASED; urgency=low * New upstream release. * Bump the build-dep on xutils-dev (>= 1:7.5~1). commit 4aa8c4e13b7ec542dd52ba23e0f9b46bb4fa4f10 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 23 11:05:21 2009 +0200 Bump the build-dep on xutils-dev (>= 1:7.5~1). diff --git a/debian/changelog b/debian/changelog index 86fc13a..ea7aca1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdmx (1:1.1-1) UNRELEASED; urgency=low * New upstream release. + * Bump the build-dep on xutils-dev (>= 1:7.5~1). -- Timo Aaltonen <[email protected]> Mon, 23 Nov 2009 11:04:09 +0200 diff --git a/debian/control b/debian/control index 1231bb9..6292a60 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: libxext-dev (>= 1:0.99.1), automake, libtool, - xutils-dev (>= 1:7.4+4), + xutils-dev (>= 1:7.5~1), pkg-config Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdmx commit aad833f026292b1cf0c322cbcf8171ac70552096 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 23 11:04:43 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 3e27285..c38a72a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +commit a3ff756a3a478162a6f96b9fbf54c9f1a487af38 +Author: Peter Hutterer <[email protected]> +Date: Mon Oct 5 11:54:43 2009 +1000 + + libdmx 1.1.0 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 9d7cb1321dd44081f52a80419c32bbbbb155757f +Author: Peter Hutterer <[email protected]> +Date: Mon Oct 5 11:54:09 2009 +1000 + + Require macros 1.3 for XORG_DEFAULT_OPTIONS + + Signed-off-by: Peter Hutterer <[email protected]> + commit 1cb350964c416963523aca0234dc24563ef29d1b Author: Peter Hutterer <[email protected]> Date: Fri Aug 28 10:07:10 2009 +1000 diff --git a/debian/changelog b/debian/changelog index dad9b81..86fc13a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdmx (1:1.1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen <[email protected]> Mon, 23 Nov 2009 11:04:09 +0200 + libdmx (1:1.0.99.1-1) experimental; urgency=low [ Brice Goglin ] commit a3ff756a3a478162a6f96b9fbf54c9f1a487af38 Author: Peter Hutterer <[email protected]> Date: Mon Oct 5 11:54:43 2009 +1000 libdmx 1.1.0 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index ad84424..df66449 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libdmx, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx) +AC_INIT(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit 9d7cb1321dd44081f52a80419c32bbbbb155757f Author: Peter Hutterer <[email protected]> Date: Mon Oct 5 11:54:09 2009 +1000 Require macros 1.3 for XORG_DEFAULT_OPTIONS Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 51a8f7e..ad84424 100644 --- a/configure.ac +++ b/configure.ac @@ -27,15 +27,15 @@ AC_INIT(libdmx, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS +XORG_DEFAULT_OPTIONS # Check for dependencies PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1]) @@ -44,9 +44,6 @@ AC_SUBST(DMX_CFLAGS) AC_SUBST(DMX_LIBS) XORG_CHECK_MALLOC_ZERO -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <[email protected]> Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc rm -rf $(STAMP_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ - debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose + dh_clean # Remove files from the upstream source tree that we don't need, or which have # licensing problems. It must be run before creating the .orig.tar.gz. commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:43:28 2009 +0200 xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage These variables aren't set anywhere. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 1f86848..82eb45f 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -176,7 +176,7 @@ cleanscripts: xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf $(STAMP_DIR) rm -rf imports dh_clean debian/shlibs.local \ debian/po/pothead @@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ rm $$MAINTSCRIPT.tmp; \ fi; \ commit bda208ec00d0b7b3632f57fb27e014684cdf73ba Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:33:39 2009 +0200 xsfbs.sh: fix typo and remove svn keyword diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 45acd59..813fd8d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -1,5 +1,3 @@ -# $Id$ - # This is the X Strike Force shell library for X Window System package # maintainer scripts. It serves to define shell functions commonly used by # such packages, and performs some error checking necessary for proper operation @@ -8,7 +6,7 @@ # removal tasks. # If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can # skip past this library by scanning forward in this file to the string # "GOBSTOPPER". -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
