tags 370596 patch kthxbye On Tue, Jun 6, 2006 at 16:42:02 +0200, Matej Vela wrote:
> retitle 370596 videogen: ships binaries in /usr/X11R6/bin > thanks > > x11-common conflicts with videogen (<= 0.32-1) because it ships binaries > in /usr/X11R6/bin, which is going away with X.org 7. Please move > everything into plain /usr. > Hi, the attached patch fixes this bug. Cheers, Julien
diff -u videogen-0.32/debian/rules videogen-0.32/debian/rules
--- videogen-0.32/debian/rules
+++ videogen-0.32/debian/rules
@@ -38,8 +38,8 @@
# Add here commands to install the package into debian/videogen.
#$(MAKE) install DESTDIR=`pwd`/debian/videogen
- install -m 755 videogen debian/videogen/usr/X11R6/bin/
- install -m 755 some_modes.sh debian/videogen/usr/X11R6/bin/some_modes
+ install -m 755 videogen debian/videogen/usr/bin/
+ install -m 755 some_modes.sh debian/videogen/usr/bin/some_modes
# Build architecture-independent files here.
binary-indep: build install
@@ -51,7 +51,7 @@
dh_testdir
dh_testroot
dh_installdocs
- dh_installmanpages
+ dh_installman
dh_installexamples
dh_installchangelogs CHANGES
dh_link
diff -u videogen-0.32/debian/dirs videogen-0.32/debian/dirs
--- videogen-0.32/debian/dirs
+++ videogen-0.32/debian/dirs
@@ -1,2 +1,2 @@
-usr/X11R6/bin
-usr/X11R6/man/man1
+usr/bin
+usr/share/man/man1
diff -u videogen-0.32/debian/changelog videogen-0.32/debian/changelog
--- videogen-0.32/debian/changelog
+++ videogen-0.32/debian/changelog
@@ -1,3 +1,11 @@
+videogen (0.32-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Stop installing files in /usr/X11R6 (Closes: #370596).
+ * Switch to dh_installman instead of the deprecated dh_installmanpages.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 10 Jun 2006 04:51:12 +0200
+
videogen (0.32-1) unstable; urgency=low
* New maintainer (closes: #122708).
only in patch2:
unchanged:
--- videogen-0.32.orig/debian/manpages
+++ videogen-0.32/debian/manpages
@@ -0,0 +1,2 @@
+videogen.1x
+some_modes.1x
signature.asc
Description: Digital signature
