Author: tille
Date: 2012-12-13 11:50:12 +0000 (Thu, 13 Dec 2012)
New Revision: 12617

Added:
   trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch
   trunk/packages/ugene/trunk/debian/ugene-data.install
   trunk/packages/ugene/trunk/debian/ugene.install
Modified:
   trunk/packages/ugene/trunk/debian/changelog
   trunk/packages/ugene/trunk/debian/compat
   trunk/packages/ugene/trunk/debian/control
   trunk/packages/ugene/trunk/debian/patches/series
   trunk/packages/ugene/trunk/debian/rules
Log:
some initial work to get latest upstream packaged according to debian med 
policy rules


Modified: trunk/packages/ugene/trunk/debian/changelog
===================================================================
--- trunk/packages/ugene/trunk/debian/changelog 2012-12-13 07:54:26 UTC (rev 
12616)
+++ trunk/packages/ugene/trunk/debian/changelog 2012-12-13 11:50:12 UTC (rev 
12617)
@@ -1,3 +1,18 @@
+ugene (1.11.3+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version
+    Closes: #693655, #675298
+  * debian/control
+    - Standards-Version: 3.9.4 (no changes needed)
+    - Build-Depends: libxtst-dev
+    - Moved to non-free (and reported the issue upstream as
+       https://ugene.unipro.ru/tracker/browse/UGENE-1310
+      Closes: #694044
+  * debhelper 9 (control+compat)
+  * debian/rules: Rewritten to use short dh
+
+ -- Andreas Tille <[email protected]>  Tue, 11 Dec 2012 09:45:46 +0100
+
 ugene (1.9.8+repack-1) experimental; urgency=low
 
   * First release to Debian

Modified: trunk/packages/ugene/trunk/debian/compat
===================================================================
--- trunk/packages/ugene/trunk/debian/compat    2012-12-13 07:54:26 UTC (rev 
12616)
+++ trunk/packages/ugene/trunk/debian/compat    2012-12-13 11:50:12 UTC (rev 
12617)
@@ -1 +1 @@
-5
+9

Modified: trunk/packages/ugene/trunk/debian/control
===================================================================
--- trunk/packages/ugene/trunk/debian/control   2012-12-13 07:54:26 UTC (rev 
12616)
+++ trunk/packages/ugene/trunk/debian/control   2012-12-13 11:50:12 UTC (rev 
12617)
@@ -1,10 +1,13 @@
 Source: ugene
-Section: science
+Section: non-free/science
 Priority: optional
 Maintainer: Debian Med Packaging Team 
<[email protected]>
-Uploaders: Ivan Efremov <[email protected]>, Steffen Moeller 
<[email protected]>
-Build-Depends: libqt4-dev (>= 4.7.0), libqtwebkit-dev, libqt4-opengl-dev (>= 
4.7.0), zlib1g-dev, debhelper (>=5.0.38)
-Standards-Version: 3.9.2
+Uploaders: Ivan Efremov <[email protected]>,
+ Steffen Moeller <[email protected]>,
+ Andreas Tille <[email protected]>
+Build-Depends: libqt4-dev (>= 4.7.0), libqtwebkit-dev, libqt4-opengl-dev (>= 
4.7.0),
+ zlib1g-dev, debhelper (>= 9), libxtst-dev
+Standards-Version: 3.9.4
 Homepage: http://ugene.unipro.ru
 Vcs-svn: svn://svn.debian.org/debian-med/trunk/packages/ugene/trunk
 Vcs-browser: 
http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ugene/trunk/

Modified: trunk/packages/ugene/trunk/debian/patches/series
===================================================================
--- trunk/packages/ugene/trunk/debian/patches/series    2012-12-13 07:54:26 UTC 
(rev 12616)
+++ trunk/packages/ugene/trunk/debian/patches/series    2012-12-13 11:50:12 UTC 
(rev 12617)
@@ -1 +1,2 @@
 #do_not_strip.patch
+#use_debian_sqlite.patch

Added: trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch
===================================================================
--- trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch           
                (rev 0)
+++ trunk/packages/ugene/trunk/debian/patches/use_debian_sqlite.patch   
2012-12-13 11:50:12 UTC (rev 12617)
@@ -0,0 +1,25 @@
+Author: Andreas Tille <[email protected]>
+Description: Tried to use Debian packages sqlite3
+ but failed because package does not build that way
+
+--- a/ugene.pro
++++ b/ugene.pro
+@@ -8,7 +8,6 @@ use_bundled_zlib() {
+ 
+ SUBDIRS += \
+           src/libs_3rdparty/qscore \
+-          src/libs_3rdparty/sqlite3 \
+           src/libs_3rdparty/gtest \
+           src/libs_3rdparty/samtools \
+           src/corelibs/U2Core \
+--- a/src/corelibs/U2Core/U2Core.pri
++++ b/src/corelibs/U2Core/U2Core.pri
+@@ -17,8 +17,6 @@ use_bundled_zlib() {
+ LIBS += -L../../_release
+ LIBS += -lugenedb
+ 
+-INCLUDEPATH += ../../libs_3rdparty/sqlite3/src
+-
+ !debug_and_release|build_pass {
+ 
+     CONFIG(debug, debug|release) {

Modified: trunk/packages/ugene/trunk/debian/rules
===================================================================
--- trunk/packages/ugene/trunk/debian/rules     2012-12-13 07:54:26 UTC (rev 
12616)
+++ trunk/packages/ugene/trunk/debian/rules     2012-12-13 11:50:12 UTC (rev 
12617)
@@ -3,74 +3,37 @@
 export DH_OPTIONS
 
 UPSTREAM_NAME=ugene
-UPSTREAM_VERSION=$(shell uscan --dehs | sed -n 
's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
-UPSTREAM_FOLDER=$(UPSTREAM_NAME)-$(UPSTREAM_VERSION)
+pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 
-# Remark: The following uscan command requires devscripts > 2.12.4 which is not
-#         yet released at the time of this package release.  The code can be 
obtained
-#         via
-#   git clone git://[email protected]/git/users/tille/devscripts.git
-#         and then use scripts/uscan.pl
-get-orig-source:
-       mkdir -p ../tarballs
-       uscan --verbose --force-download --repack-compression xz --destdir 
../tarballs
+%:
+       dh $@
 
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp:
+override_dh_auto_configure:
        qmake-qt4 -r
        find . -name Makefile.* | xargs -r sed -i '/STRIP/d'
-       $(MAKE) 
-       touch $@
 
-build-indep: build-indep-stamp
-build-indep-stamp:
-       touch $@
+#override_dh_auto_build:
+#      $(MAKE)
 
-clean: 
-       dh_testdir
-       dh_testroot
-       rm -f build-arch-stamp build-indep-stamp
-       [ ! -f Makefile ] || $(MAKE) distclean
-       dh_clean
+override_dh_auto_clean:
+       dh_auto_clean
+       rm -rf src/_debug src/_release ugene
 
-install: install-indep install-arch
-install-indep:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -i
-       dh_install -i data /usr/share/ugene
+override_dh_auto_install:
+       dh_auto_install
+       # This should be default:
+       # $(MAKE) INSTALL_ROOT=$$(pwd)/debian/$(pkg) install
+       # Remove data dir which goes to ugene-data package
+       rm -rf debian/$(pkg)/usr/share/$(pkg)
 
-install-arch:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -s
-       dh_installdirs -s
+override_dh_shlibdeps:
+       export 
LD_LIBRARY_PATH=$$(pwd)/debian/$(pkg)/usr/lib/$(pkg):$$(pwd)/debian/$(pkg)/usr/lib64/$(pkg)
 && dh_shlibdeps
 
-       $(MAKE) INSTALL_ROOT=$$(pwd)/debian/ugene install
-       rm -rf debian/ugene/usr/share/ugene
-
-binary-common:
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs debian/changelog
-       dh_installdocs
-       dh_strip --dbg-package=ugene-dbg
-       dh_lintian
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       export 
LD_LIBRARY_PATH=$$(pwd)/debian/ugene/usr/lib/ugene:$$(pwd)/debian/ugene/usr/lib64/ugene
 && dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary-indep: build-indep install-indep
-       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-arch: build-arch install-arch
-       $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep 
install-arch
+# Remark: The following uscan command requires devscripts > 2.12.4 which is not
+#         yet released at the time of this package release.  The code can be 
obtained
+#         via
+#   git clone git://[email protected]/git/users/tille/devscripts.git
+#         and then use scripts/uscan.pl
+get-orig-source:
+       mkdir -p ../tarballs
+       uscan --verbose --force-download --repack-compression xz --destdir 
../tarballs

Added: trunk/packages/ugene/trunk/debian/ugene-data.install
===================================================================
--- trunk/packages/ugene/trunk/debian/ugene-data.install                        
        (rev 0)
+++ trunk/packages/ugene/trunk/debian/ugene-data.install        2012-12-13 
11:50:12 UTC (rev 12617)
@@ -0,0 +1 @@
+data /usr/share/ugene

Added: trunk/packages/ugene/trunk/debian/ugene.install
===================================================================
--- trunk/packages/ugene/trunk/debian/ugene.install                             
(rev 0)
+++ trunk/packages/ugene/trunk/debian/ugene.install     2012-12-13 11:50:12 UTC 
(rev 12617)
@@ -0,0 +1 @@
+src/_release/* usr/lib


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to