[Restricted-changes] r153 - in dists/trunk: faac/debian hot-babe/debian mjpegtools/debian transcode/debian xv/debian xv/debian/patches

fabian-guest at alioth.debian.org fabian-guest at alioth.debian.org
Sat Aug 18 11:04:02 UTC 2007


Author: fabian-guest
Date: 2007-08-18 11:04:02 +0000 (Sat, 18 Aug 2007)
New Revision: 153

Modified:
   dists/trunk/faac/debian/rules
   dists/trunk/hot-babe/debian/copyright
   dists/trunk/hot-babe/debian/rules
   dists/trunk/mjpegtools/debian/copyright
   dists/trunk/transcode/debian/copyright
   dists/trunk/xv/debian/copyright
   dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch
   dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch
   dists/trunk/xv/debian/patches/05-dlinux.dpatch
   dists/trunk/xv/debian/rules
Log:
More love for my pet packages ;)


Modified: dists/trunk/faac/debian/rules
===================================================================
--- dists/trunk/faac/debian/rules	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/faac/debian/rules	2007-08-18 11:04:02 UTC (rev 153)
@@ -43,21 +43,21 @@
 	# Cleaning package
 	-$(MAKE) --ignore-errors distclean
 
-	# Reversing bootstrapping
-	rm -f aclocal.m4
-	rm -rf autom4te.cache/
-	rm -f common/Makefile.in
-	rm -f common/mp4v2/Makefile.in
-	rm -f config.h.in
-	rm -f configure
-	rm -f depcomp
-	rm -f frontend/Makefile.in
-	rm -f include/Makefile.in
-	rm -f install-sh
-	rm -f libfaac/Makefile.in
-	rm -f ltmain.sh
-	rm -f Makefile.in
-	rm -f missing
+	# Reverting bootstrapping
+	rm -rf aclocal.m4 \
+		autom4te.cache \
+		common/Makefile.in \
+		common/mp4v2/Makefile.in \
+		config.h.in \
+		configure \
+		depcomp \
+		frontend/Makefile.in \
+		include/Makefile.in \
+		install-sh \
+		libfaac/Makefile.in \
+		ltmain.sh \
+		Makefile.in \
+		missing
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -78,9 +78,9 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	# Removing libmp4v2 relics
-	rm -f debian/tmp/usr/include/mp4*
-	rm -f debian/tmp/usr/include/mpeg4*
-	rm -f debian/tmp/usr/lib/libmp4*
+	rm -rf debian/tmp/usr/include/mp4* \
+		debian/tmp/usr/include/mpeg4* \
+		debian/tmp/usr/lib/libmp4*
 
         # Adding symlink
 	ln -sf libfaac.so.0.0.0 debian/tmp/usr/lib/libfaac.so.0.0

Modified: dists/trunk/hot-babe/debian/copyright
===================================================================
--- dists/trunk/hot-babe/debian/copyright	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/hot-babe/debian/copyright	2007-08-18 11:04:02 UTC (rev 153)
@@ -11,9 +11,8 @@
 
 License:
 
-	Copyright (C) 2002-2004 David Odin <david at dindinx.org>
-	Copyright (C) 2002-2004 Cyprien Laplace <cyprien33 at laposte.net>
-	Copyright (C) 2002-2004 Bruno Bellamy <bruno at bellaminettes.com>
+	Copyright (C) 2002-2004 David Odin and Cyprien Laplace
+	Pictures Copyright (C) 2002-2004 Bruno Bellamy
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the Artistic License.

Modified: dists/trunk/hot-babe/debian/rules
===================================================================
--- dists/trunk/hot-babe/debian/rules	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/hot-babe/debian/rules	2007-08-18 11:04:02 UTC (rev 153)
@@ -16,7 +16,7 @@
 	dh_testdir
 
 	# Building package
-	$(MAKE) CFLAGS="$(CFLAGS)" PREFIX=/usr
+	CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr
 
 	touch build-stamp
 
@@ -26,7 +26,7 @@
 	rm -f build-stamp
 
 	# Cleaning package
-	-$(MAKE) clean
+	$(MAKE) clean
 
 	dh_clean
 
@@ -37,7 +37,7 @@
 	dh_installdirs
 
 	# Installing package
