[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-33-g57adbeb

[Andres Mejia]

The following commit has been merged in the master branch:
commit 57adbeb3fd7a4fe754e29503c7d4d49f9505aff7
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 18 20:28:22 2008 -0400

    Don't use versioned plugin directory

diff --git a/debian/changelog b/debian/changelog
index d63d1c3..9b07fc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,7 @@ ogre-contrib (1.4.8-1) unstable; urgency=low
   * Updated patch.
   * Moved to git repository for packaging.
   * Added DM-Upload-Allowed: yes field.
-  * Install plugin in directory based on ogre version.
   * Using /usr/bin/update-ogre-plugins for updating plugins file.
-  * Need Replaces field for ogre-plugins-cgprogrammanager to replace a symlink.
 
  -- Andres Mejia <mcitadel at gmail.com>  Sun, 18 May 2008 00:03:56 -0400
 
diff --git a/debian/control b/debian/control
index e894aef..47a5399 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,12 @@ Vcs-Git: git://git.debian.org/git/pkg-games/ogre-contrib.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/ogre-contrib.git
 DM-Upload-Allowed: yes
 
-Package: ogre-plugins-cgprogrammanager-1.4.8
+Package: ogre-plugins-cgprogrammanager
 Section: contrib/libs
 Architecture: amd64 i386
 Depends: nvidia-cg-toolkit (>= 2.0), ${shlibs:Depends}
 Conflicts: ogre-plugins-cgmanager
-Replaces: ogre-plugins-cgmanager, ogre-plugins-cgprogrammanager
+Replaces: ogre-plugins-cgmanager
 Description: Ogre plugin: CgProgramManager
  Ogre is a complete object-oriented 3D rendering engine. It supports
  different rendering subsystems but only the OpenGL system is useful
@@ -23,7 +23,7 @@ Description: Ogre plugin: CgProgramManager
  .
  This package contains the CgProgramManager Ogre plugin.
 
-Package: ogre-plugins-cgprogrammanager-1.4.8-dbg
+Package: ogre-plugins-cgprogrammanager-dbg
 Section: contrib/libdevel
 Architecture: amd64 i386
 Priority: extra
diff --git a/debian/ogre-plugins-cgprogrammanager-VERSION.install b/debian/ogre-plugins-cgprogrammanager-VERSION.install
deleted file mode 100644
index dd194f7..0000000
--- a/debian/ogre-plugins-cgprogrammanager-VERSION.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/OGRE- at VERSION@/*.so
-usr/lib/OGRE- at VERSION@/*.la
-etc/OGRE/plugins- at VERSION@.cfg.cgprogrammanager
-etc/OGRE/plugins.cfg.cgprogrammanager
diff --git a/debian/ogre-plugins-cgprogrammanager.install b/debian/ogre-plugins-cgprogrammanager.install
new file mode 100644
index 0000000..21323d4
--- /dev/null
+++ b/debian/ogre-plugins-cgprogrammanager.install
@@ -0,0 +1,3 @@
+usr/lib/OGRE/*.so
+usr/lib/OGRE/*.la
+etc/OGRE/plugins.cfg.cgprogrammanager
diff --git a/debian/ogre-plugins-cgprogrammanager-VERSION.postinst b/debian/ogre-plugins-cgprogrammanager.postinst
similarity index 100%
rename from debian/ogre-plugins-cgprogrammanager-VERSION.postinst
rename to debian/ogre-plugins-cgprogrammanager.postinst
diff --git a/debian/ogre-plugins-cgprogrammanager-VERSION.postrm b/debian/ogre-plugins-cgprogrammanager.postrm
similarity index 100%
rename from debian/ogre-plugins-cgprogrammanager-VERSION.postrm
rename to debian/ogre-plugins-cgprogrammanager.postrm
diff --git a/debian/patches/series b/debian/patches/series
index 4f90860..440c8cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 autotools.diff
-change_pkglibdir_path.patch -p0
diff --git a/debian/plugins-VERSION.cfg.cgprogrammanager b/debian/plugins.cfg.cgprogrammanager
similarity index 100%
rename from debian/plugins-VERSION.cfg.cgprogrammanager
rename to debian/plugins.cfg.cgprogrammanager
diff --git a/debian/rules b/debian/rules
index 5329c89..23b0485 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Use this variable to set what version of ogre we're working with
-OGRE_VERSION=1.4.8
-
 # These are from the autotools-dev package documentation.
 # /usr/share/doc/autotools-dev/README.Debian.gz
 # from the section titled "Calling GNU configure properly"
@@ -43,27 +40,13 @@ OGRE_CONFIG_OPTIONS ?=  $(confflags) \
 		--disable-ogre-demos \
 		CXXFLAGS="$(DEB_CXXFLAGS)"
 
-build-setup: build-setup-stamp
-build-setup-stamp:
-	dh_testdir
-	cp -f debian/ogre-plugins-cgprogrammanager-VERSION.install \
-		debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install
-	cp -f debian/ogre-plugins-cgprogrammanager-VERSION.postinst \
-		debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postinst
-	cp -f debian/ogre-plugins-cgprogrammanager-VERSION.postrm \
-		debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postrm
-	cp -f debian/plugins-VERSION.cfg.cgprogrammanager \
-		debian/plugins-$(OGRE_VERSION).cfg.cgprogrammanager
-	sed -i 's/@VERSION@/$(OGRE_VERSION)/g' \
-		debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install
-
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch patch-stamp
 
-configure: build-setup patch configure-stamp
+configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 	# Modified bootstrapping from upstream, declares everything obsolete.
@@ -81,7 +64,7 @@ build-stamp:
 	$(MAKE)
 	touch build-stamp
 
-clean: clean-stamp unpatch reverse-build-setup
+clean: clean-stamp unpatch
 clean-stamp:
 	dh_testdir
 	dh_testroot
@@ -95,20 +78,15 @@ unpatch:
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -rf .pc/ patch-stamp
 
-reverse-build-setup:
-	dh_testdir
-	rm -f debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).install
-	rm -f debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postinst
-	rm -f debian/ogre-plugins-cgprogrammanager-$(OGRE_VERSION).postrm
-	rm -f debian/plugins-$(OGRE_VERSION).cfg.cgprogrammanager
-	rm -f build-setup-stamp
-
 install: build
 	dh_testdir 
 	dh_testroot
 	dh_clean -k
 	install -d debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	install -d debian/tmp/etc/OGRE
+	install -m 644 debian/plugins.cfg.cgprogrammanager \
+		debian/tmp/etc/OGRE/plugins.cfg.cgprogrammanager
 
 # Build architecture-independent files here.
 binary-indep:
@@ -118,15 +96,10 @@ binary-indep:
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	install -d debian/tmp/etc/OGRE
-	   install -m 644 debian/plugins-$(OGRE_VERSION).cfg.cgprogrammanager \
-	   debian/tmp/etc/OGRE/plugins-$(OGRE_VERSION).cfg.cgprogrammanager
-	ln -s plugins-$(OGRE_VERSION).cfg.cgprogrammanager \
-		debian/tmp/etc/OGRE/plugins.cfg.cgprogrammanager
 	dh_install --sourcedir=debian/tmp
 	dh_installchangelogs
 	dh_installdocs
-	dh_strip --dbg-package=ogre-plugins-cgprogrammanager-$(OGRE_VERSION)-dbg
+	dh_strip --dbg-package=ogre-plugins-cgprogrammanager-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs

-- 
Packaging for ogre-contrib