[SCM] gpac/master: Revert "Move the header <gpac/configuration.h> into a brand-new [...]"

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f15992c3c124ed2b6a972707ad950c7321f6f0c4
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 23 03:51:36 2012 +0200

    Revert "Move the header <gpac/configuration.h> into a brand-new [...]"
    
    This reverts commit 3b951755a019d041e8cdd7c485f68018ffb2bf53.

diff --git a/debian/control b/debian/control
index 9b82c26..3272685 100644
--- a/debian/control
+++ b/debian/control
@@ -128,7 +128,6 @@ Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends:
- libgpac-configuration-dev (= ${binary:Version}),
  libgpac2 (= ${binary:Version}),
  ${misc:Depends}
 Replaces:
@@ -140,24 +139,3 @@ Description: GPAC Project on Advanced Content - development files
  technologies (graphics, animation and interactivity).
  .
  This package contains files that are used for application development.
-
-Package: libgpac-configuration-dev
-Architecture: any
-Section: libdevel
-Depends:
- libgpac2 (= ${binary:Version}),
- ${misc:Depends}
-Breaks:
- libgpac-dev (<< 0.4.5+svn4019~dfsg0-3~)
-Replaces:
- gpac (<= 0.4.2~rc2-0ubuntu1),
- libgpac-dev (<< 0.4.5+svn4019~dfsg0-3~)
-Multi-Arch: foreign
-Description: GPAC Project on Advanced Content - arch-specific development files
- GPAC stands for GPAC Project on Advanced Content (a recursive acronym). It is
- an Open Source multimedia framework for research and academic purposes. The
- project covers different aspects of multimedia, with a focus on presentation
- technologies (graphics, animation and interactivity).
- .
- This package contains architecture dependent files that are used for
- application development.
diff --git a/debian/libgpac-configuration-dev.install b/debian/libgpac-configuration-dev.install
deleted file mode 100644
index 7ed9093..0000000
--- a/debian/libgpac-configuration-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/gpac/configuration.h
diff --git a/debian/rules b/debian/rules
index 9b3dfc7..f57e3ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,11 +33,6 @@ override_dh_auto_install:
 	mv debian/tmp/usr/share/man/man1/mp4client.1 \
 		debian/tmp/usr/share/man/man1/MP4Client.1
 
-override_dh_install:
-	dh_install
-	# This header cannot be shared
-	rm debian/libgpac-dev/usr/include/gpac/configuration.h
-
 override_dh_clean:
 	dh_clean config.h bin/gcc/libgpac* include/gpac/version.h
 	find $(CURDIR) -name *.opic -delete

-- 
gpac packaging