rev 15126 - trunk/packages/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2009-07-05 14:42:58 +0000 (Sun, 05 Jul 2009)
New Revision: 15126

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/rules
Log:
Add comments on QTVERSION and CURRENTVERSION variables.
Comment PhononEpochOnly and try to build with epoch on source version.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-07-05 14:18:09 UTC (rev 15125)
+++ trunk/packages/qt4-x11/debian/changelog	2009-07-05 14:42:58 UTC (rev 15126)
@@ -1,4 +1,4 @@
-qt4-x11 (4.5.2-1) UNRELEASED; urgency=low
+qt4-x11 (4:4.5.2-1) UNRELEASED; urgency=low
 
   * New upstream release:
     - QtWebKit

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2009-07-05 14:18:09 UTC (rev 15125)
+++ trunk/packages/qt4-x11/debian/rules	2009-07-05 14:42:58 UTC (rev 15126)
@@ -7,7 +7,9 @@
 # workaround to use qhelpgenerator
 export QT_PLUGIN_PATH := $(QTDIR)/plugins
 
+# Qt upstream version (e.g.: 4.5.2)
 QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
+# Current debian version (e.g.: 4:4.5.2-1)
 CURRENTVERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -26,15 +28,16 @@
 DEB_MAKE_CLEAN_TARGET := confclean distclean
 
 # Add epoch to Phonon packages only
-DEB_DH_GENCONTROL_ARGS_libphonon4 := -- -v4:$(CURRENTVERSION)
-DEB_DH_GENCONTROL_ARGS_libphonon-dev := -- -v4:$(CURRENTVERSION)
-DEB_DH_GENCONTROL_ARGS_phonon-dbg := -- -v4:$(CURRENTVERSION)
-DEB_DH_GENCONTROL_ARGS_phonon := -- -v4:$(CURRENTVERSION)
+#DEB_DH_GENCONTROL_ARGS_libphonon4 := -- -v4:$(CURRENTVERSION)
+#DEB_DH_GENCONTROL_ARGS_libphonon-dev := -- -v4:$(CURRENTVERSION)
+#DEB_DH_GENCONTROL_ARGS_phonon-dbg := -- -v4:$(CURRENTVERSION)
+#DEB_DH_GENCONTROL_ARGS_phonon := -- -v4:$(CURRENTVERSION)
 
 # Shlibs of the current upstream version
 #DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 # Specific shlibs version
-SHLIBSVERSION := 4.5.2
+#SHLIBSVERSION := 4.5.2
+SHLIBSVERSION := 4:4.5.2
 $(foreach libpkg,$(filter-out %-dev %-dbg,$(filter lib%,$(DEB_ARCH_PACKAGES))),$(eval DEB_DH_MAKESHLIBS_ARGS_$(libpkg) := -V'$(libpkg) (>= $(SHLIBSVERSION))'))
 
 DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug