Control: tags -1 + patch

[Petter Reinholdtsen]
> I guess the install target for the configuration file is bad.

The problem seem to be that autoconf/automake have changed behaviour, breaking
the old install target in conf/Makefile.am in combination with the symlinks
created by dh.

The following patch fixes the miscompile, but do not solve the upgrade
problem caused by the fact that /etc/openuniverse.conf/ is a directory
in existing versions and not a configuration file.  The idea is to
make sure 'make install' do not see the symlink in /usr/share/ and install
the file as before, and after install the file is moved to /etc/ and replaced
by a symlink.

After removing the /etc/openuniverse.conf/ directory and I install the new debs
and run the program.

-- 
Happy hacking
Petter Reinholdtsen
diff -u openuniverse-1.0beta3.1+dfsg/debian/changelog openuniverse-1.0beta3.1+dfsg/debian/changelog
--- openuniverse-1.0beta3.1+dfsg/debian/changelog
+++ openuniverse-1.0beta3.1+dfsg/debian/changelog
@@ -1,3 +1,10 @@
+openuniverse (1.0beta3.1+dfsg-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * fix wrong location for conf file
+
+ -- Petter Reinholdtsen <p...@debian.org>  Mon, 23 Jan 2017 09:32:33 +0100
+
 openuniverse (1.0beta3.1+dfsg-5) unstable; urgency=low
 
   * debian/rules:
diff -u openuniverse-1.0beta3.1+dfsg/debian/openuniverse.install openuniverse-1.0beta3.1+dfsg/debian/openuniverse.install
--- openuniverse-1.0beta3.1+dfsg/debian/openuniverse.install
+++ openuniverse-1.0beta3.1+dfsg/debian/openuniverse.install
@@ -4 +4,2 @@
-usr/share/openuniverse/conf/ou.conf /etc/openuniverse.conf
+etc/openuniverse.conf
+usr/share/openuniverse/conf/ou.conf
diff -u openuniverse-1.0beta3.1+dfsg/debian/openuniverse.links openuniverse-1.0beta3.1+dfsg/debian/openuniverse.links
--- openuniverse-1.0beta3.1+dfsg/debian/openuniverse.links
+++ openuniverse-1.0beta3.1+dfsg/debian/openuniverse.links
@@ -1,2 +1 @@
-/etc/openuniverse.conf /usr/share/openuniverse/conf/ou.conf  
 /usr/share/openuniverse/docs /usr/share/doc/openuniverse/manual
diff -u openuniverse-1.0beta3.1+dfsg/debian/rules openuniverse-1.0beta3.1+dfsg/debian/rules
--- openuniverse-1.0beta3.1+dfsg/debian/rules
+++ openuniverse-1.0beta3.1+dfsg/debian/rules
@@ -22,6 +22,12 @@
 override_dh_auto_build:
 	CXXFLAGS="-I/usr/include/plib/" LIBS="-lplibfnt -lplibul -lglut" ./configure --prefix= --exec_prefix=/usr --mandir=\$${exec_prefix}/share/man --infodir=\$${exec_prefix}/share/info --sysconfdir=\$${prefix}/etc/ --includedir=\$${exec_prefix}/include --datadir=\$${exec_prefix}/share
 	$(MAKE)
+override_dh_auto_install:
+	dh_auto_install
+	mkdir `pwd`/debian/tmp/etc
+	mv `pwd`/debian/tmp/usr/share/openuniverse/conf/ou.conf \
+	  `pwd`/debian/tmp/etc/openuniverse.conf
+	ln -s /etc/openuniverse.conf debian/tmp/usr/share/openuniverse/conf/ou.conf
 
 
 override_dh_fixperms-arch:

Reply via email to