X Strike Force X.Org X11 SVN commit: r389 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-07-21 20:25:28 -0500 (Thu, 21 Jul 2005)
New Revision: 389
Added:
trunk/debian/patches/series
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/control
trunk/debian/rules
Log:
- Switch from dbs to quilt based on Eugene Konev's work
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-21 22:36:23 UTC (rev 388)
+++ trunk/debian/TODO 2005-07-22 01:25:28 UTC (rev 389)
@@ -10,10 +10,6 @@
* Update manifest-install-reconcile's data lists so the tool is usable again.
This implies getting valid, up-to-date MANIFEST files for every architecture.
-* Migrate source package to traditional .orig.tar.gz/.diff.gz layout, adopt
- quilt as the patch management system, commit all patches to trunk/xc, stop
- using dbs and drop the build-dependency on it.
-
* Prune the X.Org X11 tree before generating .orig.tar.gz:
+ xterm
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-07-21 22:36:23 UTC (rev 388)
+++ trunk/debian/changelog 2005-07-22 01:25:28 UTC (rev 389)
@@ -3,6 +3,7 @@
Changes by David Nusinow:
- Incorporate ELF loader patch for arm. Thanks Steve Langasek.
Closes: #319298
+ - Switch from dbs to quilt based on Eugene Konev's work
Changes by Eugene Konev:
- Do not impose selinux on the whole world out there: move selinux
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2005-07-21 22:36:23 UTC (rev 388)
+++ trunk/debian/control 2005-07-22 01:25:28 UTC (rev 389)
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
Standards-Version: 3.6.1
-Build-Depends: bison, bsdmainutils, flex, fontconfig, groff, tetex-bin, libexpat1-dev | libexpat-dev, libfreetype6-dev, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], libncurses5-dev | libncurses-dev, libselinux1-dev, libpam0g-dev | libpam-dev, libpng12-dev | libpng-dev, libxcursor-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), render-dev (>> 1:0.9), zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), lynx, po-debconf, dbs
+Build-Depends: bison, bsdmainutils, flex, fontconfig, groff, tetex-bin, libexpat1-dev | libexpat-dev, libfreetype6-dev, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], libncurses5-dev | libncurses-dev, libselinux1-dev, libpam0g-dev | libpam-dev, libpng12-dev | libpng-dev, libxcursor-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), render-dev (>> 1:0.9), zlib1g-dev | libz-dev, debhelper (>= 4.1.16), dpkg-dev (>= 1.10.14), lynx, po-debconf, quilt
Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1), linux-kernel-headers (<< 2.5.999-test7-bk-15) [sparc]
# Reasons for Build-Depends:
Added: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-07-21 22:36:23 UTC (rev 388)
+++ trunk/debian/patches/series 2005-07-22 01:25:28 UTC (rev 389)
@@ -0,0 +1,153 @@
+0000_backport_from_upstream.diff -p0
+000_backport_from_author_xterm.diff -p0
+000_stolen_from_drm.diff -p0
+000_stolen_from_HEAD_i810.diff -p0
+000_stolen_from_linuxwacom_wacom_driver.diff -p0
+000_stolen_from_Mesa_6.2_branch.diff -p0
+000_stolen_from_Mesa_6.2_branch_vb_cull.diff -p0
+000_stolen_from_unichrome.sf.net.diff -p0
+001_kernel_version_in_banner.diff -p0
+002a_xterm_no_overstrike_bold_fonts.diff -p0
+002_xdm_fixes.diff -p0
+003b_xfs_fixes.diff -p0
+003_linux.cf_and_xfree86.cf.diff -p0
+004_imake_manpage_handling_overhaul.diff -p0
+005_rgb.txt_in_etc_X11.diff -p0
+006_update_fonts_Imakefiles.diff -p0
+007_fix_xfree86_man_version_string.diff -p0
+008_fix_xgetpw_macro.diff -p0
+009_disable_Xprt.diff -p0
+010_donot_build_XpConfig.diff -p0
+011a_recognize_glibc_2.3.2_locale_names.diff -p0
+011_SECURITY_makedepend_safer.diff -p0
+012_Xaw_StripChart_fix.diff -p0
+013a_xkb_symbols_euro_support.diff -p0
+013_novtswitch.diff -p0
+014_startx_hostname_fix.diff -p0
+015_vesa_ifdef_afb_calls.diff -p0
+016_ICE_subprotocol_reply_fix.diff -p0
+017_fix_Xlib_depend_target.diff -p0
+018_sharevts_option.diff -p0
+019_iso8859-15_Compose_fix.diff -p0
+020_add_sigusr2_signal_handler.diff -p0
+021_riscpc_ioport_fix.diff -p0
+023_specs_doc_fixes.diff -p0
+024_ati_r128_and_radeon_enable_build_without_vgahw.diff -p0
+024d_radeon_fix_gcc4_build.diff -p0
+026_xc_programs_manpage_overhaul.diff -p0
+027_fix_weak_deps_in_libGL.diff -p0
+028_loader_speed_hack.diff -p0
+029_only_open_proc_bus_pci_devices_once.diff -p0
+030_libvgahw_gcc4_volatile_fix.diff -p0
+033_no_html.diff -p0
+035_tdfx_disable_dri_on_16mb_with_highres.diff -p0
+040_extend_netmouse_support.diff -p0
+041_make_xcursor_icondir_configurable.diff -p0
+043_ati_r128_update_chip_identification.diff -p0
+044_chips_default_to_noaccel_on_69k.diff -p0
+045_chips_default_to_swcursor_on_69k.diff -p0
+046_fix_cyrillic_font_aliases.diff -p0
+047_mga_manpage_updates.diff -p0
+048_via_driver_enable.diff -p0
+050_fix_lnx_io_kbd_rate_fix.diff -p0
+051_xkb_documentation_updates.diff -p0
+053_lnx_evdev.diff -p0
+054_lnx_evdev_mouse.diff -p0
+055_lnx_evdev_keyboard.diff -p0
+057_X11.tmpl_warning_fix.diff -p0
+058_support_external_Xcursor_Xft_Xrender_libs.diff -p0
+062_make_libGL_PIC_compliant.diff -p0
+063_fix_weak_deps.diff -p0
+065_Xft1_manpage_conflict.diff -p0
+067_fix_X11_and_xdm_build_problems.diff -p0
+068_fix_InstallAppDefFiles_screwage.diff -p0
+069_ati_r128_fix_ugly_warning.diff -p0
+070_fbdevhw_device_node_warnings.diff -p0
+072_Xserver_fb_convert_RGB_to_BGR.diff -p0
+073_xev_flush_standard_output.diff -p0
+075_elographics_improve_manpage.diff -p0
+076_xfree86_server_fix_aout_loader_include.diff -p0
+078_xdm_log_sourcing_better.diff -p0
+080_pci_isolate_device_feature.diff -p0
+081_xkb_fix_AB10_minus_underscore_on_hr.diff -p0
+082_xkb_AE12_apostrophe_on_pc_de_nodeadkeys.diff -p0
+083_siliconmotion_rotate_option_disables_randr.diff -p0
+084_xkb_implement_grp:sclk_toggle.diff -p0
+085_sessreg_implement_hostname_hashing.diff -p0
+086_fix_SEGV_in_ximcp.diff -p0
+089_xkb_fix_symbols_pc_lt.diff -p0
+090_xkb_fix_uk_macintosh_problems.diff -p0
+091_xkb_implement_compose:caps.diff -p0
+092_Xserver_sunffb_xaa_extension.diff -p0
+093_xkb_fix_macintosh_problems.diff -p0
+094_gbk_compound_text_transformation_fix.diff -p0
+095_fontutils_are_not_fonts.diff -p0
+097_mouse_zaxis_mapping_pushes_up_buttons.diff -p0
+098_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff -p0
+099a_improve_search_for_libXcursor.diff -p0
+099c_support_loadable_external_Xcursor_lib.diff -p0
+099e_xorgconf_manpage_overhaul.diff -p0
+099f_savage_driver_disable_randr_on_rotation.diff -p0
+099g_xkb_symbols_polish_fix_keypad_separator.diff -p0
+099h_mesa_tdfx_load_right_glide_library.diff -p0
+099j_xkb_new_layouts.diff -p0
+099k_Compose_fix_latin1_UTF8.diff -p0
+099l_xkb_cymotion_master_and_ibm_space_saver.diff -p0
+099m_mga_increase_minimum_pixel_clock.diff -p0
+099n_fbdev_driver_message_improvements.diff -p0
+099o_xkb_a4tech_kb21.diff -p0
+099p_xkb_brazilian_fix_keypad_separator.diff -p0
+099q_tdfx_improve_mode_rejection_diagnostics.diff -p0
+099r_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0
+099s_selinux_support.diff -p0
+099s_xkb_tr_fix_eacute.diff -p0
+099t_xkb_remove_hidden_attributes.diff -p0
+099u_mkdirhier_rewrite.diff -p0
+099v_fontserver_fix_SEGV.diff -p0
+099x_xdm_support_logfile_rotation.diff -p0
+099y_xkb_fix_rules_xfree86.diff -p0
+099za_fix_XOrgManDefs.diff -p0
+099z_xkb_level3_ralt_switch.diff -p0
+099zz_xkb_hr_fixes.diff -p0
+100_sparc_4m_hw_mult_fix.diff -p0
+101b_xkb_sun_loads_srvr_ctrl.diff -p0
+102_sparc_pci_fix.diff -p0
+103_sparc_dont_build_useless_drivers.diff -p0
+104_sparc_no_mv8_flag.diff -p0
+201_alpha_freetype_gcc_2.95_bugfix.diff -p0
+202_alpha_elfloader_support_R_ALPHA_SREL32.diff -p0
+203_alpha_elfloader_support_R_ALPHA_BRSGP.diff -p0
+250_m68k_build_scanpci.diff -p0
+300_riscpc_xkb_keycodes.diff -p0
+303_arm_cache_flush.diff -p0
+304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff -p0
+315_arm_is_not_x86_and_has_no_vga.diff -p0
+452_ia64_smart_pci_rom_probe.diff -p0
+500_s390_support.diff -p0
+600_amd64_support.diff -p0
+800_gnu_config.diff -p0
+803_gnu_xterm_openpty.diff -p0
+820_gnu-freebsd_config.diff -p0
+823_gnu-freebsd_xterm.diff -p0
+840_netbsd_bsdLib.rules_fix.diff -p0
+841_netbsd_imake.c_fixes.diff -p0
+842_netbsd_NetBSD.cf_fixes.diff -p0
+843_netbsd_no_shared_OldX_lib.diff -p0
+844_netbsd_no_kbd_mode_command.diff -p0
+900_debian_config.diff -p0
+902_debian_startx_manpage.diff -p0
+903_debian_system.twmrc.diff -p0
+904_debian_xinitrc.diff -p0
+905_debian_xdm.diff -p0
+906_debian_xfs.diff -p0
+907_debian_xterm.diff -p0
+908_debian_exclude_non-free_fonts_and_docs.diff -p0
+909_debian_piclib_support.diff -p0
+910_debian_Xserver_RTFF.diff -p0
+912_debian_rstart.real_location.diff -p0
+913_debian_remove_code_ref_to_object_code_files.diff -p0
+914_make_static_libs.diff -p0
+915_disable_i915_debugging.diff -p0
+989_ubuntu_add_extra_modelines_from_xorg.diff -p0
+990_ubuntu_accept_enabled_for_extensions.diff -p0
+991_ubuntu_gcc_flags.diff -p0
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-07-21 22:36:23 UTC (rev 388)
+++ trunk/debian/rules 2005-07-22 01:25:28 UTC (rev 389)
@@ -23,24 +23,11 @@
# debhelper
export DH_OPTIONS
-# Use the DBS archive/patch handling system.
-SCRIPT_DIR = /usr/share/dbs
-
-include $(SCRIPT_DIR)/dbs-build.mk
-
-# dpkg-arch rules
-ifeq (,$(DEB_BUILD_GNU_TYPE))
- include $(SCRIPT_DIR)/dpkg-arch.mk
-endif
-
# Update $PATH so that dbs will be able to find our "up-scripts" script.
PATH = $(shell echo $$PATH:debian/scripts)
export PATH
# This is a horrendous kludge to ensure that some scripts we need are executable.
-DUMMY:=$(shell if ! [ -x debian/setperms ]; then chmod 755 debian/setperms; fi)
-DUMMY:=$(shell debian/setperms)
-
# workaround for an aggressive overfeature of groff
export GROFF_NO_SGR=1
@@ -131,6 +118,7 @@
stampdir_targets=genscripts check-manifest
stampdir_targets+=build install binary-arch binary-indep
stampdir_targets+=build-server install-server binary-server
+stampdir_targets+=prepare setup
ifdef FORCE
DUMMY:=$(shell rm -f $(patsubst %,$(STAMP_DIR)/%,$(filter $(stampdir_targets),$(MAKECMDGOALS))))
endif
@@ -139,36 +127,88 @@
# for testing.
# test_rules=1
+STAMP_DIR:=stampdir
+SOURCE_DIR:=build-tree
+SOURCE_TREE:=$(SOURCE_DIR)/xc
+
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare:
+ mkdir $(STAMP_DIR)
+ mkdir $(STAMP_DIR)/patches
+ mkdir $(STAMP_DIR)/log
+ echo 2 > $(STAMP_DIR)/patches/.version
+ ln -s debian/patches patches
+ ln -s $(STAMP_DIR)/patches .pc
+ if ! [ -x debian/setperms ]; then \
+ chmod 755 debian/setperms; \
+ fi
+ debian/setperms
+
+ touch $@
+
+patch: $(STAMP_DIR)/patched
+$(STAMP_DIR)/patched: $(STAMP_DIR)/prepare
+ @echo -n "Applying patches... "
+ @if quilt push -a -v > $(STAMP_DIR)/log/patch 2>&1; then \
+ echo "successful."; \
+ else \
+ echo "failed! (Check $(STAMP_DIR)/log/patch for details)"; \
+ exit 1; \
+ fi; \
+
+ touch $@
+
+unpatch:
+ @if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+ echo -n "Unapplying patches... "; \
+ if quilt pop -a > $(STAMP_DIR)/log/unpatch 2>&1; then \
+ echo " successful."; \
+ else \
+ echo " failed! (Check $(STAMP_DIR)/log/unpatch for details)"; \
+ exit 1; \
+ fi; \
+ fi
+
+setup: $(STAMP_DIR)/setup
+$(STAMP_DIR)/setup: $(STAMP_DIR)/patched
+ if [ -d $(SOURCE_TREE) ]; then \
+ rm -rf $(SOURCE_TREE); \
+ fi
+ mkdir -p $(SOURCE_DIR)
+ find . -maxdepth 1 -mindepth 1 ! -name $(SOURCE_DIR) \
+ -a ! -name debian -a ! -name patches -a ! -name .pc \
+ -a ! -name stampdir | xargs -i{} cp -al {} $(SOURCE_DIR)
+ifndef NOT_BUILDING_XORG_X_SERVER
+ # Create source tree for static, debuggable Xorg server.
+ if [ -d $(SOURCE_TREE)-xserver-xorg-dbg ]; then \
+ rm -rf $(SOURCE_TREE)-xserver-xorg-dbg; \
+ fi
+ cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
+endif
+ # Symlink some of the libraries on which we build-depend into
+ # imports/{lib,include} so we don't have to pull in -L/usr/include and
+ # other, similarly ugly, stuff (including, but not limited to,
+ # -I/usr/include).
+ mkdir -p imports/lib
+ mkdir -p imports/include/X11/extensions
+ # Xcursor
+ ln -sf /usr/lib/libXcursor.* imports/lib
+ ln -nsf /usr/include/X11/Xcursor imports/include/X11
+ # Xft
+ ln -sf /usr/lib/libXft.* imports/lib
+
+ touch $@
+
# Rule to clean the maintainer scripts.
cleanscripts:
rm -f debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
rm -f debian/xserver-xorg-dbg.templates
rm -f $(STAMP_DIR)/genscripts
-# This is a temporary hack to tide us over until we've weaned ourselves off of
-# dbs. If this were meant to be good enough for dbs itself, it would be
-# submitted to the Debian BTS as a patch to dbs.
-unpatch:
- @if [ -f $(patched) ] && [ -d $(STAMP_DIR)/patches ]; then \
- mkdir -p $(STAMP_DIR)/unpatches; \
- for F in $(shell ls -1 $(STAMP_DIR)/patches | tac); do \
- LOG=$(STAMP_DIR)/unpatches/$$F; \
- echo -n "Unapplying patch $(PATCH_DIR)/$$F ... "; \
- if cat $(PATCH_DIR)/$$F | (cd $(SOURCE_DIR); \
- patch -p0 -R --no-backup-if-mismatch ) >$$LOG 2>&1; \
- then \
- echo "successful."; \
- else \
- echo "failed! (check $$LOG for reason)"; \
- exit 1; \
- fi; \
- done; \
- fi
-
clean: unpatch cleanscripts
dh_testdir
+ rm -f .pc patches
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
- perl $(SCRIPT_DIR)/dbs_split clean
rm -rf imports
dh_clean debian/local/xserver-wrapper debian/local/FAQ \
debian/local/xterm.faq.gz debian/shlibs.local \
@@ -246,22 +286,6 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build-server RULE BELOW
real-build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: setup $(STAMP_DIR)/genscripts
- dh_testdir
- # Symlink some of the libraries on which we build-depend into
- # imports/{lib,include} so we don't have to pull in -L/usr/include and
- # other, similarly ugly, stuff (including, but not limited to,
- # -I/usr/include).
- mkdir -p imports/lib
- mkdir -p imports/include/X11/extensions
- # Xcursor
- ln -sf /usr/lib/libXcursor.* imports/lib
- ln -nsf /usr/include/X11/Xcursor imports/include/X11
- # Xft
- ln -sf /usr/lib/libXft.* imports/lib
-ifndef NOT_BUILDING_XORG_X_SERVER
- # Create source tree for static, debuggable Xorg server.
- cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
-endif
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper debian/local/xserver-wrapper.c
# Generate plain text documents from (X)HTML.
@@ -652,121 +676,8 @@
# needed for conventional build scenarios.
prune-upstream-tree:
# Ensure we're in the correct directory.
- test -d xc
- # Remove copies of stuff that is separately packaged in Debian.
- rm -rf xc/extras/expat
- rm -rf xc/extras/fontconfig
- rm -rf xc/extras/fonts/Bitstream-Vera
- rm -f xc/fonts/scaled/TTF/COPYRIGHT.Vera
- # XXX: FreeType2 is externally packaged, but its source files are
- # compiled and linked into the libXfont library, which is built as part
- # of xorg-x11 -- so, we have to keep our own local copy of it. Yes,
- # that is horrendously grody.
- # rm -rf xc/extras/freetype2
- rm -rf xc/extras/zlib
- rm -f xc/include/extensions/render.h
- rm -f xc/include/extensions/renderproto.h
- rm -rf xc/lib/Xcursor
- rm -rf xc/lib/Xft
- rm -rf xc/lib/Xrender
- rm -rf xc/programs/Xserver/XpConfig
- # XXX: xterm not yet separately packaged
- # rm -rf xc/programs/xterm
- # Remove stuff that is under a non-free license; see debian/copyright
- # for details.
- # TODO: Document non-freeness of rman (PolyglotMan) in debian/copyright.
- rm -rf xc/extras/rman
- # See debian/copyright for documentation of the failure of the
- # following files to satisfy the Debian Free Software Guidelines
- # (DFSG).
- rm -f xc/fonts/scaled/Meltho/README
- rm -f xc/fonts/scaled/Meltho/SyrCOMAdiabene.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMAntioch.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMBatnan.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMBatnanBold.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMCtesiphon.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMEdessa.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalem.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalemBold.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalemItalic.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMJerusalemOutline.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMKharput.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMMalankara.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMMardin.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMMardinBold.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMMidyat.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMNisibin.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMNisibinOutline.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMQenNeshrin.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMTalada.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMTurAbdin.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMUrhoy.otf
- rm -f xc/fonts/scaled/Meltho/SyrCOMUrhoyBold.otf
- rm -f xc/fonts/scaled/Meltho/license.txt
- rm -f xc/fonts/scaled/TTF/COPYRIGHT.BH
- rm -f xc/fonts/scaled/TTF/luximb.ttf
- rm -f xc/fonts/scaled/TTF/luximbi.ttf
- rm -f xc/fonts/scaled/TTF/luximr.ttf
- rm -f xc/fonts/scaled/TTF/luximri.ttf
- rm -f xc/fonts/scaled/TTF/luxirb.ttf
- rm -f xc/fonts/scaled/TTF/luxirbi.ttf
- rm -f xc/fonts/scaled/TTF/luxirr.ttf
- rm -f xc/fonts/scaled/TTF/luxirri.ttf
- rm -f xc/fonts/scaled/TTF/luxisb.ttf
- rm -f xc/fonts/scaled/TTF/luxisbi.ttf
- rm -f xc/fonts/scaled/TTF/luxisr.ttf
- rm -f xc/fonts/scaled/TTF/luxisri.ttf
- rm -f xc/fonts/scaled/Type1/COPYRIGHT.IBM
- rm -f xc/fonts/scaled/Type1/cour.afm
- rm -f xc/fonts/scaled/Type1/cour.pfa
- rm -f xc/fonts/scaled/Type1/courb.afm
- rm -f xc/fonts/scaled/Type1/courb.pfa
- rm -f xc/fonts/scaled/Type1/courbi.afm
- rm -f xc/fonts/scaled/Type1/courbi.pfa
- rm -f xc/fonts/scaled/Type1/couri.afm
- rm -f xc/fonts/scaled/Type1/couri.pfa
- rm -f xc/fonts/scaled/Type1/COPYRIGHT.BH
- rm -f xc/fonts/scaled/Type1/l047013t.afm
- rm -f xc/fonts/scaled/Type1/l047013t.pfa
- rm -f xc/fonts/scaled/Type1/l047016t.afm
- rm -f xc/fonts/scaled/Type1/l047016t.pfa
- rm -f xc/fonts/scaled/Type1/l047033t.afm
- rm -f xc/fonts/scaled/Type1/l047033t.pfa
- rm -f xc/fonts/scaled/Type1/l047036t.afm
- rm -f xc/fonts/scaled/Type1/l047036t.pfa
- rm -f xc/fonts/scaled/Type1/l048013t.afm
- rm -f xc/fonts/scaled/Type1/l048013t.pfa
- rm -f xc/fonts/scaled/Type1/l048016t.afm
- rm -f xc/fonts/scaled/Type1/l048016t.pfa
- rm -f xc/fonts/scaled/Type1/l048033t.afm
- rm -f xc/fonts/scaled/Type1/l048033t.pfa
- rm -f xc/fonts/scaled/Type1/l048036t.afm
- rm -f xc/fonts/scaled/Type1/l048036t.pfa
- rm -f xc/fonts/scaled/Type1/l049013t.afm
- rm -f xc/fonts/scaled/Type1/l049013t.pfa
- rm -f xc/fonts/scaled/Type1/l049016t.afm
- rm -f xc/fonts/scaled/Type1/l049016t.pfa
- rm -f xc/fonts/scaled/Type1/l049033t.afm
- rm -f xc/fonts/scaled/Type1/l049033t.pfa
- rm -f xc/fonts/scaled/Type1/l049036t.afm
- rm -f xc/fonts/scaled/Type1/l049036t.pfa
- rm -f xc/fonts/scaled/Type1/UTBI____.afm
- rm -f xc/fonts/scaled/Type1/UTBI____.pfa
- rm -f xc/fonts/scaled/Type1/UTB_____.afm
- rm -f xc/fonts/scaled/Type1/UTB_____.pfa
- rm -f xc/fonts/scaled/Type1/UTI_____.afm
- rm -f xc/fonts/scaled/Type1/UTI_____.pfa
- rm -f xc/fonts/scaled/Type1/UTRG____.afm
- rm -f xc/fonts/scaled/Type1/UTRG____.pfa
- rm -f xc/programs/Xserver/hw/xfree86/doc/README.DRI
- rm -f xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp
- rm -f xc/extras/drm/shared/mga_ucode.h
- rm -f xc/extras/drm/shared/r128_cce.c
- rm -f xc/extras/drm/shared/radeon_cp.c
- rm -f xc/programs/Xserver/hw/xfree86/drivers/mga/mga_ucode.h
- rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/README.uc
- rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v10002d.uc
- rm -f xc/programs/Xserver/hw/xfree86/drivers/rendition/v20002d.uc
+ dh_testdir
+ grep -rv '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
# Change to what should be the correct directory, ensure it is, and if
# so, create the .orig.tar.gz file. Exclude the debian directory and its
@@ -778,7 +689,7 @@
#
# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
# for the rare situations when one is needed.
-make-orig-tar-gz: prune-upstream-tree
+make-orig-tar-gz: clean prune-upstream-tree
( cd .. \
&& if ! [ -d $(SOURCE_NAME)-$(UPSTREAM_VERSION) ]; then \
echo "../$(SOURCE_NAME)-$(UPSTREAM_VERSION) does not exist or is" \
@@ -795,17 +706,34 @@
#
# Note: This rule is for Debian package maintainers' convenience, and is not
# needed for conventional build scenarios.
-patch-audit: setup
- @if egrep -il 'Hunk.*succeeded at.*(fuzz|offset)' \
- stampdir/log/patches/*; then \
- echo "The above patches had fuzz or offsets. Please fix." >&2; \
+patch-audit: prepare unpatch
+ touch stampdir/log/patch; \
+ FUZZY=no; \
+ while [ -n "`quilt next`" ]; do \
+ RESULT=`quilt push -v | tee -a stampdir/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/'`;\
+ case "$$RESULT" in \
+ succeeded) \
+ echo "The patch is fuzzy: `quilt top`"; \
+ echo "The patch is fuzzy: `quilt top`" > stampdir/log/`quilt top`; \
+ FUZZY=yes; \
+ ;; \
+ FAILED) \
+ echo "The patch is broken: `quilt next`"; \
+ echo "The patch is fuzzy: `quilt next`" > stampdir/log/`quilt next`; \
+ exit 1; \
+ ;; \
+ esac; \
+ done; \
+ if [ $$FUZZY = "yes" ]; then \
+ echo "There were fuzzy patches. Please Fix."; \
exit 1; \
fi
.PHONY: default
.PHONY: genscripts cleanscripts
.PHONY: updatepo
-.PHONY: unpatch
+.PHONY: prepare setup
+.PHONY: patch unpatch
.PHONY: clean install
.PHONY: build build-arch-only build-all real-build
.PHONY: binary binary-arch binary-indep
Reply to: