[Python-modules-commits] r8741 - in packages/sip4-qt3/trunk/debian (6 files)

shlomme at users.alioth.debian.org shlomme at users.alioth.debian.org
Sat Jun 6 18:37:31 UTC 2009


    Date: Saturday, June 6, 2009 @ 18:37:31
  Author: shlomme
Revision: 8741

Prepared for new upstream release

Added:
  packages/sip4-qt3/trunk/debian/sip4.docs
Modified:
  packages/sip4-qt3/trunk/debian/changelog
  packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch
  packages/sip4-qt3/trunk/debian/rules
  packages/sip4-qt3/trunk/debian/sip4.install
Deleted:
  packages/sip4-qt3/trunk/debian/pycompat

Modified: packages/sip4-qt3/trunk/debian/changelog
===================================================================
--- packages/sip4-qt3/trunk/debian/changelog	2009-06-06 16:27:37 UTC (rev 8740)
+++ packages/sip4-qt3/trunk/debian/changelog	2009-06-06 18:37:31 UTC (rev 8741)
@@ -1,12 +1,17 @@
-sip4-qt3 (4.7.9-3) unstable; urgency=low
+sip4-qt3 (4.8-1) unstable; urgency=low
 
+  [ Torsten Marek ]
+  * New upstream release
+  * Removed debian/pycompat, not needed anymore
+
+  [ Bernd Zeimetz ]
   * Fixing override disparity: Set 'debug' as sectiong for the -dbg package.
   * Bumping Standards-Version to 3.8.1, no changes needed.
   * Migrating to python-support.
   * Merging changes from Ubuntu to build for Python 2.6. We
-    don't use python-central stuff, though. 
+    don't use python-central stuff, though.
 
- -- Bernd Zeimetz <bzed at debian.org>  Tue, 28 Apr 2009 00:51:05 +0200
+ -- Torsten Marek <shlomme at debian.org>  Sat, 06 Jun 2009 20:11:47 +0200
 
 sip4-qt3 (4.7.9-2) unstable; urgency=low
 
@@ -16,7 +21,7 @@
  -- Bernd Zeimetz <bzed at debian.org>  Sun, 05 Apr 2009 20:52:40 +0200
 
 sip4-qt3 (4.7.9-1) experimental; urgency=low
-  
+
   [ Torsten Marek ]
   * New upstream release
 

Modified: packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch	2009-06-06 16:27:37 UTC (rev 8740)
+++ packages/sip4-qt3/trunk/debian/patches/01_configure.dpatch	2009-06-06 18:37:31 UTC (rev 8741)
@@ -5,10 +5,10 @@
 ## DP: for sip
 
 @DPATCH@
-diff -urNad sip4-qt3-4.7~/configure.py sip4-qt3-4.7/configure.py
---- sip4-qt3-4.7~/configure.py	2007-09-08 22:45:38.000000000 +0200
-+++ sip4-qt3-4.7/configure.py	2007-09-08 22:45:54.000000000 +0200
-@@ -20,6 +20,15 @@
+diff -urNad sip4-qt3-4.8~/configure.py sip4-qt3-4.8/configure.py
+--- sip4-qt3-4.8~/configure.py	2009-06-05 10:59:07.000000000 +0200
++++ sip4-qt3-4.8/configure.py	2009-06-06 20:21:45.000000000 +0200
+@@ -19,6 +19,15 @@
  
  import siputils
  
@@ -23,8 +23,8 @@
 +    return filename
  
  # Initialise the globals.
