[Restricted-changes] r165 - in dists/trunk/libdvdcss/debian: . patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Mon Feb 18 21:14:31 UTC 2008
Author: fabian-guest
Date: 2008-02-18 21:14:29 +0000 (Mon, 18 Feb 2008)
New Revision: 165
Added:
dists/trunk/libdvdcss/debian/patches/01_debian-directory.patch
dists/trunk/libdvdcss/debian/patches/02_disable-docs.patch
Removed:
dists/trunk/libdvdcss/debian/patches/00list
dists/trunk/libdvdcss/debian/patches/01-debian-directory.dpatch
dists/trunk/libdvdcss/debian/patches/02-doc-subdir.dpatch
Modified:
dists/trunk/libdvdcss/debian/control
dists/trunk/libdvdcss/debian/rules
Log:
libdvdcss:
- no need to depend on dpatch for two simple patches
- build-depends on libtool instead of autotools-dev
Modified: dists/trunk/libdvdcss/debian/control
===================================================================
--- dists/trunk/libdvdcss/debian/control 2008-02-10 18:23:33 UTC (rev 164)
+++ dists/trunk/libdvdcss/debian/control 2008-02-18 21:14:29 UTC (rev 165)
@@ -6,10 +6,9 @@
Daniel Baumann <daniel at debian.org>
Origin: debian-unofficial.org
Bugs: mailto:restricted-devel at lists.alioth.debian.org
-Build-Depends: autotools-dev,
- cdbs,
+Build-Depends: cdbs,
debhelper (>= 5),
- dpatch
+ libtool
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/
Deleted: dists/trunk/libdvdcss/debian/patches/00list
===================================================================
--- dists/trunk/libdvdcss/debian/patches/00list 2008-02-10 18:23:33 UTC (rev 164)
+++ dists/trunk/libdvdcss/debian/patches/00list 2008-02-18 21:14:29 UTC (rev 165)
@@ -1,2 +0,0 @@
-01-debian-directory
-02-doc-subdir
Deleted: dists/trunk/libdvdcss/debian/patches/01-debian-directory.dpatch
===================================================================
--- dists/trunk/libdvdcss/debian/patches/01-debian-directory.dpatch 2008-02-10 18:23:33 UTC (rev 164)
+++ dists/trunk/libdvdcss/debian/patches/01-debian-directory.dpatch 2008-02-18 21:14:29 UTC (rev 165)
@@ -1,49 +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 libdvdcss-1.2.9+debian.orig/Makefile.am libdvdcss-1.2.9+debian/Makefile.am
---- libdvdcss-1.2.9+debian.orig/Makefile.am 2004-08-11 23:08:16.000000000 +0000
-+++ libdvdcss-1.2.9+debian/Makefile.am 2007-01-09 00:08:34.000000000 +0000
-@@ -1,5 +1,5 @@
- SUBDIRS = src test doc
--DIST_SUBDIRS = $(SUBDIRS) debian
-+DIST_SUBDIRS = $(SUBDIRS)
-
- EXTRA_DIST = libdvdcss.spec bootstrap
-
-diff -Naur libdvdcss-1.2.9+debian.orig/Makefile.in libdvdcss-1.2.9+debian/Makefile.in
---- libdvdcss-1.2.9+debian.orig/Makefile.in 2005-07-11 16:12:30.000000000 +0000
-+++ libdvdcss-1.2.9+debian/Makefile.in 2007-01-09 00:08:39.000000000 +0000
-@@ -192,7 +192,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- SUBDIRS = src test doc
--DIST_SUBDIRS = $(SUBDIRS) debian
-+DIST_SUBDIRS = $(SUBDIRS)
- EXTRA_DIST = libdvdcss.spec bootstrap
- AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
- all: config.h
-diff -Naur libdvdcss-1.2.9+debian.orig/configure libdvdcss-1.2.9+debian/configure
---- libdvdcss-1.2.9+debian.orig/configure 2005-07-11 16:12:23.000000000 +0000
-+++ libdvdcss-1.2.9+debian/configure 2007-01-09 00:08:20.000000000 +0000
-@@ -21497,7 +21497,7 @@
- fi
-
-
-- ac_config_files="$ac_config_files Makefile debian/Makefile doc/Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
-+ ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -22090,7 +22090,6 @@
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/dvdcss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dvdcss/Makefile" ;;
Added: dists/trunk/libdvdcss/debian/patches/01_debian-directory.patch
===================================================================
--- dists/trunk/libdvdcss/debian/patches/01_debian-directory.patch (rev 0)
+++ dists/trunk/libdvdcss/debian/patches/01_debian-directory.patch 2008-02-18 21:14:29 UTC (rev 165)
@@ -0,0 +1,42 @@
+diff -Nur libdvdcss-1.2.9/configure libdvdcss-1.2.9.new/configure
+--- libdvdcss-1.2.9/configure
++++ libdvdcss-1.2.9.new/configure
+@@ -21497,7 +21497,7 @@
+ fi
+
+
+- ac_config_files="$ac_config_files Makefile debian/Makefile doc/Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
++ ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -22090,7 +22090,6 @@
+ case "$ac_config_target" in
+ # Handling of arguments.
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/dvdcss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dvdcss/Makefile" ;;
+diff -Nur libdvdcss-1.2.9/Makefile.am libdvdcss-1.2.9.new/Makefile.am
+--- libdvdcss-1.2.9/Makefile.am
++++ libdvdcss-1.2.9.new/Makefile.am
+@@ -1,5 +1,5 @@
+ SUBDIRS = src test doc
+-DIST_SUBDIRS = $(SUBDIRS) debian
++DIST_SUBDIRS = $(SUBDIRS)
+
+ EXTRA_DIST = libdvdcss.spec bootstrap
+
+diff -Nur libdvdcss-1.2.9/Makefile.in libdvdcss-1.2.9.new/Makefile.in
+--- libdvdcss-1.2.9/Makefile.in
++++ libdvdcss-1.2.9.new/Makefile.in
+@@ -192,7 +192,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ SUBDIRS = src test doc
+-DIST_SUBDIRS = $(SUBDIRS) debian
++DIST_SUBDIRS = $(SUBDIRS)
+ EXTRA_DIST = libdvdcss.spec bootstrap
+ AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
+ all: config.h
Deleted: dists/trunk/libdvdcss/debian/patches/02-doc-subdir.dpatch
===================================================================
--- dists/trunk/libdvdcss/debian/patches/02-doc-subdir.dpatch 2008-02-10 18:23:33 UTC (rev 164)
+++ dists/trunk/libdvdcss/debian/patches/02-doc-subdir.dpatch 2008-02-18 21:14:29 UTC (rev 165)
@@ -1,48 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-doc-subdir.dpatch by Daniel Baumann <daniel at debian.org>
-##
-## DP: Disable creation of the documentation.
-
- at DPATCH@
-
-diff -Naru libdvdcss-1.2.9.orig/configure libdvdcss-1.2.9/configure
---- libdvdcss-1.2.9.orig/configure 2007-10-29 08:02:37.000000000 +0100
-+++ libdvdcss-1.2.9/configure 2007-10-29 08:04:26.000000000 +0100
-@@ -21497,7 +21497,7 @@
- fi
-
-
-- ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
-+ ac_config_files="$ac_config_files Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -22090,7 +22090,6 @@
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/dvdcss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dvdcss/Makefile" ;;
- "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-diff -Naur libdvdcss-1.2.9+debian.orig/Makefile.am libdvdcss-1.2.9+debian/Makefile.am
---- libdvdcss-1.2.9+debian.orig/Makefile.am 2007-01-09 00:14:57.000000000 +0000
-+++ libdvdcss-1.2.9+debian/Makefile.am 2007-01-09 00:15:10.000000000 +0000
-@@ -1,4 +1,4 @@
--SUBDIRS = src test doc
-+SUBDIRS = src test
- DIST_SUBDIRS = $(SUBDIRS)
-
- EXTRA_DIST = libdvdcss.spec bootstrap
-diff -Naur libdvdcss-1.2.9+debian.orig/Makefile.in libdvdcss-1.2.9+debian/Makefile.in
---- libdvdcss-1.2.9+debian.orig/Makefile.in 2007-01-09 00:14:57.000000000 +0000
-+++ libdvdcss-1.2.9+debian/Makefile.in 2007-01-09 00:15:16.000000000 +0000
-@@ -191,7 +191,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = src test doc
-+SUBDIRS = src test
- DIST_SUBDIRS = $(SUBDIRS)
- EXTRA_DIST = libdvdcss.spec bootstrap
- AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
Added: dists/trunk/libdvdcss/debian/patches/02_disable-docs.patch
===================================================================
--- dists/trunk/libdvdcss/debian/patches/02_disable-docs.patch (rev 0)
+++ dists/trunk/libdvdcss/debian/patches/02_disable-docs.patch 2008-02-18 21:14:29 UTC (rev 165)
@@ -0,0 +1,41 @@
+diff -Nur libdvdcss-1.2.9/configure libdvdcss-1.2.9.new/configure
+--- libdvdcss-1.2.9/configure
++++ libdvdcss-1.2.9.new/configure
+@@ -21497,7 +21497,7 @@
+ fi
+
+
+- ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
++ ac_config_files="$ac_config_files Makefile src/Makefile src/dvdcss/Makefile test/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -22090,7 +22090,6 @@
+ case "$ac_config_target" in
+ # Handling of arguments.
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/dvdcss/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dvdcss/Makefile" ;;
+ "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+diff -Nur libdvdcss-1.2.9/Makefile.am libdvdcss-1.2.9.new/Makefile.am
+--- libdvdcss-1.2.9/Makefile.am
++++ libdvdcss-1.2.9.new/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = src test doc
++SUBDIRS = src test
+ DIST_SUBDIRS = $(SUBDIRS)
+
+ EXTRA_DIST = libdvdcss.spec bootstrap
+diff -Nur libdvdcss-1.2.9/Makefile.in libdvdcss-1.2.9.new/Makefile.in
+--- libdvdcss-1.2.9/Makefile.in
++++ libdvdcss-1.2.9.new/Makefile.in
+@@ -191,7 +191,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = src test doc
++SUBDIRS = src test
+ DIST_SUBDIRS = $(SUBDIRS)
+ EXTRA_DIST = libdvdcss.spec bootstrap
+ AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
Modified: dists/trunk/libdvdcss/debian/rules
===================================================================
--- dists/trunk/libdvdcss/debian/rules 2008-02-10 18:23:33 UTC (rev 164)
+++ dists/trunk/libdvdcss/debian/rules 2008-02-18 21:14:29 UTC (rev 165)
@@ -2,7 +2,7 @@
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
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
More information about the Restricted-changes
mailing list