diff -Nru viewmol-2.4.1/debian/changelog viewmol-2.4.1/debian/changelog --- viewmol-2.4.1/debian/changelog 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/debian/changelog 2014-11-04 00:20:02.000000000 +0200 @@ -1,3 +1,16 @@ +viewmol (2.4.1-22) unstable; urgency=medium + + [ Graham Inggs ] + * Switch to source format 3.0 (quilt), debhelper 9 allowing quilt patches + to be applied before source/getmachine is executed. Closes: #763909 + * Drop build-depends on quilt and python-support. + * Unapply direct changes to source/getmachine, allow + 011_getmachine_HURD.diff to be applied instead. + * Drop debian/README.source and debian/source.lintian-overrides, + no longer necessary. + + -- Graham Inggs Tue, 04 Nov 2014 00:03:27 +0200 + viewmol (2.4.1-21) unstable; urgency=medium * Team upload. diff -Nru viewmol-2.4.1/debian/compat viewmol-2.4.1/debian/compat --- viewmol-2.4.1/debian/compat 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/debian/compat 2013-11-21 20:08:51.000000000 +0200 @@ -1 +1 @@ -5 +9 diff -Nru viewmol-2.4.1/debian/control viewmol-2.4.1/debian/control --- viewmol-2.4.1/debian/control 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/debian/control 2014-11-03 22:09:00.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Science Maintainers Uploaders: Drew Parsons -Build-Depends: debhelper (>= 5.0.37.2), quilt, libtiff5-dev, libpng-dev, zlib1g-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libmotif-dev, libxmu-dev, libxi-dev, libxext-dev, libxt-dev, libx11-dev, python-dev, python-support (>= 0.3) +Build-Depends: debhelper (>= 9), libtiff5-dev, libpng-dev, zlib1g-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libmotif-dev, libxmu-dev, libxi-dev, libxext-dev, libxt-dev, libx11-dev, python-dev Standards-Version: 3.9.4 Package: viewmol diff -Nru viewmol-2.4.1/debian/patches/series viewmol-2.4.1/debian/patches/series --- viewmol-2.4.1/debian/patches/series 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/debian/patches/series 2014-11-03 23:59:38.000000000 +0200 @@ -1,5 +1,5 @@ 010_build_scripts.diff -#011_getmachine_HURD.diff # already applied pre-quilt (to allow debian/rules clean to recognise HURD) +011_getmachine_HURD.diff 100_locale_exception.diff 110_desktop_app.diff 120_PyObject.diff diff -Nru viewmol-2.4.1/debian/README.source viewmol-2.4.1/debian/README.source --- viewmol-2.4.1/debian/README.source 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/debian/README.source 1970-01-01 02:00:00.000000000 +0200 @@ -1,83 +0,0 @@ -Debian patches which have not yet been applied upstream are handled using quilt -via (for convenience) the Debian X Strike Force's build system xsfbs. - -Patches are placed in debian/patches. - -See http://git.debian.org/?p=pkg-xorg/xsfbs.git;a=summary and -/usr/share/doc/quilt/README.source for more details. - - ------------------------------------------------------- -Quick Guide To Patching This Package For The Impatient ------------------------------------------------------- - -1. Make sure you have quilt installed -2. Unpack the package as usual with "dpkg-source -x" -3. Run the "patch" target in debian/rules -4. Create a new patch with "quilt new" (see quilt(1)) -5. Edit all the files you want to include in the patch with "quilt edit" - (see quilt(1)). -6. Write the patch with "quilt refresh" (see quilt(1)) -7. Run the "clean" target in debian/rules - -Alternatively, instead of using quilt directly, you can drop the patch in to -debian/patches and add the name of the patch to debian/patches/series. - ------------------------------------- -Guide To The X Strike Force Packages ------------------------------------- - -The X Strike Force team maintains X packages in git repositories on -git.debian.org in the pkg-xorg subdirectory. Most upstream packages -are actually maintained in git repositories as well, so they often -just need to be pulled into git.debian.org in a "upstream-*" branch. -Otherwise, the upstream sources are manually installed in the Debian -git repository. - -The .orig.tar.gz upstream source file could be generated using this -"upstream-*" branch in the Debian git repository but it is actually -copied from upstream tarballs directly. - -Due to X.org being highly modular, packaging all X.org applications -as their own independent packages would have created too many Debian -packages. For this reason, some X.org applications have been grouped -into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, -x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. -Most packages, including the X.org server itself and all libraries -and drivers are, however maintained independently. - -The Debian packaging is added by creating the "debian-*" git branch -which contains the aforementioned "upstream-*" branch plus the debian/ -repository files. -When a patch has to be applied to the Debian package, two solutions -are involved: -* If the patch is available in one of the upstream branches, it - may be git'cherry-picked into the Debian repository. In this - case, it appears directly in the .diff.gz. -* Otherwise, the patch is added to debian/patches/ which is managed - with quilt as documented in /usr/share/doc/quilt/README.source. - -quilt is actually invoked by the Debian X packaging through a larger -set of scripts called XSFBS. XSFBS brings some other X specific -features such as managing dependencies and conflicts due to the video -and input driver ABIs. -XSFBS itself is maintained in a separate repository at - git://git.debian.org/pkg-xorg/xsfbs.git -and it is pulled inside the other Debian X repositories when needed. - -The XSFBS patching system requires a build dependency on quilt. Also -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules -so that the XSFBS patching occurs before the actual build. So the -very first target of the build (likely the one running autoreconf) -should depend on $(STAMP_DIR)/patch. It should also not depend on -anything so that parallel builds are correctly supported (nothing -should probably run while patching is being done). And finally, the -clean target should depend on the xsfclean target so that patches -are unapplied on clean. - -When the upstream sources contain some DFSG-nonfree files, they are -listed in text files in debian/prune/ in the "debian-*" branch of -the Debian repository. XSFBS' scripts then take care of removing -these listed files during the build so as to generate a modified -DFSG-free .orig.tar.gz tarball. - diff -Nru viewmol-2.4.1/debian/rules viewmol-2.4.1/debian/rules --- viewmol-2.4.1/debian/rules 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/debian/rules 2014-11-03 22:06:17.000000000 +0200 @@ -7,13 +7,7 @@ DESTDIR=$(CURDIR)/debian/viewmol -patch: - dh_quilt_patch - -unpatch: - dh_quilt_unpatch - -configure: patch configure-stamp +configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. @@ -39,7 +33,6 @@ [ ! -f source/Makefile ] || $(MAKE) -C source clean # viewmol's make clean does not clean out the '$$(os)' directory, so do it here. -rm -r source/Linux source/.config.Linux - dh_quilt_unpatch dh_clean install: build diff -Nru viewmol-2.4.1/debian/source/format viewmol-2.4.1/debian/source/format --- viewmol-2.4.1/debian/source/format 1970-01-01 02:00:00.000000000 +0200 +++ viewmol-2.4.1/debian/source/format 2014-11-03 23:58:54.000000000 +0200 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru viewmol-2.4.1/debian/source.lintian-overrides viewmol-2.4.1/debian/source.lintian-overrides --- viewmol-2.4.1/debian/source.lintian-overrides 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/debian/source.lintian-overrides 1970-01-01 02:00:00.000000000 +0200 @@ -1,5 +0,0 @@ -# HURD patch 011_getmachine_HURD.diff from bug#534330 had to be pre-applied -# in order to allow the HURD to be recognised during debian/rules clean. -# This rule is run before patch by dpkg-buildpackage. -viewmol source: patch-system-but-direct-changes-in-diff source/getmachine - diff -Nru viewmol-2.4.1/source/getmachine viewmol-2.4.1/source/getmachine --- viewmol-2.4.1/source/getmachine 2014-11-04 00:20:52.000000000 +0200 +++ viewmol-2.4.1/source/getmachine 2004-08-29 17:04:09.000000000 +0200 @@ -388,32 +388,6 @@ echo 'LIBRARY=$(LIBTIFF) $(LIBPNG) -L$(LIBPYTHON)' >> makefile echo 'LIBS=-L/usr/local/BerkeleyDB.4.0/lib -L/usr/local/lib -l${PYTHONVERSION} -ltiff -lpng12 -lz -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXm -lXp -lXi -lXext -lXt -lX11 -lpthread -lm -lSM -lICE' >> makefile ;; - -# -# This is GNU. -# - GNU) dir="$os" - makedir - cat ../.config.$os > makefile - use_icc=`type icc 2> /dev/null` - if [ "$use_icc" = "" ] - then - findProcessor - echo 'COMPILER=gcc' >> makefile - echo "OPT=-O6 -mcpu=$processor -fomit-frame-pointer -ffast-math -malign-double" >> makefile - echo 'CFLAGS=-Wall -I/usr/X11R6/include -DLINUX -Wno-strict-aliasing' >> makefile - echo "LDFLAGS=$LINKFORSHARED" >> makefile - else - echo 'COMPILER=icc' >> makefile - echo 'OPT=-O2 -ipo' >> makefile - echo 'CFLAGS=-I/opt/intel/compiler50/ia32/include -I/usr/X11R6/include -DLINUX' >> makefile - echo "LDFLAGS=$LINKFORSHARED -ipo" >> makefile - fi - echo 'SCANDIR=' >> makefile - echo 'INCLUDE=$(TIFFINCLUDE) -I$(PNGINCLUDE) -I$(PYTHONINCLUDE)' >> makefile - echo 'LIBRARY=$(LIBTIFF) $(LIBPNG) -L$(LIBPYTHON)' >> makefile - echo 'LIBS=-L/usr/local/lib -l${PYTHONVERSION} -ltiff -lpng -lz -lGLU -lGL -L/usr/X11R6/lib -lXm -lXmu -lXp -lXi -lXext -lXt -lX11 -lpthread -lutil -ldl -lm' >> makefile - ;; # # This is a (not yet) known operating system. #