[Restricted-changes] r167 - in dists/trunk: hot-babe/debian lame/debian lame/debian/patches libdvdcss/debian
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Thu Feb 21 20:37:07 UTC 2008
Author: fabian-guest
Date: 2008-02-21 20:37:06 +0000 (Thu, 21 Feb 2008)
New Revision: 167
Added:
dists/trunk/lame/debian/patches/01_debian-directory.patch
dists/trunk/lame/debian/patches/02_as-needed.patch
dists/trunk/lame/debian/patches/03_shared-frontend.patch
dists/trunk/lame/debian/patches/04_manpage-syntax.patch
Removed:
dists/trunk/lame/debian/patches/00list
dists/trunk/lame/debian/patches/01-debian-directory.dpatch
dists/trunk/lame/debian/patches/02-makefile.dpatch
dists/trunk/lame/debian/patches/03-dynamic-frontends.dpatch
Modified:
dists/trunk/hot-babe/debian/rules
dists/trunk/lame/debian/control
dists/trunk/lame/debian/rules
dists/trunk/libdvdcss/debian/control
dists/trunk/libdvdcss/debian/rules
Log:
hot-babe:
- Adjust LDFLAGS
libdvdcss:
- Set LDFLAGS
- Build-Depends on autotools-dev (not libtool, oops) and versioned cdbs
lame:
- Build-Depends on versioned cdbs, not on dpatch
- Simply patches
- Add patch to fix syntax error in manpage
- Set LDFLAGS
Modified: dists/trunk/hot-babe/debian/rules
===================================================================
--- dists/trunk/hot-babe/debian/rules 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/hot-babe/debian/rules 2008-02-21 20:37:06 UTC (rev 167)
@@ -4,7 +4,7 @@
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_MAKE_BUILD_TARGET += PREFIX=/usr
DEB_MAKE_INSTALL_TARGET += install PREFIX=/usr DESTDIR=$(CURDIR)/debian/hot-babe DOC="NEWS TODO CONTRIBUTORS"
Modified: dists/trunk/lame/debian/control
===================================================================
--- dists/trunk/lame/debian/control 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/lame/debian/control 2008-02-21 20:37:06 UTC (rev 167)
@@ -7,9 +7,8 @@
Origin: debian-unofficial.org
Bugs: mailto:restricted-devel at lists.alioth.debian.org
Build-Depends: autotools-dev,
- cdbs,
+ cdbs (>= 0.4.41),
debhelper (>= 5),
- dpatch,
libgtk1.2-dev,
libncurses5-dev,
nasm [i386]
Deleted: dists/trunk/lame/debian/patches/00list
===================================================================
--- dists/trunk/lame/debian/patches/00list 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/lame/debian/patches/00list 2008-02-21 20:37:06 UTC (rev 167)
@@ -1,3 +0,0 @@
-01-debian-directory
-02-makefile
-03-dynamic-frontends
Deleted: dists/trunk/lame/debian/patches/01-debian-directory.dpatch
===================================================================
--- dists/trunk/lame/debian/patches/01-debian-directory.dpatch 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/lame/debian/patches/01-debian-directory.dpatch 2008-02-21 20:37:06 UTC (rev 167)
@@ -1,61 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-debian-directory.dpatch by Daniel Baumann <daniel at debian.org>
-##
-## DP: Rebuild upstream tarball without debian directory.
-
- at DPATCH@
-
-diff -Naur lame-3.97+debian.orig/Makefile.am lame-3.97+debian/Makefile.am
---- lame-3.97+debian.orig/Makefile.am 2005-08-21 17:32:07.000000000 +0000
-+++ lame-3.97+debian/Makefile.am 2007-01-07 11:37:53.000000000 +0000
-@@ -4,7 +4,7 @@
-
- .PHONY: test
-
--SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM mac
-+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM mac
-
- CLEANFILES = testcase.new.mp3
-
-diff -Naur lame-3.97+debian.orig/Makefile.in lame-3.97+debian/Makefile.in
---- lame-3.97+debian.orig/Makefile.in 2006-09-24 13:53:28.000000000 +0000
-+++ lame-3.97+debian/Makefile.in 2007-01-07 11:37:47.000000000 +0000
-@@ -204,7 +204,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = 1.5 foreign $(top_srcdir)/ansi2knr
--SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM mac
-+SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM mac
- CLEANFILES = testcase.new.mp3
- EXTRA_DIST = \
- API \
-diff -Naur lame-3.97+debian.orig/configure lame-3.97+debian/configure
---- lame-3.97+debian.orig/configure 2006-09-24 13:53:31.000000000 +0000
-+++ lame-3.97+debian/configure 2007-01-07 11:37:38.000000000 +0000
-@@ -31034,7 +31034,7 @@
-
-
-
-- ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile"
-+ ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -31638,7 +31638,6 @@
- "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
- "Dll/Makefile" ) CONFIG_FILES="$CONFIG_FILES Dll/Makefile" ;;
- "misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
-- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
- "dshow/Makefile" ) CONFIG_FILES="$CONFIG_FILES dshow/Makefile" ;;
- "ACM/Makefile" ) CONFIG_FILES="$CONFIG_FILES ACM/Makefile" ;;
- "ACM/ADbg/Makefile" ) CONFIG_FILES="$CONFIG_FILES ACM/ADbg/Makefile" ;;
-diff -Naur lame-3.97+debian.orig/configure.in lame-3.97+debian/configure.in
---- lame-3.97+debian.orig/configure.in 2006-09-24 13:53:31.000000000 +0000
-+++ lame-3.97+debian/configure.in 2007-01-07 11:37:27.000000000 +0000
-@@ -1088,5 +1088,5 @@
-
- AC_SUBST(CONFIG_DEFS)
-
--AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile])
-+AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile])
- AC_OUTPUT
Added: dists/trunk/lame/debian/patches/01_debian-directory.patch
===================================================================
--- dists/trunk/lame/debian/patches/01_debian-directory.patch (rev 0)
+++ dists/trunk/lame/debian/patches/01_debian-directory.patch 2008-02-21 20:37:06 UTC (rev 167)
@@ -0,0 +1,54 @@
+diff -Nur lame-3.97/configure lame-3.97.new/configure
+--- lame-3.97/configure
++++ lame-3.97.new/configure
+@@ -31034,7 +31034,7 @@
+
+
+
+- ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile"
++ ac_config_files="$ac_config_files Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -31638,7 +31638,6 @@
+ "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+ "Dll/Makefile" ) CONFIG_FILES="$CONFIG_FILES Dll/Makefile" ;;
+ "misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
+- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+ "dshow/Makefile" ) CONFIG_FILES="$CONFIG_FILES dshow/Makefile" ;;
+ "ACM/Makefile" ) CONFIG_FILES="$CONFIG_FILES ACM/Makefile" ;;
+ "ACM/ADbg/Makefile" ) CONFIG_FILES="$CONFIG_FILES ACM/ADbg/Makefile" ;;
+diff -Nur lame-3.97/configure.in lame-3.97.new/configure.in
+--- lame-3.97/configure.in
++++ lame-3.97.new/configure.in
+@@ -1088,5 +1088,5 @@
+
+ AC_SUBST(CONFIG_DEFS)
+
+-AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile debian/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile])
++AC_CONFIG_FILES([Makefile libmp3lame/Makefile libmp3lame/i386/Makefile frontend/Makefile mpglib/Makefile doc/Makefile doc/html/Makefile doc/man/Makefile include/Makefile Dll/Makefile misc/Makefile dshow/Makefile ACM/Makefile ACM/ADbg/Makefile ACM/ddk/Makefile ACM/tinyxml/Makefile lame.spec mac/Makefile])
+ AC_OUTPUT
+diff -Nur lame-3.97/Makefile.am lame-3.97.new/Makefile.am
+--- lame-3.97/Makefile.am
++++ lame-3.97.new/Makefile.am
+@@ -4,7 +4,7 @@
+
+ .PHONY: test
+
+-SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM mac
++SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM mac
+
+ CLEANFILES = testcase.new.mp3
+
+diff -Nur lame-3.97/Makefile.in lame-3.97.new/Makefile.in
+--- lame-3.97/Makefile.in
++++ lame-3.97.new/Makefile.in
+@@ -204,7 +204,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.5 foreign $(top_srcdir)/ansi2knr
+-SUBDIRS = mpglib libmp3lame frontend Dll debian doc include misc dshow ACM mac
++SUBDIRS = mpglib libmp3lame frontend Dll doc include misc dshow ACM mac
+ CLEANFILES = testcase.new.mp3
+ EXTRA_DIST = \
+ API \
Deleted: dists/trunk/lame/debian/patches/02-makefile.dpatch
===================================================================
--- dists/trunk/lame/debian/patches/02-makefile.dpatch 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/lame/debian/patches/02-makefile.dpatch 2008-02-21 20:37:06 UTC (rev 167)
@@ -1,17 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-makefile.dpatch by Christian Marillat <marillat at debian.org>
-
- at DPATCH@
-
-diff -Naur lame-3.97+debian.orig/libmp3lame/Makefile.in lame-3.97+debian/libmp3lame/Makefile.in
---- lame-3.97+debian.orig/libmp3lame/Makefile.in 2006-09-24 13:53:32.000000000 +0000
-+++ lame-3.97+debian/libmp3lame/Makefile.in 2007-01-07 11:39:41.000000000 +0000
-@@ -228,7 +228,7 @@
- @HAVE_NASM_TRUE at nasm_ldadd = $(top_builddir)/libmp3lame/@CPUTYPE@/liblameasmroutines.la
- @LIB_WITH_DECODER_FALSE at decoder_ldadd =
- @LIB_WITH_DECODER_TRUE at decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
--libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
-+libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
- libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
- -no-undefined
-
Added: dists/trunk/lame/debian/patches/02_as-needed.patch
===================================================================
--- dists/trunk/lame/debian/patches/02_as-needed.patch (rev 0)
+++ dists/trunk/lame/debian/patches/02_as-needed.patch 2008-02-21 20:37:06 UTC (rev 167)
@@ -0,0 +1,12 @@
+diff -Nur lame-3.97/libmp3lame/Makefile.in lame-3.97.new/libmp3lame/Makefile.in
+--- lame-3.97/libmp3lame/Makefile.in
++++ lame-3.97.new/libmp3lame/Makefile.in
+@@ -228,7 +228,7 @@
+ @HAVE_NASM_TRUE at nasm_ldadd = $(top_builddir)/libmp3lame/@CPUTYPE@/liblameasmroutines.la
+ @LIB_WITH_DECODER_FALSE at decoder_ldadd =
+ @LIB_WITH_DECODER_TRUE at decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
+-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
+ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
+ -no-undefined
+
Deleted: dists/trunk/lame/debian/patches/03-dynamic-frontends.dpatch
===================================================================
--- dists/trunk/lame/debian/patches/03-dynamic-frontends.dpatch 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/lame/debian/patches/03-dynamic-frontends.dpatch 2008-02-21 20:37:06 UTC (rev 167)
@@ -1,31 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-dynamic-frontends.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## DP: Link frontends against shared libraries.
-
- at DPATCH@
-
-diff -Naru lame-3.97.orig/frontend/Makefile.am lame-3.97/frontend/Makefile.am
---- lame-3.97.orig/frontend/Makefile.am 2006-09-24 15:53:31.000000000 +0200
-+++ lame-3.97/frontend/Makefile.am 2007-10-25 13:35:02.000000000 +0200
-@@ -52,7 +52,7 @@
- endif
-
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
-
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
-
-diff -Naru lame-3.97.orig/frontend/Makefile.in lame-3.97/frontend/Makefile.in
---- lame-3.97.orig/frontend/Makefile.in 2006-09-24 15:53:31.000000000 +0200
-+++ lame-3.97/frontend/Makefile.in 2007-10-25 13:35:10.000000000 +0200
-@@ -156,7 +156,7 @@
- $(top_builddir)/libmp3lame/libmp3lame.la \
- @FRONTEND_LDADD@
-
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
Added: dists/trunk/lame/debian/patches/03_shared-frontend.patch
===================================================================
--- dists/trunk/lame/debian/patches/03_shared-frontend.patch (rev 0)
+++ dists/trunk/lame/debian/patches/03_shared-frontend.patch 2008-02-21 20:37:06 UTC (rev 167)
@@ -0,0 +1,24 @@
+diff -Nur lame-3.97/frontend/Makefile.am lame-3.97.new/frontend/Makefile.am
+--- lame-3.97/frontend/Makefile.am
++++ lame-3.97.new/frontend/Makefile.am
+@@ -52,7 +52,7 @@
+ endif
+
+ CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
+
+ INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
+
+diff -Nur lame-3.97/frontend/Makefile.in lame-3.97.new/frontend/Makefile.in
+--- lame-3.97/frontend/Makefile.in
++++ lame-3.97.new/frontend/Makefile.in
+@@ -156,7 +156,7 @@
+ $(top_builddir)/libmp3lame/libmp3lame.la \
+ @FRONTEND_LDADD@
+
+-LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ -static
++LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
Added: dists/trunk/lame/debian/patches/04_manpage-syntax.patch
===================================================================
--- dists/trunk/lame/debian/patches/04_manpage-syntax.patch (rev 0)
+++ dists/trunk/lame/debian/patches/04_manpage-syntax.patch 2008-02-21 20:37:06 UTC (rev 167)
@@ -0,0 +1,8 @@
+diff -Nur lame-3.97/doc/man/lame.1 lame-3.97.new/doc/man/lame.1
+--- lame-3.97/doc/man/lame.1
++++ lame-3.97.new/doc/man/lame.1
+@@ -1230,4 +1230,3 @@
+ mpglib by Michael Hipp
+ Manual page by William Schelter, Nils Faerber, Alexander Leidinger.
+ Small fixes on the manual page by Rogerio Brito.
+-.f
Modified: dists/trunk/lame/debian/rules
===================================================================
--- dists/trunk/lame/debian/rules 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/lame/debian/rules 2008-02-21 20:37:06 UTC (rev 167)
@@ -2,8 +2,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-brhist \
--enable-decode-layer1 \
Modified: dists/trunk/libdvdcss/debian/control
===================================================================
--- dists/trunk/libdvdcss/debian/control 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/libdvdcss/debian/control 2008-02-21 20:37:06 UTC (rev 167)
@@ -6,9 +6,9 @@
Daniel Baumann <daniel at debian.org>
Origin: debian-unofficial.org
Bugs: mailto:restricted-devel at lists.alioth.debian.org
-Build-Depends: cdbs,
- debhelper (>= 5),
- libtool
+Build-Depends: autotools-dev,
+ cdbs (>= 0.4.41),
+ debhelper (>= 5)
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/libdvdcss/
Vcs-Browser: http://svn.debian.org/wsvn/restricted/dists/trunk/libdvdcss/
Modified: dists/trunk/libdvdcss/debian/rules
===================================================================
--- dists/trunk/libdvdcss/debian/rules 2008-02-19 12:17:20 UTC (rev 166)
+++ dists/trunk/libdvdcss/debian/rules 2008-02-21 20:37:06 UTC (rev 167)
@@ -4,6 +4,8 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
common-install-impl::
More information about the Restricted-changes
mailing list