[Demudi-commits] r712 - in bootsplash/trunk/debian: . patches

[Free Ekanayaka]

Author: free-guest
Date: 2006-02-18 14:32:24 +0000 (Sat, 18 Feb 2006)
New Revision: 712

Modified:
   bootsplash/trunk/debian/changelog
   bootsplash/trunk/debian/patches/Makefile.dpatch
   bootsplash/trunk/debian/rules
Log:
* Don't ship the static version of fbtruetype, it's not needed
  on a regular Debian system
* Don't ship splashpbm, AFAIK it's currently used only by a single upstream
  theme, which is not going to be package ATM. We may want to re-include it
  later in case somebody requests it.

Modified: bootsplash/trunk/debian/changelog
===================================================================
--- bootsplash/trunk/debian/changelog	2006-02-17 10:24:32 UTC (rev 711)
+++ bootsplash/trunk/debian/changelog	2006-02-18 14:32:24 UTC (rev 712)
@@ -15,6 +15,11 @@
   * Use the first kernel listed in /boot as default
   * Copy the splash.sh.1 man page manually, as dh_installman doesn't
     like the .sh suffix
+  * Don't ship the static version of fbtruetype, it's not needed
+    on a regular Debian system
+  * Don't ship splashpbm, AFAIK it's currently used only by a single upstream
+    theme, which is not going to be package ATM. We may want to re-include it
+    later in case somebody requests it.
 
  -- Free Ekanayaka <free at agnula.org>  Mon,  6 Feb 2006 05:27:50 -0500
 

Modified: bootsplash/trunk/debian/patches/Makefile.dpatch
===================================================================
--- bootsplash/trunk/debian/patches/Makefile.dpatch	2006-02-17 10:24:32 UTC (rev 711)
+++ bootsplash/trunk/debian/patches/Makefile.dpatch	2006-02-18 14:32:24 UTC (rev 712)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad bootsplash-3.1~/Utilities/Makefile bootsplash-3.1/Utilities/Makefile
---- bootsplash-3.1~/Utilities/Makefile	2006-02-06 05:02:26.000000000 -0500
-+++ bootsplash-3.1/Utilities/Makefile	2006-02-06 05:02:40.857840736 -0500
+--- bootsplash-3.1~/Utilities/Makefile	2004-02-19 17:42:11.000000000 +0100
++++ bootsplash-3.1/Utilities/Makefile	2006-02-18 15:31:18.000000000 +0100
 @@ -1,9 +1,12 @@
  # Makefile for bootsplash utilities. 
  # written by Stefan Reinauer <stepan at suse.de> in 2003
@@ -23,11 +23,13 @@
  
  # Triggering lib64 path from spec file.
  PREFIX   ?= /usr
-@@ -12,7 +15,7 @@
+@@ -11,8 +14,8 @@
+ 
  LIBDIR   = $(PREFIX)/$(LIB)
  
- PROGRAMS        = splash splashpbm fbresolution fbtruetype fbmngplay 
+-PROGRAMS        = splash splashpbm fbresolution fbtruetype fbmngplay 
 -PROGRAMS_STATIC = fbtruetype.static fbmngplay.static
++PROGRAMS        = splash fbresolution fbtruetype fbmngplay 
 +PROGRAMS_STATIC = fbtruetype.static
  
  OBJECTS_FT2  = fbtruetype.o fbtruetype-messages.o console.o ttf.o luxisri.o
@@ -41,7 +43,7 @@
 +
 +install: $(PROGRAMS) strip
 +	$(INSTALL) splash "$(DESTDIR)/usr/sbin/"
-+	$(INSTALL) fbresolution fbtruetype fbmngplay splashpbm "$(DESTDIR)/sbin/"
++	$(INSTALL) fbresolution fbtruetype fbmngplay "$(DESTDIR)/sbin/"
 +
 +install.static: $(PROGRAMS_STATIC) strip
 +	$(INSTALL) fbtruetype.static "$(DESTDIR)/sbin/"

Modified: bootsplash/trunk/debian/rules
===================================================================
--- bootsplash/trunk/debian/rules	2006-02-17 10:24:32 UTC (rev 711)
+++ bootsplash/trunk/debian/rules	2006-02-18 14:32:24 UTC (rev 712)
@@ -66,7 +66,6 @@
 	cp debian/splash.sh.1 $(CURDIR)/debian/bootsplash/usr/share/man/man1/
 	# Add here commands to install the package into debian/bootsplash.
 	$(MAKE) -C Utilities install DESTDIR="$(CURDIR)/debian/bootsplash"
-	$(MAKE) -C Utilities install.static DESTDIR="$(CURDIR)/debian/bootsplash"
 
 	$(INSTALL_NOSTRIP) Scripts/splash.sh Scripts/bootanim Scripts/includeprog "$(CURDIR)/debian/bootsplash/sbin/"
 	$(INSTALL_NOSTRIP) Scripts/bootsplash "$(CURDIR)/debian/bootsplash/etc/init.d/"