[SCM] xvidcore packaging branch, master, updated. upstream/1.2.2-16-g5c1e21e

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Tue Jun 30 11:29:39 UTC 2009


The following commit has been merged in the master branch:
commit 5c1e21e327b04d86140e8ffa31bae3f435110b81
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Jun 26 09:00:00 2009 +0200

    Imported Debian patch 1.2.2+debian-0fab5

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 93b20fd..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,3 +0,0 @@
-Upstream package was repacked:
-  * remove upstream debian directory
-  * change directory name xvidcore to xvidcore-$(UPSTREAM_VERSION).
diff --git a/debian/changelog b/debian/changelog
index 3c7af4e..93ae867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,49 @@
-xvidcore (1.2.2-1) unstable; urgency=low
-
-  [ Loïc Martin ]
-  
-  * Initial release (Closes: #531040)
-
-  [ Reinhard Tartler ]
-
-  * loosen the strict dependencies that dh_makeshlibs creates
-  * add symbols file
-  * cleanups in debian/rules
-  * move get-orig-source target to the bottom of debian/rules
-  * prefer multiline fields in debian/control
-  * add myself to uploaders
-  * remove references to not existing packages
-  * update config.sub & config.guess during build
-  * bump debhelper compat level to 7
-  * add more files to debian/clean
-
- -- Reinhard Tartler <siretart at tauware.de>  Mon, 22 Jun 2009 22:04:00 +0200
+xvidcore (1.2.2+debian-0fab5) unstable; urgency=low
+
+  * debian/copyright: Finished.
+
+ -- Fabian Greffrath <fabian at greffrath.com>  Fri, 26 Jun 2009 09:00:00 +0200
+
+xvidcore (1.2.2+debian-0fab4) unstable; urgency=low
+
+  * debian/control: Prefer yasm (>= 0.8) over nasm (>= 2.0).
+  * debian/copyright: Simplified.
+
+ -- Fabian Greffrath <fabian at greffrath.com>  Thu, 25 Jun 2009 11:00:00 +0200
+
+xvidcore (1.2.2+debian-0fab3) unstable; urgency=low
+
+  * debian/control, debian/rules: Ported from debhelper (>= 7.2) to cdbs.
+  * debian/control: Wrapped Build-Depends and Depends fields.
+  * debian/control: Removed Build-Depends on quilt.
+  * debian/patches/: Removed.
+
+ -- Fabian Greffrath <fabian at greffrath.com>  Wed, 24 Jun 2009 16:30:00 +0200
+
+xvidcore (1.2.2+debian-0fab2) unstable; urgency=low
+
+  * debian/control: Bumped Build-Depends to debhelper (>= 7.2).
+  * debian/control: Adjusted Build-Depends on nasm and yasm.
+  * debian/copyright: Improved based on an approach by
+    Loïc Martin <loic.martin3 at gmail.com>.
+  * debian/libxvidcore4.symbols: Added.
+  * debian/rules: Added reasonable defaults to CFLAGS.
+  * debian/rules: Added execute permissions to the configure script
+    after the patch rule instead of before the configure rule.
+  * debian/watch: Added.
+
+ -- Fabian Greffrath <fabian at greffrath.com>  Wed, 24 Jun 2009 15:00:00 +0200
+
+xvidcore (1.2.2+debian-0fab1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fabian Greffrath <fabian at greffrath.com>  Tue, 02 Jun 2009 00:00:00 +0200
+
+xvidcore (1.2.1+debian-0fab1) unstable; urgency=low
+
+  * Initial release.
+  * Rebuilt upstream tarball without debian/ directory.
+  * Patched a build environment into the top level source directory.
+
+ -- Fabian Greffrath <fabian at greffrath.com>  Mon, 01 Jun 2009 00:00:00 +0200
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index b174022..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,5 +0,0 @@
-config.sub
-config.guess
-config.status
-config.log
-platform.inc
diff --git a/debian/control b/debian/control
index c07b7a3..7eed0d8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,42 +1,39 @@
 Source: xvidcore
 Section: libs
 Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Loïc Martin <loic.martin3 at gmail.com>,
-           Reinhard Tartler <siretart at tauware.de>,
-           Fabian Greffrath <fabian at debian-unofficial.org>
-Standards-Version: 3.8.1
+Maintainer: Fabian Greffrath <fabian at greffrath.com>
 Build-Depends: autotools-dev,
+               cdbs,
                debhelper (>= 7),
-               nasm [i386 amd64]
+               yasm (>= 0.8) [i386 amd64] | nasm (>= 2.0) [i386 amd64]
+Standards-Version: 3.8.1
+Homepage: http://www.xvid.org/
 
 Package: libxvidcore4
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: High quality ISO MPEG4 ASP codec library
- Xvid is a high quality/performance ISO MPEG4-ASP codec. It can be used to
- decode or encode video.
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: An open source MPEG-4 video codec (library)
+ Xvid (formerly XviD) is an open source MPEG-4 video codec, implementing MPEG-4
+ Simple Profile, Advanced Simple Profile, and Advanced Video Coding standards.
+ It is written in C with assembler optimizations for quality and speed
+ (including MMX, SSE, and 3Dnow! code for i386 and AltiVec for PowerPC), and is
+ especially optimized towards offline, multi-pass compression for storage and
+ archival purposes.
  .
- In encoding mode, it compresses video by removing information that is not
- important for human perception. This results in a reduced file size for the
- video, while maintaining good visual quality. For example, while uncompressed
- digital video at PAL resolution would weigh as much as 100 GB per hour, the 
- same video would only require 500MB when encoded with Xvid at decent quality
- settings.
+ This package contains the shared library.
 
-Package: libxvidcore4-dev
-Architecture: any
-Depends: libxvidcore4 (= ${binary:Version})
+Package: libxvidcore-dev
 Section: libdevel
-Description: High quality ISO MPEG4 ASP codec library - development files
- Xvid is a high quality/performance ISO MPEG4-ASP codec. It can be used to
- decode or encode video.
- .
- In encoding mode, it compresses video by removing information that is not
- important for human perception. This results in a reduced file size for the
- video, while maintaining good visual quality. For example, while uncompressed
- digital video at PAL resolution would weigh as much as 100 GB per hour, the 
- same video would only require 500MB when encoded with Xvid at decent quality
- settings.
- .
- This package provides development files for Xvid.
+Architecture: any
+Depends: libxvidcore4 (= ${binary:Version}),
+         ${misc:Depends}
+Description: An open source MPEG-4 video codec (development)
+ Xvid (formerly XviD) is an open source MPEG-4 video codec, implementing MPEG-4
+ Simple Profile, Advanced Simple Profile, and Advanced Video Coding standards.
+ It is written in C with assembler optimizations for quality and speed
+ (including MMX, SSE, and 3Dnow! code for i386 and AltiVec for PowerPC), and is
+ especially optimized towards offline, multi-pass compression for storage and
+ archival purposes.
+  .
+ This package contains the development files.
diff --git a/debian/copyright b/debian/copyright
index bf05279..c19ba09 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,571 +1,182 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=440
-Upstream-Name: xvidcore
-Upstream-Maintainer: Michael Militzer <michael at xvid.org>
-Upstream-Source: http://www.xvid.org/
-
-Files: src/decoder.c
-Copyright: Copyright 2002, MinChen <chenm001 at 163.com>
-Copyright: Copyright 2002-2004, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/decoder.h
-Copyright: Copyright 2002-2004, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/encoder.c
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002, Daniel Smith <danielsmith at astroboymail.com>
-License: GPL-2+
-
-Files: src/encoder.h
-Copyright: Copyright 2002-2003, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/global.h
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/nasm.inc
-Copyright: Copyright 2008, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/portab.h
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/{xvid.c,xvid.h}
-Copyright: Copyright 2001-2004, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/bitstream/bitsream.c
-Copyright 2002-2003, Peter Ross <pross at xvid.org>
-Copyright 2003, Cristoph Lampert <gruel at web.de>
-License: GPL-2+
-
-Files: src/bitstream/bitstream.h
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/bitstream/{cbp.c,cbp.h}
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-Copyright 2003, Cristoph Lampert <gruel at web.de>
-License: GPL-2+
-
-Files: src/bitstream/{mbcoding.c,mbcoding.h,vlc_codes.h}
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/bitstream/zigzag.h
-Copyright: Copyright 2001-2002, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/bitstream/x86_asm/cbp_mmx.asm
-Copyright: Copyright 2005, Carlo Bramini <carlo.bramix at libero.it>
-Copyright: Copyright 2002-2003, Pascal Massimino <skal at planet-d.net>
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/bitstream/x86_asm/cbp_sse2.asm
-Copyright: Copyright 2002, Daniel Smith <danielsmith at astroboymail.com>
-Copyright: Copyright 2002-2003, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/dct/{fdct.c,idct.c}
-Copyright: Copyright 1991-1998, Thomas G. Lane
-License: GPL-2+ | other
-License: other
-  The authors make NO WARRANTY or representation, either express or implied,
-  with respect to this software, its quality, accuracy, merchantability, or
-  fitness for a particular purpose.  This software is provided "AS IS", and you,
-  its user, assume the entire risk as to its quality and accuracy.
-
-  This software is copyright (C) 1991-1998, Thomas G. Lane.
-  All Rights Reserved except as specified below.
-
-  Permission is hereby granted to use, copy, modify, and distribute this
-  software (or portions thereof) for any purpose, without fee, subject to these
-  conditions:
-  (1) If any part of the source code for this software is distributed, then this
-  README file must be included, with this copyright and no-warranty notice
-  unaltered; and any additions, deletions, or changes to the original files
-  must be clearly indicated in accompanying documentation.
-  (2) If only executable code is distributed, then the accompanying
-  documentation must state that "this software is based in part on the work of
-  the Independent JPEG Group".
-  (3) Permission for use of this software is granted only if the user accepts
-  full responsibility for any undesirable consequences; the authors accept
-  NO LIABILITY for damages of any kind.
-
-  These conditions apply to any software derived from or based on the IJG code,
-  not just to the unmodified library.  If you use our work, you ought to
-  acknowledge us.
-
-  Permission is NOT granted for the use of any IJG author's name or company name
-  in advertising or publicity relating to this software or products derived from
-  it.  This software may be referred to only as "the Independent JPEG Group's
-  software".
-
-  We specifically permit and encourage the use of this software as the basis of
-  commercial products, provided that all warranty or liability claims are
-  assumed by the product vendor.
-
-  ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-  sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-  ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-  by the usual distribution terms of the Free Software Foundation; principally,
-  that you must include source code if you redistribute it.  (See the file
-  ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
-  of any program generated from the IJG code, this does not limit you more than
-  the foregoing paragraphs do.
-
-  The Unix configuration script "configure" was produced with GNU Autoconf.
-  It is copyright by the Free Software Foundation but is freely distributable.
-  The same holds for its supporting scripts (config.guess, config.sub,
-  ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
-  by M.I.T. but is also freely distributable.
-
-  It appears that the arithmetic coding option of the JPEG spec is covered by
-  patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
-  legally be used without obtaining one or more licenses.  For this reason,
-  support for arithmetic coding has been removed from the free JPEG software.
-  (Since arithmetic coding provides only a marginal gain over the unpatented
-  Huffman mode, it is unlikely that very many implementations will support it.)
-  So far as we are aware, there are no patent restrictions on the remaining
-  code.
-
-  The IJG distribution formerly included code to read and write GIF files.
-  To avoid entanglement with the Unisys LZW patent, GIF reading support has
-  been removed altogether, and the GIF writer has been simplified to produce
-  "uncompressed GIFs".  This technique does not use the LZW algorithm; the
-  resulting GIF files are larger than usual, but are readable by all standard
-  GIF decoders.
-
-  We are required to state that
-      "The Graphics Interchange Format(c) is the Copyright property of
-      CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-      CompuServe Incorporated."
-
-Files: src/dct/fdct.h
-Copyright: Copyright 2001-2002, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/dct/idct.h
-Copyright: Copyright 2001-2003, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/dct/simple_idct.c
-Copyright: Copyright 2001, Michael Niedermayer <michaelni at gmx.at>
-License: GPL-2+
-
-Files: src/dct/ia64_asm/fdct_ia64.s
-Copyright: Copyright 1999, Intel Corporation
-Copyright: Copyright 2002, Stephan Krause
-Copyright: Copyright 2002, Ingo-Marc Weber
-Copyright: Copyright 2002, Daniel Kallfass
-License: GPL-2+
-
-Files: src/dct/ia64_asm/genidct.py
-Copyright: Copyright 2002, Christian Schwarz <schwarz at ira.uka.de>
-Copyright: Copyright 2002, Haiko Gaisser <haiko at gaisser.de>
-Copyright: Copyright 2002, Sebastian Hack <mail at s-hack.de>
-License: GPL-2+
-
-Files: src/dct/ppc_asm/idct_altivec.c
-Copyright: Copyright 2001, Michel Lespinasse
-License: GPL-2+
-
-Files: src/dct/x86_asm/fdct_mmx_ffmpeg.asm
-Copyright: Copyright 2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/dct/x86_asm/fdct_mmx_skal.asm
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/dct/x86_asm/fdct_sse2_skal.asm
-Copyright: Copyright 2003, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/dct/x86_asm/idct_3dne.asm
-Copyright: Copyright 2001, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002, Jaan Kalda
-License: GPL-2+
-
-Files: src/dct/x86_asm/idct_mmx.asm
-Copyright: Copyright 2001, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/dct/x86_asm/idct_sse2_dmitry.asm
-Copyright: Copyright 2002, Dmitry Rozhdestvensky
-License: GPL-2+
-
-Files: src/image/{colorspace.c,colorspace.h}
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/image/{font.c,font.h}
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/image/{image.c,image.h}
-Copyright: Copyright 2001-2004, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/image/{interpolate8x8.c,interpolate8x8.h}
-Copyright: Copyright 2001-2004, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/image/postprocessing.c
-Copyright: Copyright 2003-2004, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2004, Marc Fauconneau
-License: GPL-2+
-
-Files: src/image/postprocessing.h
-Copyright: Copyright 2003, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/image/{qpel.c,qpel.h}
-Copyright: Copyright 2003, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/image/{reduced.c,reduced.h}
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/image/ia64_asm/interpolate8x8_ia64_exact.s
-Copyright: Copyright 2002, Kai Kühn
-Copyright: Copyright 2002, Alexander Viehl
-License: GPL-2+
-
-Files: src/image/ppc_asm/*
-Copyright: Copyright 2004, Christoph Naegeli <chn at kbw.ch>
-License: GPL-2+
-
-Files: src/image/x86_asm/colorspace_rgb_mmx.asm
-Copyright: Copyright 2002-2008, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/image/x86_asm/colorspace_yuv_mmx.asm
-Copyright: Copyright 2001-2008, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/image/x86_asm/colorspace_yuyv_mmx.asm
-Copyright: Copyright 2002, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/image/x86_asm/{deintl_sse.asm,gmc_mmx.asm}
-Copyright: Copyright 2006, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/image/x86_asm/interpolate8x8_3dn.asm
-Copyright: Copyright 2001, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002-2008, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/image/x86_asm/interpolate8x8_3dne.asm
-Copyright: Copyright 2002, Jaan Kalda
-License: GPL-2+
-
-Files: src/image/x86_asm/interpolate8x8_mmx.asm
-Copyright: Copyright 2001, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002-2008, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/image/x86_asm/interpolate8x8_xmm.asm
-Copyright: Copyright 2002-2008, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/image/x86_asm/postprocessing_mmx.asm
-Copyright: Copyright 2004, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/image/x86_asm/postprocessing_sse2.asm
-Copyright: Copyright 2004, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2004, Dcoder <dcoder at alexandria.cc>
-License: GPL-2+
-
-Files: src/image/x86_asm/{qpel_mmx.asm,reduced_mmx.asm}
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/motion/{estimation.h,estimation_bvop.c,estimation_common.c,estimation_pvop.c,motion_inlines.h}
-Copyright: Copyright 2002, Christoph Lampert <gruel at web.de>
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002-2003, Radoslaw Czyz <xvid at syskin.cjb.net>
-License: GPL-2+
-
-Files: src/motion/estimation_gmc.c
-Copyright: Copyright 2003, Christoph Lampert <gruel at web.de>
-License: GPL-2+
-
-Files: src/motion/estimation_rd_based_bvop.c
-Copyright: Copyright 2003, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2003, Radoslaw Czyz <xvid at syskin.cjb.net>
-License: GPL-2+
-
-Files: src/motion/estimation_rd_based.c
-Copyright: Copyright 2004, Radoslaw Czyz <xvid at syskin.cjb.net>
-License: GPL-2+
-
-Files: src/motion/gmc.c
-Copyright: Copyright 2002-2003, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/motion/gmc.h
-Copyright: Copyright 2002-2003, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/motion/motion_comp.c
-Copyright: Copyright 2002, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2003, Christoph Lampert <gruel at web.de>
-License: GPL-2+
-
-Files: src/motion/motion.h
-License: GPL-2+
-
-Files: src/motion/motion_smp.h
-Copyright: Copyright 2005, Radoslaw Czyz <xvid at syskin.cjb.net>
-License: GPL-2+
-
-Files: src/motion/{sad.c,sad.h}
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/motion/vop_type_decision.c
-Copyright: Copyright 2002-2003, Radoslaw Czyz <xvid at syskin.cjb.net>
-License: GPL-2+
-
-Files: src/motion/ia64_asm/halfpel8_refine_ia64.s
-Copyright: Copyright Johannes Singler <email at jsingler.de>
-Copyright: Copyright Daniel Winkler <infostudent at uni.de>
-
-Files: src/motion/ia64_asm/sad_ia64.s
-Copyright: Copyright Hannes Jütting <s_juetti at ira.uka.de>
-Copyright: Copyright Christopher Özbek <s_oezbek at ira.uka.de>
-License: GPL-2+
-
-Files: src/motion/ppc_asm/sad_altivec.c
-Copyright: Copyright 2002, Benjamin Herrenschmidt <benh at kernel.crashing.org>
-License: GPL-2+
-
-Files: src/motion/x86_asm/sad_3dn.asm
-Copyright: Copyright 2002, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/motion/x86_asm/sad_3dne.asm
-Copyright: Copyright 2002, Jaan Kalda
-License: GPL-2+
-
-Files: src/motion/x86_asm/sad_mmx.asm
-Copyright: Copyright 2001, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/motion/x86_asm/sad_sse2.asm
-Copyright: Copyright 2003, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/motion/x86_asm/sad_xmm.asm
-Copyright: Copyright 2001, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2001-2008, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/plugins/plugin_2pass1.c
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/plugins/plugin_2pass2.c
-Copyright: Copyright 2002, Foxer
-Copyright: Copyright 2002, Dirk Knop <dknop at gwdg.de>
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-Copyright: Copyright 2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/plugins/plugin_dump.c
-Copyright: Copyright 2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/plugins/plugin_lumimasking.c
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002, Christoph Lampert <gruel at web.de>
-License: GPL-2+
-
-Files: src/plugins/plugin_psnr.c
-Copyright: Copyright 2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/plugins/plugin_single.c
-Copyright: Copyright 2002-2004, Benjamin Lambert <foxer at hotmail.com>
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/plugins/plugin_ssim.c
-Copyright: Copyright 2005, Johannes Reinhardt <Johannes.Reinhardt at gmx.de>
-License: GPL-2+
-
-Files: src/plugins/plugin_ssim.h
-Copyright: Copyright 2005, Johannes Reinhardt <Johannes.Reinhardt at gmx.de>
-License: GPL-2+
-
-Files: src/plugins/x86_asm/plugin_ssim-a.asm
-Copyright: Copyright 2006, Johannes Reinhardt <Johannes.Reinhardt at gmx.de>
-License: GPL-2+
-
-Files: src/prediction/mbprediction.c
-Copyright: Copyright 2001-2003, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/prediction/mbprediction.h
-Copyright: Copyright 2001-2003, xvid team <xvid-devel at xvid.org>
-License: GPL-2+
-
-Files: src/quant/quant.h
-Copyright: Copyright 2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/quant/quant_h263.c, src/quant/quant_mpeg.c
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/quant/{quant_matrix.c,quant_matrix.h}
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/quant/ia64_asm/quant_h263_ia64.s
-Copyright: Copyright 2002, Christian Engel <christian.engel at ira.uka.de>
-Copyright: Copyright 2002, Hans-Joachim Daniels <hans-joachim.daniels at ira.uka.de>
-
-Files: src/quant/ppc_asm/quant_h263_altivec.c
-Copyright: Copyright 2004, Christoph Naegeli <chn at kbw.ch>
-License: GPL-2+
-
-Files: src/quant/ppc_asm/quant_mpeg_altivec.c
-Copyright: Copyright 2005, Christoph Naegeli <chn at kbw.ch>
-License: GPL-2+
-
-Files: src/quant/x86_asm/quantize_h263_3dne.asm
-Copyright: Copyright 2002-2003, Jaan Kalda
-License: GPL-2+
-
-Files: src/quant/x86_asm/quantize_h263_mmx.asm
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002-2003, Pascal Massimino <skal at planet-d.net>
-Copyright: Copyright 2004, Jean-Marc Bastide <jmtest at voila.fr>
-License: GPL-2+
-
-Files: src/quant/x86_asm/quantize_mpeg_mmx.asm
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002-2008, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002-2003, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/quant/x86_asm/quantize_mpeg_xmm.asm
-Copyright: Copyright 2002-2003, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2002, Jaan Kalda
-License: GPL-2+
-
-Files: src/utils/{emms.c,emms.h}
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/utils/mbfunctions.h
-Copyright: Copyright 2001, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/utils/mbtransquant.c
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2001-2003, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/utils/{mem_align.c,mem_align.h}
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/utils/{mem_transfer.c,mem_transfer.h}
-Copyright: Copyright 2001-2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
-
-Files: src/utils/{timer.c,timer.h}
-Copyright: Copyright 2002, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/utils/ia64_asm/mem_transfer_ia64.s
-Copyright: Copyright 2002, Sebastian Felis
-Copyright: Copyright 2002, Max Stengel
-License: GPL-2+
-
-Files: src/utils/ppc_asm/altivec_trigger.c
-Copyright: Copyright 2004, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/utils/ppc_asm/mem_transfer_altivec.c
-Copyright: Copyright 2004, Christoph Naegeli <chn at kbw.ch>
-License: GPL-2+
-
-Files: src/utils/x86_asm/cpuid.asm
-Copyright: Copyright 2001-2008, Michael Militzer <isibaar at xvid.org>
-License: GPL-2+
-
-Files: src/utils/x86_asm/interlacing_mmx.asm
-Copyright: Copyright 2002, Daniel Smith <danielsmith at astroboymail.com>
-License: GPL-2+
-
-Files: src/utils/x86_asm/mem_transfer_3dne.asm
-Copyright: Copyright 2002, Jaan Kalda
-License: GPL-2+
-
-Files: src/utils/x86_asm/mem_transfer_mmx.asm
-Copyright: Copyright 2001, Peter Ross <pross at xvid.org>
-Copyright: Copyright 2001-2008, Michael Militzer <isibaar at xvid.org>
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/examples/xvid_bench.c
-Copyright: Copyright 2002, Pascal Massimino <skal at planet-d.net>
-License: GPL-2+
-
-Files: src/examples/xvid_decraw.c
-Copyright: Copyright 2002-2003, Christoph Lampert <gruel at web.de>
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-License: GPL-2+
-
-Files: src/examples/xvid_encraw.c
-Copyright: Copyright 2002-2003, Christoph Lampert <gruel at web.de>
-Copyright: Copyright 2002-2003, Edouard Gomez <ed.gomez at free.fr>
-Copyright: Copyright 2003, Peter Ross <pross at xvid.org>
-License: GPL-2+
+Authors: Christoph Lampert <gruel at web.de>
+         Michael Militzer <isibaar at xvid.org>
+         Peter Ross <pross at xvid.org>
+         Edouard Gomez <ed.gomez at free.fr> (lot of "lot of things")
+         Radoslaw Czyz <xvid at syskin.cjb.net> (lot of ME work)
+         Pascal Massimino <skal at planet-d.net> (quite a lot of x86 assembly)
+         Benjamin Herrenschmidt <benh at kernel.crashing.org> (first ppc port attempt)
+         Christoph Kuehnel <info at intek-darmstadt.de> (field interlaced decoding)
+         Daniel Smith <danielsmith at astroboymail.com> (rc code)
+         Dirk Knop <dknop at stud.uni-goettingen.de> (vfw)
+         Guillaume Morin <guillaume at morinfr.org> (first ppc port attempt)
+         MinChen <chenm001 at 163.com> (lot of work on early CVS versions)
+         Christoph Nägeli <chn at kbw.ch> (new PPC port)
+Download: http://www.xvid.org/downloads.html
+
+Files: *
+Copyright: © 1999, Intel Corporation
+           © 2001-2008, Michael Militzer <isibaar at xvid.org>
+           © 2001-2004, Peter Ross <pross at xvid.org>
+           © 2001-2003, xvid team <xvid-devel at xvid.org>
+           © 2001, Michael Niedermayer <michaelni at gmx.at>
+           © 2001, Michel Lespinasse
+           © 2002-2003, Christoph Lampert <gruel at web.de>
+           © 2002-2004, Edouard Gomez <ed.gomez at free.fr>
+           © 2002-2003, Jaan Kalda
+           © 2002-2006, Pascal Massimino <skal at planet-d.net>
+           © 2002-2005, Radoslaw Czyz <xvid at syskin.cjb.net>
+           © 2002-2004, Benjamin Lambert <foxer at hotmail.com>
+           © 2002, Alexander Viehl
+           © 2002, Benjamin Herrenschmidt <benh at kernel.crashing.org>
+           © 2002, Christian Engel <christian.engel at ira.uka.de>
+           © 2002, Christian Schwarz <schwarz at ira.uka.de>
+           © 2002, Daniel Kallfass
+           © 2002, Daniel Smith <danielsmith at astroboymail.com>
+           © 2002, Dirk Knop <dknop at gwdg.de>
+           © 2002, Dmitry Rozhdestvensky
+           © 2002, Haiko Gaisser <haiko at gaisser.de>
+           © 2002, Hans-Joachim Daniels <hans-joachim.daniels at ira.uka.de>
+           © 2002, Ingo-Marc Weber
+           © 2002, Kai Kühn
+           © 2002, Max Stengel
+           © 2002, MinChen <chenm001 at 163.com>
+           © 2002, Sebastian Felis
+           © 2002, Sebastian Hack <mail at s-hack.de>
+           © 2002, Stephan Krause
+           © 2004-2005, Christoph Naegeli <chn at kbw.ch>
+           © 2004, Dcoder <dcoder at alexandria.cc>
+           © 2004, Jean-Marc Bastide <jmtest at voila.fr>
+           © 2004, Marc Fauconneau
+           © 2005, Carlo Bramini <carlo.bramix at libero.it>
+           © 2005-2006, Johannes Reinhardt <Johannes.Reinhardt at gmx.de>
+           © Christopher Özbek <s_oezbek at ira.uka.de>
+           © Daniel Winkler <infostudent at uni.de>
+           © Hannes Jütting <s_juetti at ira.uka.de>
+           © Johannes Singler <email at jsingler.de>
+License: GPL-2+
+
+Files: src/dct/fdct.c,
+       src/dct/idct.c
+Copyright: © 1991-1998, Thomas G. Lane
+           © 1996, MPEG Software Simulation Group
+License: GPL-2+ | Independent JPEG Group License | MPEG Software Simulation Group
 
 Files: debian/*
-Copyright: Copyright 2001, Christian Marillat <marillat at debian.org>
-Copyright: Copyright 2003, Edouard Gomez <ed.gomez at free.fr>
-Copyright: Copyright 2009, Loïc Martin <loic.martin3 at gmail.com>
-License: GPL-2+
-
-License: GPL-2+
-  This package is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
+Copyright: © 2001, Christian Marillat <marillat at debian.org>
+           © 2003, Edouard Gomez <ed.gomez at free.fr>
+           © 2005-2009, Fabian Greffrath <fabian at debian-unofficial.org>
+           © 2009, Loïc Martin <loic.martin3 at gmail.com>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
  On Debian systems, the complete text of the GNU General Public License
- can be found in the '/usr/share/common-licenses/GPL' file.
+ can be found in the '/usr/share/common-licenses/GPL-2' file.
+
+License: Independent JPEG Group License
+ The authors make NO WARRANTY or representation, either express or implied,
+ with respect to this software, its quality, accuracy, merchantability, or
+ fitness for a particular purpose.  This software is provided "AS IS", and you,
+ its user, assume the entire risk as to its quality and accuracy.
+ .
+ This software is copyright (C) 1991-1998, Thomas G. Lane.
+ All Rights Reserved except as specified below.
+ .
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software (or portions thereof) for any purpose, without fee, subject to these
+ conditions:
+ (1) If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no-warranty notice
+ unaltered; and any additions, deletions, or changes to the original files
+ must be clearly indicated in accompanying documentation.
+ (2) If only executable code is distributed, then the accompanying
+ documentation must state that "this software is based in part on the work of
+ the Independent JPEG Group".
+ (3) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences; the authors accept
+ NO LIABILITY for damages of any kind.
+ .
+ These conditions apply to any software derived from or based on the IJG code,
+ not just to the unmodified library.  If you use our work, you ought to
+ acknowledge us.
+ .
+ Permission is NOT granted for the use of any IJG author's name or company name
+ in advertising or publicity relating to this software or products derived from
+ it.  This software may be referred to only as "the Independent JPEG Group's
+ software".
+ .
+ We specifically permit and encourage the use of this software as the basis of
+ commercial products, provided that all warranty or liability claims are
+ assumed by the product vendor.
+ .
+ ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
+ sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
+ ansi2knr.c is NOT covered by the above copyright and conditions, but instead
+ by the usual distribution terms of the Free Software Foundation; principally,
+ that you must include source code if you redistribute it.  (See the file
+ ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
+ of any program generated from the IJG code, this does not limit you more than
+ the foregoing paragraphs do.
+ .
+ The Unix configuration script "configure" was produced with GNU Autoconf.
+ It is copyright by the Free Software Foundation but is freely distributable.
+ The same holds for its supporting scripts (config.guess, config.sub,
+ ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
+ by M.I.T. but is also freely distributable.
+ .
+ It appears that the arithmetic coding option of the JPEG spec is covered by
+ patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
+ legally be used without obtaining one or more licenses.  For this reason,
+ support for arithmetic coding has been removed from the free JPEG software.
+ (Since arithmetic coding provides only a marginal gain over the unpatented
+ Huffman mode, it is unlikely that very many implementations will support it.)
+ So far as we are aware, there are no patent restrictions on the remaining
+ code.
+ .
+ The IJG distribution formerly included code to read and write GIF files.
+ To avoid entanglement with the Unisys LZW patent, GIF reading support has
+ been removed altogether, and the GIF writer has been simplified to produce
+ "uncompressed GIFs".  This technique does not use the LZW algorithm; the
+ resulting GIF files are larger than usual, but are readable by all standard
+ GIF decoders.
+ .
+ We are required to state that
+     "The Graphics Interchange Format(c) is the Copyright property of
+     CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+     CompuServe Incorporated."
+
+License: MPEG Software Simulation Group
+ Disclaimer of Warranty
+ .
+ These software programs are available to the user without any license fee or
+ royalty on an "as is" basis.  The MPEG Software Simulation Group disclaims
+ any and all warranties, whether express, implied, or statuary, including any
+ implied warranties or merchantability or of fitness for a particular
+ purpose.  In no event shall the copyright-holder be liable for any
+ incidental, punitive, or consequential damages of any kind whatsoever
+ arising from the use of these programs.
+ .
+ This disclaimer of warranty extends to the user of these programs and user's
+ customers, employees, agents, transferees, successors, and assigns.
+ .
+ The MPEG Software Simulation Group does not represent or warrant that the
+ programs furnished hereunder are free of infringement of any third-party
+ patents.
+ .
+ Commercial implementations of MPEG-1 and MPEG-2 video, including shareware,
+ are subject to royalty fees to patent holders.  Many of these patents are
+ general enough such that they are unavoidable regardless of implementation
+ design.
diff --git a/debian/libxvidcore4-dev.dirs b/debian/libxvidcore-dev.install
similarity index 50%
rename from debian/libxvidcore4-dev.dirs
rename to debian/libxvidcore-dev.install
index 4418816..e7d1857 100644
--- a/debian/libxvidcore4-dev.dirs
+++ b/debian/libxvidcore-dev.install
@@ -1,2 +1,2 @@
-usr/lib
 usr/include
+usr/lib/*.a
diff --git a/debian/libxvidcore-dev.links b/debian/libxvidcore-dev.links
new file mode 100644
index 0000000..4421a3c
--- /dev/null
+++ b/debian/libxvidcore-dev.links
@@ -0,0 +1 @@
+/usr/lib/libxvidcore.so.4.2 /usr/lib/libxvidcore.so
diff --git a/debian/libxvidcore4-dev.install b/debian/libxvidcore4-dev.install
deleted file mode 100644
index acb01cb..0000000
--- a/debian/libxvidcore4-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/include/*.h
-debian/tmp/usr/lib/lib*.a
diff --git a/debian/libxvidcore4.dirs b/debian/libxvidcore4.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libxvidcore4.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libxvidcore4.install b/debian/libxvidcore4.install
index c45ebcf..093956b 100644
--- a/debian/libxvidcore4.install
+++ b/debian/libxvidcore4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*.so.*
diff --git a/debian/libxvidcore4.links b/debian/libxvidcore4.links
new file mode 100644
index 0000000..694a678
--- /dev/null
+++ b/debian/libxvidcore4.links
@@ -0,0 +1 @@
+/usr/lib/libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4
diff --git a/debian/libxvidcore4.symbols b/debian/libxvidcore4.symbols
index e0490ee..131d179 100644
--- a/debian/libxvidcore4.symbols
+++ b/debian/libxvidcore4.symbols
@@ -1,11 +1,11 @@
 libxvidcore.so.4 libxvidcore4 #MINVER#
- xvid_decore at Base 1.2.2-1
- xvid_encore at Base 1.2.2-1
- xvid_global at Base 1.2.2-1
- xvid_plugin_2pass1 at Base 1.2.2-1
- xvid_plugin_2pass2 at Base 1.2.2-1
- xvid_plugin_dump at Base 1.2.2-1
- xvid_plugin_lumimasking at Base 1.2.2-1
- xvid_plugin_psnr at Base 1.2.2-1
- xvid_plugin_single at Base 1.2.2-1
- xvid_plugin_ssim at Base 1.2.2-1
+ xvid_decore at Base 1.2.2
+ xvid_encore at Base 1.2.2
+ xvid_global at Base 1.2.2
+ xvid_plugin_2pass1 at Base 1.2.2
+ xvid_plugin_2pass2 at Base 1.2.2
+ xvid_plugin_dump at Base 1.2.2
+ xvid_plugin_lumimasking at Base 1.2.2
+ xvid_plugin_psnr at Base 1.2.2
+ xvid_plugin_single at Base 1.2.2
+ xvid_plugin_ssim at Base 1.2.2
diff --git a/debian/rules b/debian/rules
index 9a05345..2a52920 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,96 +1,10 @@
 #!/usr/bin/make -f
 
-unexport CFLAGS
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-VERSION=`ls $(CURDIR)/build/generic/=build/lib*.so.* | \
-	awk '{if (match($$0,/[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-MAJOR=`ls $(CURDIR)/build/generic/=build/lib*.so.* | \
-	awk '{if (match($$0,/[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}' | \
-	cut -d '.' -f 1`
-
-UPSTREAM_VERSION ?= $(shell cd $(CURDIR) && \
-	uscan --dehs | \
-	sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
-
-DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname)
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2 -fweb -ffast-math -funswitch-loops -fgcse-after-reload -fomit-frame-pointer
-endif
-
-confflags := --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cp -v /usr/share/misc/config.guess .
-	cp -v /usr/share/misc/config.sub .
-	CFLAGS="$(CFLAGS)" build/generic/configure $(confflags)
-	touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) -j 4 -C build/generic
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f build/generic/Makefile ] || $(MAKE) -C build/generic distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) -C build/generic install prefix=$(CURDIR)/debian/tmp/usr
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a AUTHORS
-	dh_installchangelogs -a
-	dh_install -a
-	dh_link -plibxvidcore$(MAJOR) usr/lib/libxvidcore.so.$(VERSION) usr/lib/libxvidcore.so.$(MAJOR)
-	dh_link -plibxvidcore$(MAJOR)-dev usr/lib/libxvidcore.so.$(VERSION) usr/lib/libxvidcore.so
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-get-orig-source:
-	cd $(DEBIAN_DIR)/.. && uscan --force-download
-	mkdir $(DEBIAN_DIR)/repack
-	tar -C $(DEBIAN_DIR)/repack -xzf $(DEBIAN_DIR)/../../xvidcore-$(UPSTREAM_VERSION).tar.gz \
-	&& rm $(DEBIAN_DIR)/../../xvidcore-$(UPSTREAM_VERSION).tar.gz $(DEBIAN_DIR)/../../xvidcore_$(UPSTREAM_VERSION).orig.tar.gz \
-	&& rm -rf $(DEBIAN_DIR)/repack/xvidcore/debian/
-	mv $(DEBIAN_DIR)/repack/xvidcore $(DEBIAN_DIR)/repack/xvidcore-$(UPSTREAM_VERSION)
-	tar -C $(DEBIAN_DIR)/repack -czf $(DEBIAN_DIR)/../../xvidcore_$(UPSTREAM_VERSION).orig.tar.gz xvidcore-$(UPSTREAM_VERSION)
-	rm -rf $(DEBIAN_DIR)/repack/
+DEB_SRCDIR := build/generic
+DEB_BUILDDIR := build/generic
 
+DEB_INSTALL_CHANGELOGS_ALL += ChangeLog
+DEB_INSTALL_DOCS_ALL += AUTHORS README TODO
diff --git a/debian/watch b/debian/watch
index b639ea2..74e50c7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-
+opts="dversionmangle=s/\+debian//" \
 http://www.xvid.org/downloads.html \
 http://downloads.xvid.org/downloads/xvidcore-([\d\.]*)\.tar\.gz

-- 
xvidcore packaging



More information about the pkg-multimedia-commits mailing list