-	$(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/hot-babe DOC="CONTRIBUTORS NEWS TODO"
+	$(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/hot-babe DOC="NEWS TODO CONTRIBUTORS"
 
 	# Installing bug control
 	for BUG in debian/bug/*; \

Modified: dists/trunk/mjpegtools/debian/copyright
===================================================================
--- dists/trunk/mjpegtools/debian/copyright	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/mjpegtools/debian/copyright	2007-08-18 11:04:02 UTC (rev 153)
@@ -1,3 +1,5 @@
+*** FIXME!!! ***
+
 This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
 Sun,  1 Jul 2007 00:00:00 +0200.
 

Modified: dists/trunk/transcode/debian/copyright
===================================================================
--- dists/trunk/transcode/debian/copyright	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/transcode/debian/copyright	2007-08-18 11:04:02 UTC (rev 153)
@@ -1,3 +1,5 @@
+*** FIXME!!! ***
+
 This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
 Sun,  1 Jul 2007 00:00:00 +0200.
 

Modified: dists/trunk/xv/debian/copyright
===================================================================
--- dists/trunk/xv/debian/copyright	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/xv/debian/copyright	2007-08-18 11:04:02 UTC (rev 153)
@@ -9,7 +9,7 @@
 
 License:
 
-	Copyright (C) 1989-1994 John Bradley <bradley at trilon.com>
+	Copyright (C) 1989-1994 John Bradley
 	All rights reserved.
 
 	Permission to copy and distribute XV in its entirety, for non-commercial
@@ -45,7 +45,7 @@
 
 	Commercial, government, and institutional users must register their
 	copies of XV, for the price of $25 per workstation/X terminal or per XV
-	user, whichever is less.  Note that it does NOT say 'simultaneous user',
+	user, whichever is less. Note that it does NOT say 'simultaneous user',
 	but rather, the total number of people who use XV on any sort of
 	recurring basis. Site licenses are available (and recommended) for those
 	who wish to run XV on a large (>10) number of machines. Contact the
@@ -64,7 +64,7 @@
 
 License (XV Jumbo Patches):
 
-	Portions Copyright (C) 2000-2007 by Greg Roelofs and contributors:
+	Portions Copyright (C) 2000-2007 Greg Roelofs and contributors:
 
 	Andrey A. Chernov [ache]
 	  (http://cvsweb.freebsd.org/ports/graphics/xv/files/patch-ab)

Modified: dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/xv/debian/patches/01-xv-3.10a-jumbo-fix-enh-patch-20070520.dpatch	2007-08-18 11:04:02 UTC (rev 153)
@@ -2,7 +2,7 @@
 ## xv-3.10a-jumbo-fix-enh-patch-20070520.txt by Greg Roelofs <newt at pobox.com>
 ## It was downloaded from <http://www.sonic.net/~roelofs/greg_xv.html>.
 ##
-## DP: XV Jumbo Patch (fixes and enhancements).
+## DP: XV Jumbo Patches (fixes and enhancements).
 
 @DPATCH@
 

Modified: dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/xv/debian/patches/02-xv-3.10a-jumbo-files-20070520.dpatch	2007-08-18 11:04:02 UTC (rev 153)
@@ -2,7 +2,7 @@
 ## xv-3.10a-jumbo-patches-20070520.tar.gz by Greg Roelofs <newt at pobox.com>
 ## It was downloaded from <http://www.sonic.net/~roelofs/greg_xv.html>.
 ##
-## DP: XV Jumbo Patch (supplementary files).
+## DP: XV Jumbo Patches (supplementary files).
 
 @DPATCH@
 

Modified: dists/trunk/xv/debian/patches/05-dlinux.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/05-dlinux.dpatch	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/xv/debian/patches/05-dlinux.dpatch	2007-08-18 11:04:02 UTC (rev 153)
@@ -1,7 +1,7 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 05-dlinux.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
 ##
-## DP: Predefine LINUX macro.
+## DP: Predefine the LINUX macro.
 
 @DPATCH@
 

Modified: dists/trunk/xv/debian/rules
===================================================================
--- dists/trunk/xv/debian/rules	2007-08-16 23:03:18 UTC (rev 152)
+++ dists/trunk/xv/debian/rules	2007-08-18 11:04:02 UTC (rev 153)
@@ -29,7 +29,7 @@
 	rm -f build-stamp
 
 	# Cleaning package
-	-$(MAKE) clean
+	$(MAKE) clean
 
 	dh_clean
 
@@ -40,7 +40,7 @@
 	dh_installdirs
 
 	# Installing package
-	$(MAKE) install PREFIX=/usr DESTDIR=debian/xv
+	$(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/xv
 
 	# Installing pixmap
 	install -D -m 0644 debian/pixmap/xv.xpm debian/xv/usr/share/pixmaps/xv.xpm




More information about the Restricted-changes mailing list