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

X Strike Force X.Org X11 SVN commit: r1172 - branches/modular/data/xkbdata-X11R7.0-1.0.1/debian



Author: dnusinow
Date: 2006-02-07 23:48:04 -0500 (Tue, 07 Feb 2006)
New Revision: 1172

Modified:
   branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog
   branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/rules
   branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/xkbdata.install
Log:
* Actually install files properly. This removes cruft left over from copy of
  stuff from xbitmaps data packaging. Thanks Joerg Jaspert for catching this
  huge mistake.


Modified: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog	2006-02-08 04:26:14 UTC (rev 1171)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/changelog	2006-02-08 04:48:04 UTC (rev 1172)
@@ -1,3 +1,11 @@
+xkbdata (1.0.1-2) experimental; urgency=low
+
+  * Actually install files properly. This removes cruft left over from copy of
+    stuff from xbitmaps data packaging. Thanks Joerg Jaspert for catching this
+    huge mistake.
+
+ -- David Nusinow <dnusinow@debian.org>  Tue,  7 Feb 2006 23:46:47 -0500
+
 xkbdata (1.0.1-1) experimental; urgency=low
 
   * First upload to Debian

Modified: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/rules	2006-02-08 04:26:14 UTC (rev 1171)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/rules	2006-02-08 04:48:04 UTC (rev 1172)
@@ -61,16 +61,16 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	
+	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
-	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
+	dh_install --sourcedir=debian/tmp
 	dh_installchangelogs
 	dh_installman
 	dh_link

Modified: branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/xkbdata.install
===================================================================
--- branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/xkbdata.install	2006-02-08 04:26:14 UTC (rev 1171)
+++ branches/modular/data/xkbdata-X11R7.0-1.0.1/debian/xkbdata.install	2006-02-08 04:48:04 UTC (rev 1172)
@@ -1 +1 @@
-xbitmaps/usr/share/X11/xkb/*
+usr/share/X11/xkb/*



Reply to: