ChangeLog | 32 ++++++++++++++++++++++++++++++++
configure.ac | 9 +++++----
debian/changelog | 8 ++++++--
debian/patches/fix-configdir.diff | 15 ---------------
debian/patches/series | 2 +-
debian/watch | 2 +-
6 files changed, 45 insertions(+), 23 deletions(-)
New commits:
commit a259c59215bfe1ee22832975bbc4c0245a3d3a18
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Fri Sep 16 13:19:03 2016 +0300
release to sid
diff --git a/debian/changelog b/debian/changelog
index 7cbca91..84872e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-xserver-xorg-video-amdgpu (1.1.2-1) UNRELEASED; urgency=medium
+xserver-xorg-video-amdgpu (1.1.2-1) unstable; urgency=medium
* New upstream release.
- fix-configdir.diff: Dropped, fixed upstream
+
+ [ Julien Cristau ]
* Use https URL in debian/watch.
- -- Julien Cristau <jcris...@debian.org> Fri, 16 Sep 2016 07:48:44 +0200
+ -- Timo Aaltonen <tjaal...@debian.org> Fri, 16 Sep 2016 13:18:07 +0300
xserver-xorg-video-amdgpu (1.1.1-1) unstable; urgency=medium
commit ad3b8fbac3d4df4789595666e529c409722e39d4
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Fri Sep 16 13:18:03 2016 +0300
watch: fix a typo
diff --git a/debian/watch b/debian/watch
index 8dc3e73..c121c8a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-amdgpu
version=3
opts=pgpsigurlmangle=s/$/.sig/ \
-https://xorg.freedesktop.orgreleases/individual/driver/
xf86-video-amdgpu-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/driver/
xf86-video-amdgpu-(.*)\.tar\.gz
commit e2ac0f199e315b587bfdc593013f049f73b9b520
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Fri Sep 16 13:17:49 2016 +0300
update changelogs, drop patch
diff --git a/ChangeLog b/ChangeLog
index 1c5f857..abf4079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+commit b407c1244d28a80f76275abca2239cdd4120f017
+Author: Michel Dänzer <michel.daen...@amd.com>
+Date: Fri Sep 16 18:11:31 2016 +0900
+
+ Bump version for 1.1.2 release
+
+commit 82062157263d6f63ce8f645bf32101fd18bd98e5
+Author: Michel Dänzer <michel.daen...@amd.com>
+Date: Fri Sep 16 18:01:41 2016 +0900
+
+ Fix handling of configure option --with-xorg-conf-dir
+
+ There were two problems:
+
+ I accidentally changed the variable name in the AC_ARG_WITH stanza from
+ configdir to xorgconfigdir, so specifying --with-xorg-conf-dir wouldn't
+ work correctly. Fix this back to configdir.
+
+ If neither --with-xorg-conf-dir nor --prefix is specified on the command
+ line, the $prefix variable doesn't contain "/usr/local" (the default
+ prefix) yet at this point but "NONE". So make install would attempt to
+ install 10-amdgpu.conf in ${DESTDIR}NONE/share/X11/xorg.conf.d/ . Fix
+ this by leaving ${prefix} verbatim in the default value, to be resolved
+ by make.
+
+ Also print the configdir value along with the values of other similar
+ configuration variables.
+
+ Reported-by: Timo Aaltonen <tjaal...@debian.org>
+ Reviewed-by: Julien Cristau <jcris...@debian.org>
+ (Cherry picked from commit aa8a3fa2468094cd37959179e8417ba7ba0a326c)
+
commit 6eb2b507d9ec8dcde2482a5ebf59c001933e10ea
Author: Michel Dänzer <michel.daen...@amd.com>
Date: Wed Sep 14 18:26:50 2016 +0900
diff --git a/debian/changelog b/debian/changelog
index a410b68..7cbca91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-xserver-xorg-video-amdgpu (1.1.1-2) UNRELEASED; urgency=medium
+xserver-xorg-video-amdgpu (1.1.2-1) UNRELEASED; urgency=medium
+ * New upstream release.
+ - fix-configdir.diff: Dropped, fixed upstream
* Use https URL in debian/watch.
-- Julien Cristau <jcris...@debian.org> Fri, 16 Sep 2016 07:48:44 +0200
diff --git a/debian/patches/fix-configdir.diff
b/debian/patches/fix-configdir.diff
deleted file mode 100644
index 8cc7c52..0000000
--- a/debian/patches/fix-configdir.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ed45aaa..b5fa113 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -90,8 +90,8 @@ PKG_CHECK_EXISTS([xorg-server >= 1.16],
- AC_ARG_WITH(xorg-conf-dir,
- AS_HELP_STRING([--with-xorg-conf-dir=DIR],
- [Default xorg.conf.d directory
[[default=$prefix/share/X11/xorg.conf.d/]]]),
-- [xorgconfdir="$withval"],
-- [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
-+ [configdir="$withval"],
-+ [configdir="$prefix/share/X11/xorg.conf.d"])
- AC_SUBST(configdir)
- AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
-
diff --git a/debian/patches/series b/debian/patches/series
index 3a0e685..a82d1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-configdir.diff
+#placeholder
commit b407c1244d28a80f76275abca2239cdd4120f017
Author: Michel Dänzer <michel.daen...@amd.com>
Date: Fri Sep 16 18:11:31 2016 +0900
Bump version for 1.1.2 release
diff --git a/configure.ac b/configure.ac
index ff6a368..123947b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-amdgpu],
- [1.1.1],
+ [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-amdgpu])
commit 82062157263d6f63ce8f645bf32101fd18bd98e5
Author: Michel Dänzer <michel.daen...@amd.com>
Date: Fri Sep 16 18:01:41 2016 +0900
Fix handling of configure option --with-xorg-conf-dir
There were two problems:
I accidentally changed the variable name in the AC_ARG_WITH stanza from
configdir to xorgconfigdir, so specifying --with-xorg-conf-dir wouldn't
work correctly. Fix this back to configdir.
If neither --with-xorg-conf-dir nor --prefix is specified on the command
line, the $prefix variable doesn't contain "/usr/local" (the default
prefix) yet at this point but "NONE". So make install would attempt to
install 10-amdgpu.conf in ${DESTDIR}NONE/share/X11/xorg.conf.d/ . Fix
this by leaving ${prefix} verbatim in the default value, to be resolved
by make.
Also print the configdir value along with the values of other similar
configuration variables.
Reported-by: Timo Aaltonen <tjaal...@debian.org>
Reviewed-by: Julien Cristau <jcris...@debian.org>
(Cherry picked from commit aa8a3fa2468094cd37959179e8417ba7ba0a326c)
diff --git a/configure.ac b/configure.ac
index ed45aaa..ff6a368 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,9 +89,9 @@ PKG_CHECK_EXISTS([xorg-server >= 1.16],
[sysconfigdir=""])
AC_ARG_WITH(xorg-conf-dir,
AS_HELP_STRING([--with-xorg-conf-dir=DIR],
- [Default xorg.conf.d directory
[[default=$prefix/share/X11/xorg.conf.d/]]]),
- [xorgconfdir="$withval"],
- [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
+ [Default xorg.conf.d directory
[[default=${prefix}/share/X11/xorg.conf.d]]]),
+ [configdir="$withval"],
+ [configdir='${prefix}/share/X11/xorg.conf.d'])
AC_SUBST(configdir)
AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
@@ -279,6 +279,7 @@ echo " prefix: $prefix"
echo " exec_prefix: $exec_prefix"
echo " libdir: $libdir"
echo " includedir: $includedir"
+echo " configdir: $configdir"
echo ""
echo " CFLAGS: $CFLAGS"
