rev 8328 - in kde-extras/qtemu/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Sun Dec 23 13:24:15 UTC 2007 

Author: fabo
Date: 2007-12-23 13:24:15 +0000 (Sun, 23 Dec 2007)
New Revision: 8328

Added:
   kde-extras/qtemu/trunk/debian/patches/series
Removed:
   kde-extras/qtemu/trunk/debian/cmake.mk
Modified:
   kde-extras/qtemu/trunk/debian/changelog
   kde-extras/qtemu/trunk/debian/control
   kde-extras/qtemu/trunk/debian/patches/10_fix_install_path.diff
   kde-extras/qtemu/trunk/debian/rules
   kde-extras/qtemu/trunk/debian/watch
Log:
  * Refresh install path patch.
  * Update my e-mail address.
  * Remove qemu build dependency.
  * Bump Standards-Version to 3.7.3.
  * Use Homepage field.
  * Remove our cmake.mk. Merged in cdbs package.
  * Switch to quilt patch system.
  * Update url used in watch file. (Closes: #449960)
  * Add CMAKE_CXX_COMPILER:FILEPATH=g++ to workaround g++ path not properly
    set.


Modified: kde-extras/qtemu/trunk/debian/changelog
===================================================================
--- kde-extras/qtemu/trunk/debian/changelog	2007-12-22 15:25:57 UTC (rev 8327)
+++ kde-extras/qtemu/trunk/debian/changelog	2007-12-23 13:24:15 UTC (rev 8328)
@@ -1,12 +1,25 @@
-qtemu (1.0.4-3) UNRELEASED; urgency=low
+qtemu (1.0.5-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
 
-  * Architecture: amd64 i386 powerpc as qemu only exists there. 
+  [Mark Purcell]
+  * Architecture: amd64 i386 powerpc as qemu only exists there.
     - Helps buildserver.net
 
- -- Mark Purcell <msp at debian.org>  Sat, 18 Aug 2007 19:12:11 +0100
+  [Fathi Boudra]
+  * Refresh install path patch.
+  * Update my e-mail address.
+  * Remove qemu build dependency.
+  * Bump Standards-Version to 3.7.3.
+  * Use Homepage field.
+  * Remove our cmake.mk. Merged in cdbs package.
+  * Switch to quilt patch system.
+  * Update url used in watch file. (Closes: #449960)
+  * Add CMAKE_CXX_COMPILER:FILEPATH=g++ to workaround g++ path not properly
+    set.
 
+ -- Fathi Boudra <fabo at debian.org>  Sun, 23 Dec 2007 12:51:32 +0100
+
 qtemu (1.0.4-2) unstable; urgency=low
 
   * Build-Depend on qemu. This ensures that the package will not be built

Deleted: kde-extras/qtemu/trunk/debian/cmake.mk

Modified: kde-extras/qtemu/trunk/debian/control
===================================================================
--- kde-extras/qtemu/trunk/debian/control	2007-12-22 15:25:57 UTC (rev 8327)
+++ kde-extras/qtemu/trunk/debian/control	2007-12-23 13:24:15 UTC (rev 8328)
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), cmake, libqt4-dev, qemu
-Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 5), quilt, cmake, libqt4-dev
+Standards-Version: 3.7.3
+Homepage: http://qtemu.org
 
 Package: qtemu
 Architecture: amd64 i386 powerpc
@@ -14,5 +15,3 @@
  ability to run virtual operating systems on native systems. This way you can
  easily test a new operating system or try a Live CD on your system without any
  troubles and dangers.
- .
-  Homepage: http://qtemu.org

Modified: kde-extras/qtemu/trunk/debian/patches/10_fix_install_path.diff
===================================================================
--- kde-extras/qtemu/trunk/debian/patches/10_fix_install_path.diff	2007-12-22 15:25:57 UTC (rev 8327)
+++ kde-extras/qtemu/trunk/debian/patches/10_fix_install_path.diff	2007-12-23 13:24:15 UTC (rev 8328)
@@ -1,6 +1,5 @@
-diff -Nur qtemu-1.0.3/CMakeLists.txt qtemu-1.0.3.new/CMakeLists.txt
---- qtemu-1.0.3/CMakeLists.txt	2007-03-19 13:56:21.000000000 +0100
-+++ qtemu-1.0.3.new/CMakeLists.txt	2007-05-20 18:56:20.000000000 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -114,7 +114,7 @@
                     DEPENDS ${QM_FILES})
  
@@ -28,10 +27,9 @@
 +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/help/de/main.htm DESTINATION share/qtemu/help/de)
  
  INSTALL(TARGETS qtemu DESTINATION bin)
-diff -Nur qtemu-1.0.3/helpwindow.cpp qtemu-1.0.3.new/helpwindow.cpp
---- qtemu-1.0.3/helpwindow.cpp	2007-03-19 13:56:21.000000000 +0100
-+++ qtemu-1.0.3.new/helpwindow.cpp	2007-05-20 19:43:36.000000000 +0200
-@@ -75,6 +75,11 @@
+--- a/helpwindow.cpp
++++ b/helpwindow.cpp
+@@ -83,6 +83,11 @@
          testUrl = QUrl(QCoreApplication::applicationDirPath()+"/../help/" + locale + "/main.htm");
          if (QFile::exists(testUrl.toString()))
              return testUrl;
@@ -43,7 +41,7 @@
      }
  
      //check for case when qtemu executable is in same dir (windows)
-@@ -92,6 +97,11 @@
+@@ -100,6 +105,11 @@
      if (QFile::exists(testUrl.toString()))
          return testUrl;
  
@@ -55,9 +53,8 @@
      //qDebug(testUrl.toString().toLocal8Bit().constData());
      QMessageBox::critical(this, tr("Help not found"),
                                  tr("Help not found. It is probably not installed."));
-diff -Nur qtemu-1.0.3/main.cpp qtemu-1.0.3.new/main.cpp
---- qtemu-1.0.3/main.cpp	2007-03-19 13:56:21.000000000 +0100
-+++ qtemu-1.0.3.new/main.cpp	2007-05-20 20:01:14.000000000 +0200
+--- a/main.cpp
++++ b/main.cpp
 @@ -43,12 +43,13 @@
      path = QCoreApplication::applicationDirPath()+"/translations/qtemu_" + locale + ".qm";
      if (QFile::exists(path))

Added: kde-extras/qtemu/trunk/debian/patches/series
===================================================================
--- kde-extras/qtemu/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/qtemu/trunk/debian/patches/series	2007-12-23 13:24:15 UTC (rev 8328)
@@ -0,0 +1 @@
+10_fix_install_path.diff

Modified: kde-extras/qtemu/trunk/debian/rules
===================================================================
--- kde-extras/qtemu/trunk/debian/rules	2007-12-22 15:25:57 UTC (rev 8327)
+++ kde-extras/qtemu/trunk/debian/rules	2007-12-23 13:24:15 UTC (rev 8328)
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
-include debian/cmake.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_CXX_COMPILER:FILEPATH="g++" \
+						-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+						-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+						-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+

Modified: kde-extras/qtemu/trunk/debian/watch
===================================================================
--- kde-extras/qtemu/trunk/debian/watch	2007-12-22 15:25:57 UTC (rev 8327)
+++ kde-extras/qtemu/trunk/debian/watch	2007-12-23 13:24:15 UTC (rev 8328)
@@ -1,2 +1,3 @@
 version=3
-http://downloads.sourceforge.net/qtemu/qtemu-(.*)\.tar\.bz2
+http://sf.net/qtemu/qtemu-(.*)\.tar\.bz2
+

More information about the pkg-kde-commits mailing list