- sip_version = 0x040700
-@@ -282,8 +296,11 @@
+ sip_version = 0x040800
+@@ -238,8 +247,11 @@
      macros is the dictionary of platform specific build macros.
      """
      # Bootstrap.
@@ -37,7 +37,7 @@
      cfg = sipconfig.Configuration()
  
      cfg.set_build_macros(macros)
-@@ -293,7 +310,8 @@
+@@ -249,7 +261,8 @@
      sipconfig.ParentMakefile(
          configuration=cfg,
          subdirs=["sipgen", "siplib"],
@@ -47,23 +47,23 @@
      ).generate()
  
      sipconfig.inform("Creating sip code generator Makefile...")
-@@ -305,6 +323,7 @@
+@@ -261,6 +274,7 @@
          install_dir=os.path.dirname(cfg.sip_bin),
          console=1,
          warnings=0,
 +        topsrcdir=topsrcdir,
-         universal=opt_universal
+         universal=opts.universal
      ).generate()
  
-@@ -320,6 +339,7 @@
+@@ -276,6 +290,7 @@
          warnings=0,
-         static=opt_static,
-         debug=opt_debug,
-+        topsrcdir=topsrcdir,
-         universal=opt_universal
+         static=opts.static,
+         debug=opts.debug,
++         topsrcdir=topsrcdir,
+         universal=opts.universal
      )
  
-@@ -340,7 +360,7 @@
+@@ -356,7 +371,7 @@
      set_platform_directories()
  
      # Build up the list of valid specs.
@@ -71,17 +71,17 @@
 +    for s in os.listdir(srcPath("specs")):
          platform_specs.append(s)
  
-     # Handle the command line.
-@@ -385,7 +405,7 @@
-         opt_platform = default_platform
+     # Parse the command line.
+@@ -389,7 +404,7 @@
+         opts.universal = ''
  
      # Get the platform specific macros for building.
--    macros = siputils.parse_build_macros(os.path.join("specs", opt_platform), build_macro_names, args)
-+    macros = siputils.parse_build_macros(srcPath(os.path.join("specs", opt_platform)), build_macro_names, args)
+-    macros = siputils.parse_build_macros(os.path.join("specs", opts.platform),
++    macros = siputils.parse_build_macros(srcPath(os.path.join("specs", opts.platform)),
+             build_macro_names, args)
  
      if macros is None:
-         usage()
-@@ -394,7 +414,7 @@
+@@ -400,7 +415,7 @@
      inform_user()
  
      # Install the configuration module.

Deleted: packages/sip4-qt3/trunk/debian/pycompat
===================================================================
--- packages/sip4-qt3/trunk/debian/pycompat	2009-06-06 16:27:37 UTC (rev 8740)
+++ packages/sip4-qt3/trunk/debian/pycompat	2009-06-06 18:37:31 UTC (rev 8741)
@@ -1 +0,0 @@
-2

Modified: packages/sip4-qt3/trunk/debian/rules
===================================================================
--- packages/sip4-qt3/trunk/debian/rules	2009-06-06 16:27:37 UTC (rev 8740)
+++ packages/sip4-qt3/trunk/debian/rules	2009-06-06 18:37:31 UTC (rev 8741)
@@ -109,10 +109,6 @@
 	find debian/python-sip4-dbg ! -type d ! -name '*_d.so' | xargs rm -f
 	find debian/python-sip4-dbg -depth -empty -exec rmdir {} \;
 
-	install -d $(CURDIR)/debian/tmp/usr/share/doc/sip4/reference
-	for i in $(CURDIR)/doc/*; do \
-	  install -m 644 $$i $(CURDIR)/debian/tmp/usr/share/doc/sip4/reference; \
-	done
 	dh_install -a --sourcedir=$(CURDIR)/debian/tmp
 
 # Build architecture-independent files here.

Added: packages/sip4-qt3/trunk/debian/sip4.docs
===================================================================
--- packages/sip4-qt3/trunk/debian/sip4.docs	                        (rev 0)
+++ packages/sip4-qt3/trunk/debian/sip4.docs	2009-06-06 18:37:31 UTC (rev 8741)
@@ -0,0 +1,2 @@
+doc/html
+NEWS

Modified: packages/sip4-qt3/trunk/debian/sip4.install
===================================================================
--- packages/sip4-qt3/trunk/debian/sip4.install	2009-06-06 16:27:37 UTC (rev 8740)
+++ packages/sip4-qt3/trunk/debian/sip4.install	2009-06-06 18:37:31 UTC (rev 8741)
@@ -1,2 +1 @@
 usr/bin/*
-usr/share/doc/sip4/reference




More information about the Python-modules-commits mailing list